From ee9942a569d9186059d4f25d2508f17fc0b1040e Mon Sep 17 00:00:00 2001 From: Eric Kooistra <kooistra@astron.nl> Date: Fri, 26 Nov 2021 10:59:17 +0100 Subject: [PATCH] Use g_sim_sdp : t_sdp_sim := c_sdp_sim to determine statistics g_offload_time for sim and default c_sdp_offload_time on HW. --- .../lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd | 6 +++--- .../lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd index 2f74ef1528..e09f093799 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd @@ -40,9 +40,9 @@ USE work.sdp_pkg.ALL; ENTITY node_sdp_beamformer IS GENERIC ( g_sim : BOOLEAN := FALSE; + g_sim_sdp : t_sdp_sim := c_sdp_sim; g_beamset_id : NATURAL := 0; - g_scope_selected_beamlet : NATURAL := 0; - g_offload_time : NATURAL := c_sdp_offload_time + g_scope_selected_beamlet : NATURAL := 0 ); PORT ( dp_clk : IN STD_LOGIC; @@ -281,7 +281,7 @@ BEGIN u_sdp_bst_udp_offload: ENTITY work.sdp_statistics_offload GENERIC MAP ( g_statistics_type => "BST", - g_offload_time => g_offload_time, + g_offload_time => sel_a_b(g_sim, g_sim_sdp.offload_time, c_sdp_offload_time), g_beamset_id => g_beamset_id ) PORT MAP ( diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd index 1ecebdc0cb..4995e93e5b 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd @@ -49,9 +49,9 @@ USE work.sdp_pkg.ALL; ENTITY node_sdp_filterbank IS GENERIC ( g_sim : BOOLEAN := FALSE; + g_sim_sdp : t_sdp_sim := c_sdp_sim; g_wpfb : t_wpfb := c_sdp_wpfb_subbands; - g_scope_selected_subband : NATURAL := 0; - g_offload_time : NATURAL := c_sdp_offload_time + g_scope_selected_subband : NATURAL := 0 ); PORT ( dp_clk : IN STD_LOGIC; @@ -336,7 +336,7 @@ BEGIN u_sdp_sst_udp_offload: ENTITY work.sdp_statistics_offload GENERIC MAP ( g_statistics_type => "SST", - g_offload_time => g_offload_time + g_offload_time => sel_a_b(g_sim, g_sim_sdp.offload_time, c_sdp_offload_time) ) PORT MAP ( mm_clk => mm_clk, -- GitLab