Skip to content
Snippets Groups Projects
Commit 01205cbe authored by Pieter Donker's avatar Pieter Donker
Browse files

Merge branch 'L2SDP-787' into 'master'

fixed mms_dp_gain_serial_arr latency

Closes L2SDP-787

See merge request desp/hdl!267
parents e0317675 cc66d7f3
Branches
Tags
1 merge request!267fixed mms_dp_gain_serial_arr latency
Pipeline #33312 passed
...@@ -120,7 +120,10 @@ BEGIN ...@@ -120,7 +120,10 @@ BEGIN
g_gain_w => c_sdp_W_bf_weight, g_gain_w => c_sdp_W_bf_weight,
g_in_dat_w => c_sdp_W_subband, g_in_dat_w => c_sdp_W_subband,
g_out_dat_w => c_gain_out_dat_w, g_out_dat_w => c_gain_out_dat_w,
g_gains_file_name => g_gains_file_name g_gains_file_name => g_gains_file_name,
-- extra input latency to ease timing.
g_pipeline_real_mult_input => 2,
g_pipeline_complex_mult_input => 2
) )
PORT MAP ( PORT MAP (
-- System -- System
......
...@@ -120,7 +120,10 @@ BEGIN ...@@ -120,7 +120,10 @@ BEGIN
g_gain_w => c_sdp_W_sub_weight, g_gain_w => c_sdp_W_sub_weight,
g_in_dat_w => c_sdp_W_subband, g_in_dat_w => c_sdp_W_subband,
g_out_dat_w => c_gain_out_dat_w, g_out_dat_w => c_gain_out_dat_w,
g_gains_file_name => g_gains_file_name g_gains_file_name => g_gains_file_name,
-- extra input latency to ease timing.
g_pipeline_real_mult_input => 2,
g_pipeline_complex_mult_input => 2
) )
PORT MAP ( PORT MAP (
-- System -- System
......
...@@ -100,7 +100,7 @@ ARCHITECTURE str OF mms_dp_gain_serial_arr IS ...@@ -100,7 +100,7 @@ ARCHITECTURE str OF mms_dp_gain_serial_arr IS
-- dat_w : NATURAL; -- dat_w : NATURAL;
-- nof_dat : NATURAL; -- optional, nof dat words <= 2**adr_w -- nof_dat : NATURAL; -- optional, nof dat words <= 2**adr_w
-- init_sl : STD_LOGIC; -- optional, init all dat words to std_logic '0', '1' or 'X' -- init_sl : STD_LOGIC; -- optional, init all dat words to std_logic '0', '1' or 'X'
CONSTANT c_mm_ram : t_c_mem := (latency => 2, -- set latency to 2 to ease timing CONSTANT c_mm_ram : t_c_mem := (latency => 1,
adr_w => ceil_log2(g_nof_gains), adr_w => ceil_log2(g_nof_gains),
dat_w => sel_a_b(g_complex_gain, c_nof_complex, 1) * g_gain_w, dat_w => sel_a_b(g_complex_gain, c_nof_complex, 1) * g_gain_w,
nof_dat => g_nof_gains, nof_dat => g_nof_gains,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment