Skip to content
Snippets Groups Projects
Commit b4b66ef9 authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Correct unmerge BSN increment = 0. Capture look up values for DN.

parent 13e7d8e2
No related branches found
No related tags found
This commit is part of merge request !359. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
applications/lofar2/libraries/sdp/src/vhdl/sdp_bdo_multiple_destinations.vhd
+ 25
− 49
View file @ b4b66ef9
...@@ -30,8 +30,11 @@ ...@@ -30,8 +30,11 @@
-- MM program the one or more destination MAC/IP/UDP via -- MM program the one or more destination MAC/IP/UDP via
-- sdp_bdo_destinations_reg. -- sdp_bdo_destinations_reg.
-- * Get nof_destinations from sdp_bdo_destinations_reg. The nof_destinations -- * Get nof_destinations from sdp_bdo_destinations_reg. The nof_destinations
-- is MM programmable between 1 and nof_destinations_max. -- is MM programmable between 1 and nof_destinations_max. The
-- * The nof_blocks_per_packet is not MM programmable, but based on -- nof_destinations must be in range 1:g_nof_destinations_max, then
-- nof_destinations_act = nof_destinations, as defined in
-- sdp_bdo_destinations_reg.
-- * The nof_blocks_per_packet is not MM programmable, but based on DN =
-- nof_destinations to ensure that the packet fits in a jumbo frame or -- nof_destinations to ensure that the packet fits in a jumbo frame or
-- equal to c_sdp_bdo_reorder_nof_blocks_max to make maximum use of the -- equal to c_sdp_bdo_reorder_nof_blocks_max to make maximum use of the
-- available reorder buffer size. -- available reorder buffer size.
...@@ -82,11 +85,10 @@ entity sdp_bdo_multiple_destinations is ...@@ -82,11 +85,10 @@ entity sdp_bdo_multiple_destinations is
snk_in : in t_dp_sosi; snk_in : in t_dp_sosi;
src_out : out t_dp_sosi; src_out : out t_dp_sosi;
-- Streaming data output info per destination index -- Streaming data output info dependent on DN = nof_destinations
destination_index : out natural;
nof_blocks_per_packet : out natural; nof_blocks_per_packet : out natural;
nof_beamlets_per_block_per_destination : out natural; nof_beamlets_per_block_first_destinations : out natural;
beamlet_index_per_destination : out natural nof_beamlets_per_block_last_destination : out natural
); );
end sdp_bdo_multiple_destinations; end sdp_bdo_multiple_destinations;
...@@ -95,15 +97,12 @@ architecture str of sdp_bdo_multiple_destinations is ...@@ -95,15 +97,12 @@ architecture str of sdp_bdo_multiple_destinations is
-- Look up table constants as function of nof_destinations in range(g_nof_destinations_max) -- Look up table constants as function of nof_destinations in range(g_nof_destinations_max)
constant c_m : natural := g_nof_destinations_max; constant c_m : natural := g_nof_destinations_max;
constant c_reorder_nof_blocks_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_reorder_nof_blocks_look_up_table(g_nof_destinations_max); constant c_reorder_nof_blocks_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_reorder_nof_blocks_look_up_table(c_m);
constant c_reorder_nof_ch_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_reorder_nof_ch_look_up_table(g_nof_destinations_max); constant c_reorder_nof_ch_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_reorder_nof_ch_look_up_table(c_m);
constant c_nof_beamlets_per_block_first_destinations_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_nof_beamlets_per_block_first_destinations_look_up_table(g_nof_destinations_max); constant c_nof_beamlets_per_block_first_destinations_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_nof_beamlets_per_block_first_destinations_look_up_table(c_m);
constant c_nof_beamlets_per_block_last_destination_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_nof_beamlets_per_block_last_destination_look_up_table(g_nof_destinations_max); constant c_nof_beamlets_per_block_last_destination_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_nof_beamlets_per_block_last_destination_look_up_table(c_m);
constant c_nof_ch_per_packet_first_destinations_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_nof_ch_per_packet_first_destinations_look_up_table(g_nof_destinations_max); constant c_nof_ch_per_packet_first_destinations_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_nof_ch_per_packet_first_destinations_look_up_table(c_m);
constant c_nof_ch_per_packet_last_destination_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_nof_ch_per_packet_last_destination_look_up_table(g_nof_destinations_max); constant c_nof_ch_per_packet_last_destination_arr : t_natural_arr(1 to c_m) := func_sdp_bdo_nof_ch_per_packet_last_destination_look_up_table(c_m);
constant c_beamlet_index_per_destination_mat : t_natural_matrix(1 to c_m, 0 to c_m - 1) :=
func_sdp_bdo_beamlet_index_per_destination_look_up_matrix(g_nof_destinations_max);
constant c_nof_ch_per_packet_max : natural := largest(c_nof_ch_per_packet_first_destinations_arr); constant c_nof_ch_per_packet_max : natural := largest(c_nof_ch_per_packet_first_destinations_arr);
constant c_nof_ch_per_packet_w : natural := ceil_log2(c_nof_ch_per_packet_max + 1); constant c_nof_ch_per_packet_w : natural := ceil_log2(c_nof_ch_per_packet_max + 1);
...@@ -114,18 +113,17 @@ architecture str of sdp_bdo_multiple_destinations is ...@@ -114,18 +113,17 @@ architecture str of sdp_bdo_multiple_destinations is
constant c_reorder_nof_beamlets_per_block : natural := c_sdp_nof_beamlets_per_block; constant c_reorder_nof_beamlets_per_block : natural := c_sdp_nof_beamlets_per_block;
signal i_destinations_info : t_sdp_bdo_destinations_info; signal i_destinations_info : t_sdp_bdo_destinations_info;
signal s_DN : natural range 1 to g_nof_destinations_max; -- number of destinations signal s_DN : natural range 1 to g_nof_destinations_max; -- number of destinations
signal s_DI : natural range 0 to g_nof_destinations_max - 1; -- destination index
-- Dynamic merge, reorder, unmerge packet sizes -- Dynamic merge, reorder, unmerge packet sizes
signal reorder_nof_blocks : natural; signal reorder_nof_blocks : natural;
signal reorder_nof_blocks_slv : std_logic_vector(c_sdp_bdo_reorder_nof_blocks_w - 1 downto 0); signal reorder_nof_blocks_slv : std_logic_vector(c_sdp_bdo_reorder_nof_blocks_w - 1 downto 0);
signal reorder_nof_ch : natural; signal reorder_nof_ch : natural;
signal nof_beamlets_per_block_first_destinations : natural;
signal nof_beamlets_per_block_last_destination : natural;
signal nof_ch_per_packet_first_destinations : natural; signal nof_ch_per_packet_first_destinations : natural;
signal nof_ch_per_packet_first_destinations_slv : std_logic_vector(c_nof_ch_per_packet_w - 1 downto 0); signal nof_ch_per_packet_first_destinations_slv : std_logic_vector(c_nof_ch_per_packet_w - 1 downto 0);
-- The nof_ch_per_packet_last_destination is used only for view in Wave
-- window, because dp_packet_unmerge automatically will output that number
-- of remaining number of ch for the last block.
signal nof_ch_per_packet_last_destination : natural; signal nof_ch_per_packet_last_destination : natural;
signal select_copi : t_mem_copi := c_mem_copi_rst; signal select_copi : t_mem_copi := c_mem_copi_rst;
...@@ -142,6 +140,8 @@ architecture str of sdp_bdo_multiple_destinations is ...@@ -142,6 +140,8 @@ architecture str of sdp_bdo_multiple_destinations is
signal unmerge_word : t_sdp_dual_pol_beamlet_in_word; signal unmerge_word : t_sdp_dual_pol_beamlet_in_word;
begin begin
destinations_info <= i_destinations_info; destinations_info <= i_destinations_info;
nof_blocks_per_packet <= reorder_nof_blocks;
src_out <= unmerge_src_out;
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Multiple destinations info register -- Multiple destinations info register
...@@ -167,18 +167,15 @@ begin ...@@ -167,18 +167,15 @@ begin
); );
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Look up table values and and output info dependent on DN and DI -- Register look up table values dependent on DN to ease timing closure
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Register values to ease timing closure
p_reg : process(dp_clk) p_reg : process(dp_clk)
variable v_DN : natural; -- number of destinations variable v_DN : natural; -- number of destinations
variable v_DI : natural; -- destination index
begin begin
if rising_edge(dp_clk) then if rising_edge(dp_clk) then
v_DN := i_destinations_info.nof_destinations_act; v_DN := i_destinations_info.nof_destinations_act;
v_DI := to_uint(unmerge_src_out.channel);
-- Constant values that depend on DN = nof_destinations_act set via MM -- Semi constant values that depend on DN = nof_destinations_act set via MM
s_DN <= v_DN; s_DN <= v_DN;
reorder_nof_blocks <= c_reorder_nof_blocks_arr(s_DN); reorder_nof_blocks <= c_reorder_nof_blocks_arr(s_DN);
reorder_nof_ch <= c_reorder_nof_ch_arr(s_DN); reorder_nof_ch <= c_reorder_nof_ch_arr(s_DN);
...@@ -186,23 +183,6 @@ begin ...@@ -186,23 +183,6 @@ begin
nof_beamlets_per_block_last_destination <= c_nof_beamlets_per_block_last_destination_arr(s_DN); nof_beamlets_per_block_last_destination <= c_nof_beamlets_per_block_last_destination_arr(s_DN);
nof_ch_per_packet_first_destinations <= c_nof_ch_per_packet_first_destinations_arr(s_DN); nof_ch_per_packet_first_destinations <= c_nof_ch_per_packet_first_destinations_arr(s_DN);
nof_ch_per_packet_last_destination <= c_nof_ch_per_packet_last_destination_arr(s_DN); nof_ch_per_packet_last_destination <= c_nof_ch_per_packet_last_destination_arr(s_DN);
-- . output info
nof_blocks_per_packet <= reorder_nof_blocks;
-- Variable values that depend on DN set via MM and on current DI of
-- dp_packet_unmerge output destination channel
s_DI <= v_DI;
-- . output info
destination_index <= v_DI;
beamlet_index_per_destination <= c_beamset_beamlet_index + c_beamlet_index_per_destination_mat(s_DN, v_DI);
if v_DI < s_DN - 1 then
nof_beamlets_per_block_per_destination <= nof_beamlets_per_block_first_destinations;
else
nof_beamlets_per_block_per_destination <= nof_beamlets_per_block_last_destination;
end if;
-- Register src_out to time align output info with src_out.sop
src_out <= unmerge_src_out;
end if; end if;
end process; end process;
...@@ -306,16 +286,12 @@ begin ...@@ -306,16 +286,12 @@ begin
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
nof_ch_per_packet_first_destinations_slv <= to_uvec(nof_ch_per_packet_first_destinations, c_nof_ch_per_packet_w); nof_ch_per_packet_first_destinations_slv <= to_uvec(nof_ch_per_packet_first_destinations, c_nof_ch_per_packet_w);
-- The nof_ch_per_packet_last_destination is used only for view in Wave
-- window, because dp_packet_unmerge automatically will output that number
-- of remaining number of ch for the last block.
u_dp_packet_unmerge : entity dp_lib.dp_packet_unmerge u_dp_packet_unmerge : entity dp_lib.dp_packet_unmerge
generic map ( generic map (
g_use_ready => false, -- no flow control g_use_ready => false, -- no flow control
g_nof_pkt => g_nof_destinations_max, g_nof_pkt => g_nof_destinations_max,
g_pkt_len => c_nof_ch_per_packet_max, g_pkt_len => c_nof_ch_per_packet_max,
g_bsn_increment => 1 g_bsn_increment => 0
) )
port map ( port map (
rst => dp_rst, rst => dp_rst,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment