Resolve L2SDP-1013

Closes L2SDP-1013

libraries/base/dp/tb/vhdl/tb_dp_bsn_align_v2.vhd

@@ -106,7 +106,8 @@ entity tb_dp_bsn_align_v2 is
     g_tb_diff_delay          : integer := 0;  -- 0 = aligned inputs, -1 = max input delay for no loss,
                                                    -- >~ g_bsn_latency_max * g_block_period will give loss
     g_tb_nof_restart         : natural := 2;  -- number of times to restart the input stimuli
-    g_tb_nof_blocks          : natural := 20  -- number of input blocks per restart
+    g_tb_nof_blocks          : natural := 20  -- number of input blocks per restart, choose > circular buffer size, so
+                                              -- > c_align_latency_nof_blocks
   );
 end tb_dp_bsn_align_v2;
 
@@ -140,7 +141,8 @@ architecture tb of tb_dp_bsn_align_v2 is
 
   constant c_gap_size                 : natural := g_block_period - g_block_size;
 
-  constant c_lost_bsn_stream_id       : natural := sel_a_b(g_nof_streams > 1, 1, 0);  -- fixed use stream 1 to verify g_lost_bsn_id. Use 0 for g_nof_streams = 1.
+  -- Fixed use stream 1 to verify g_lost_bsn_id. Use 0 for g_nof_streams = 1.
+  constant c_lost_bsn_stream_id       : natural := sel_a_b(g_nof_streams > 1, 1, 0);
 
   -- In tb no support (yet) for immediate aligned output at first node, when c_nof_aligners_max > 1
   constant c_use_aligner_at_first_node : boolean := true;
@@ -155,9 +157,11 @@ architecture tb of tb_dp_bsn_align_v2 is
   constant c_dut_latency              : natural := g_pipeline_input + g_rd_latency + c_mm_to_dp_latency + g_pipeline_output;
 
   -- DUT buffer latency for chain of DUTs
-  constant c_align_latency_nof_blocks : natural := g_bsn_latency_max * c_nof_aligners_max;  -- in number blocks
-  constant c_align_latency_nof_valid  : natural := g_bsn_latency_max * c_nof_aligners_max * g_block_size;  -- in number of data samples
-  constant c_align_latency_nof_clk    : natural := g_bsn_latency_max * c_nof_aligners_max * g_block_period;  -- in number clk cycles
+  constant c_align_latency_nof_blocks : natural := sel_a_b(c_nof_aligners_max = 1,
+               g_bsn_latency_max,
+               g_bsn_latency_max * (c_nof_aligners_max - 1) + g_bsn_latency_first_node);  -- number blocks
+  constant c_align_latency_nof_valid  : natural := c_align_latency_nof_blocks * g_block_size;  -- number of data samples
+  constant c_align_latency_nof_clk    : natural := c_align_latency_nof_blocks * g_block_period;  -- number clk cycles
 
   -- Total DUT chain latency
   constant c_total_latency            : natural := c_dut_latency + c_align_latency_nof_clk;