Skip to content
Snippets Groups Projects
Commit fd13e86f authored by Pepping's avatar Pepping
Browse files

Increased depth of data_buffer
parent 95c60db6
Branches
Tags
No related merge requests found
...@@ -210,7 +210,7 @@ ARCHITECTURE str OF node_apertif_unb1_correlator_processing IS ...@@ -210,7 +210,7 @@ ARCHITECTURE str OF node_apertif_unb1_correlator_processing IS
-- Databuffer -- Databuffer
CONSTANT c_db_data_w : NATURAL := c_nof_complex*c_wpfb_in_dat_w; -- 16 = 8b real + 8bit imaginary CONSTANT c_db_data_w : NATURAL := c_nof_complex*c_wpfb_in_dat_w; -- 16 = 8b real + 8bit imaginary
CONSTANT c_db_nof_data : NATURAL := 8; CONSTANT c_db_nof_data : NATURAL := 128;
-- BSN Monitor -- BSN Monitor
CONSTANT c_nof_bsn_mon_streams : NATURAL := 6; CONSTANT c_nof_bsn_mon_streams : NATURAL := 6;
...@@ -238,7 +238,6 @@ ARCHITECTURE str OF node_apertif_unb1_correlator_processing IS ...@@ -238,7 +238,6 @@ ARCHITECTURE str OF node_apertif_unb1_correlator_processing IS
SIGNAL wpfb_snk_in_ctrl : t_dp_sosi; SIGNAL wpfb_snk_in_ctrl : t_dp_sosi;
SIGNAL wpfb_snk_in_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0); SIGNAL wpfb_snk_in_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0);
SIGNAL wpfb_src_out_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0); SIGNAL wpfb_src_out_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0);
SIGNAL dp_fifo_info_src_out_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0);
SIGNAL requantize_snk_in_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0); SIGNAL requantize_snk_in_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0);
SIGNAL node_apertif_unb1_correlator_processing_acc_flush_sync_snk_in_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0); SIGNAL node_apertif_unb1_correlator_processing_acc_flush_sync_snk_in_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0);
SIGNAL correlator_snk_in_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0); SIGNAL correlator_snk_in_arr : t_dp_sosi_arr(c_nof_dsp_streams-1 DOWNTO 0);
...@@ -385,7 +384,6 @@ BEGIN ...@@ -385,7 +384,6 @@ BEGIN
-- WPFB -- WPFB
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Add sop, eop for WPFB -- Add sop, eop for WPFB
gen_dp_block_gen_wpfb : IF g_use_wpfb=TRUE GENERATE
gen_dp_block_gen : FOR i IN 0 TO c_nof_interleaved_streams-1 GENERATE gen_dp_block_gen : FOR i IN 0 TO c_nof_interleaved_streams-1 GENERATE
u_dp_sync_insert : ENTITY dp_lib.dp_sync_insert u_dp_sync_insert : ENTITY dp_lib.dp_sync_insert
GENERIC MAP( GENERIC MAP(
...@@ -401,7 +399,7 @@ BEGIN ...@@ -401,7 +399,7 @@ BEGIN
src_out => wpfb_snk_in_arr(i) src_out => wpfb_snk_in_arr(i)
); );
END GENERATE; END GENERATE;
END GENERATE;
-- WPFB snk_in data buffer -- WPFB snk_in data buffer
gen_databuffer : IF g_use_db = TRUE GENERATE gen_databuffer : IF g_use_db = TRUE GENERATE
...@@ -411,7 +409,7 @@ BEGIN ...@@ -411,7 +409,7 @@ BEGIN
g_data_type => e_complex, g_data_type => e_complex,
g_data_w => c_db_data_w, g_data_w => c_db_data_w,
g_buf_nof_data => c_db_nof_data, g_buf_nof_data => c_db_nof_data,
g_buf_use_sync => FALSE g_buf_use_sync => TRUE
) )
PORT MAP ( PORT MAP (
-- System -- System
...@@ -425,8 +423,8 @@ BEGIN ...@@ -425,8 +423,8 @@ BEGIN
reg_data_buf_mosi => reg_diag_data_buf_mosi, reg_data_buf_mosi => reg_diag_data_buf_mosi,
reg_data_buf_miso => reg_diag_data_buf_miso, reg_data_buf_miso => reg_diag_data_buf_miso,
-- ST interface -- ST interface
in_sync => wpfb_snk_in_arr(0).sync, in_sync => sync_checked_src_out_arr(0).sync,
in_sosi_arr => wpfb_snk_in_arr in_sosi_arr => sync_checked_src_out_arr
); );
END GENERATE; END GENERATE;
...@@ -456,21 +454,22 @@ BEGIN ...@@ -456,21 +454,22 @@ BEGIN
in_sosi_arr => wpfb_snk_in_arr, in_sosi_arr => wpfb_snk_in_arr,
out_sosi_arr => wpfb_src_out_arr out_sosi_arr => wpfb_src_out_arr
); );
dp_fifo_info_src_out_arr <= wpfb_src_out_arr; -- dp_fifo_info_src_out_arr <= wpfb_src_out_arr;
END GENERATE; END GENERATE;
-- Bypass wpfb -- Bypass wpfb
gen_no_wpfb : IF g_use_wpfb = FALSE GENERATE gen_no_wpfb : IF g_use_wpfb = FALSE GENERATE
wpfb_snk_in_arr <= corr_folder_src_out_arr; -- wpfb_snk_in_arr <= corr_folder_src_out_arr;
dp_fifo_info_src_out_arr <= wpfb_snk_in_arr; wpfb_src_out_arr <= wpfb_snk_in_arr;
END GENERATE; END GENERATE;
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Requantize output of wpfb for correlator input -- Requantize output of wpfb for correlator input
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
requantize_snk_in_arr <= dp_fifo_info_src_out_arr; requantize_snk_in_arr <= wpfb_src_out_arr;
gen_correlator : IF g_use_cor = TRUE GENERATE gen_correlator : IF g_use_cor = TRUE GENERATE
gen_requantize_after_wpfb : IF g_use_wpfb = TRUE GENERATE
gen_requantizer : FOR I IN 0 TO c_nof_cor_input_streams-1 GENERATE gen_requantizer : FOR I IN 0 TO c_nof_cor_input_streams-1 GENERATE
u_dp_requantize_out : ENTITY dp_lib.dp_requantize u_dp_requantize_out : ENTITY dp_lib.dp_requantize
GENERIC MAP ( GENERIC MAP (
...@@ -495,6 +494,13 @@ BEGIN ...@@ -495,6 +494,13 @@ BEGIN
out_ovr => OPEN out_ovr => OPEN
); );
END GENERATE; END GENERATE;
END GENERATE;
gen_no_requantize_after_wpfb : IF g_use_wpfb = FALSE GENERATE
gen_no_requantizer : FOR I IN 0 TO c_nof_cor_input_streams-1 GENERATE
node_apertif_unb1_correlator_processing_acc_flush_sync_snk_in_arr(I) <= requantize_snk_in_arr(I);
END GENERATE;
END GENERATE;
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Convert the incoming sync pulses (tagging start of each beamlet) to sync -- Convert the incoming sync pulses (tagging start of each beamlet) to sync
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment