Merge branch 'cabal_mfb_trim' into 'devel'

feat(mfb-tools): add MFB conf support (1,1,256,8) to MFB_FRAME_TRIMMER

See merge request ndk/ndk-fpga!362

Author: martinspinler

comp/mfb_tools/edit/frame_trimmer/mfb_frame_trimmer.vhd

@@ -155,7 +155,10 @@ begin
     -- PACKET PREPARE
     -- -------------------------------------------------------------------------
 
-    s_rx_sof_pos <= slv_array_deser(RX_SOF_POS, REGIONS);
+    spw_g: if (SOF_POS_WIDTH > 1) generate
+        s_rx_sof_pos <= slv_array_deser(RX_SOF_POS, REGIONS);
+    end generate;
+
     s_rx_eof_pos <= slv_array_deser(RX_EOF_POS, REGIONS);
     s_rx_new_len <= slv_array_deser(RX_TRIM_LEN, REGIONS);
 
@@ -180,10 +183,16 @@ begin
     end process;
 
     new_len_g : for r in 0 to REGIONS-1 generate
-        s_rx_sof_pos_ext(r) <= unsigned(s_rx_sof_pos(r)) & to_unsigned(0,log2(BLOCK_SIZE));
         s_rx_eof_pos_blk(r) <= s_rx_eof_pos(r)(EOF_POS_WIDTH-1 downto log2(BLOCK_SIZE));
 
-        s_rx_sof_after_eof(r)      <= '1' when (unsigned(s_rx_sof_pos(r)) > unsigned(s_rx_eof_pos_blk(r))) else '0';
+        spw_g: if (SOF_POS_WIDTH > 1) generate
+            s_rx_sof_pos_ext(r)   <= unsigned(s_rx_sof_pos(r)) & to_unsigned(0,log2(BLOCK_SIZE));
+            s_rx_sof_after_eof(r) <= '1' when (unsigned(s_rx_sof_pos(r)) > unsigned(s_rx_eof_pos_blk(r))) else '0';
+        else generate
+            s_rx_sof_pos_ext(r)   <= to_unsigned(0,log2(BLOCK_SIZE));
+            s_rx_sof_after_eof(r) <= '0';
+        end generate;
+
         s_rx_sof_after_eof_vld(r)  <= s_rx_sof_after_eof(r) and RX_SOF(r) and RX_EOF(r);
         s_rx_sof_before_eof_vld(r) <= not s_rx_sof_after_eof(r) and RX_SOF(r) and RX_EOF(r);
 

comp/mfb_tools/edit/frame_trimmer/uvm/tbench/dut.sv

@@ -14,6 +14,18 @@ module DUT #(REGIONS, REGION_SIZE, BLOCK_SIZE, ITEM_WIDTH, META_WIDTH, PKT_MTU,
     logic [REGIONS*$clog2(PKT_MTU+1)-1 : 0] mfb_rx_trim_len;
     logic [REGIONS                  -1 : 0] mfb_rx_trim_en;
     logic [REGIONS*META_WIDTH       -1 : 0] mfb_rx_meta;
+    logic [((REGION_SIZE != 1) ? REGIONS*$clog2(REGION_SIZE) : REGIONS)-1 : 0] mfb_rx_sof_pos;
+    logic [((REGION_SIZE != 1) ? REGIONS*$clog2(REGION_SIZE) : REGIONS)-1 : 0] mfb_tx_sof_pos;
+
+    generate
+        if (REGION_SIZE != 1) begin
+            assign mfb_rx_sof_pos = mfb_rx.SOF_POS;
+            assign mfb_tx.SOF_POS = mfb_tx_sof_pos;
+        end else begin
+            assign mfb_rx_sof_pos = '0;
+            assign mfb_tx.SOF_POS = '0;
+        end
+    endgenerate
 
     MFB_FRAME_TRIMMER  #(
         .REGIONS     (REGIONS),
@@ -32,7 +44,7 @@ module DUT #(REGIONS, REGION_SIZE, BLOCK_SIZE, ITEM_WIDTH, META_WIDTH, PKT_MTU,
 
         .RX_DATA    (mfb_rx.DATA),
         .RX_META    (mfb_rx_meta),
-        .RX_SOF_POS (mfb_rx.SOF_POS),
+        .RX_SOF_POS (mfb_rx_sof_pos),
         .RX_EOF_POS (mfb_rx.EOF_POS),
         .RX_SOF     (mfb_rx.SOF),
         .RX_EOF     (mfb_rx.EOF),
@@ -42,7 +54,7 @@ module DUT #(REGIONS, REGION_SIZE, BLOCK_SIZE, ITEM_WIDTH, META_WIDTH, PKT_MTU,
 
         .TX_DATA    (mfb_tx.DATA),
         .TX_META    (mfb_tx.META),
-        .TX_SOF_POS (mfb_tx.SOF_POS),
+        .TX_SOF_POS (mfb_tx_sof_pos),
         .TX_EOF_POS (mfb_tx.EOF_POS),
         .TX_SOF     (mfb_tx.SOF),
         .TX_EOF     (mfb_tx.EOF),