Merge branch 'cabal_ver_fix' into 'devel'

Cabal ver fix

See merge request ndk/ndk-fpga!211

Author: jakubcabal

comp/mfb_tools/logic/crossbarx_stream/crossbarx_stream.vhd

@@ -695,8 +695,7 @@ begin
 
     -- psl assert_length :
     --      assert forall i in {0 to MFB_REGIONS-1}:
-    --      always (pacp_rx_pkt_vld(0)(i) = '1' and
-    --                     (to_integer(unsigned(pacp_rx_pkt_len_mod3(0)(i))) + GAP_SIZE_MIN + MFB_BLOCK_SIZE-1) >= MFB_REGION_SIZE*MFB_BLOCK_SIZE) @rising_edge(RX_CLK)
+    --      always (pacp_rx_pkt_vld(0)(i) = '0') or (pacp_rx_pkt_vld(0)(i) = '1' and (to_integer(unsigned(pacp_rx_pkt_len_mod3(0)(i))) + GAP_SIZE_MIN + MFB_BLOCK_SIZE-1) >= MFB_REGION_SIZE*MFB_BLOCK_SIZE) abort (RX_RESET) @rising_edge(RX_CLK)
     --      report "Packet's length + minimal gap size (+ packet alignment) is too small: to_string(pkt_len_with_gap), must be at least to_string(MFB_REGION_SIZE*MFB_BLOCK_SIZE)";
 
 

comp/nic/mac_lite/rx_mac_lite/comp/crc_check/crc_check.vhd

@@ -115,7 +115,7 @@ begin
             RX_EOF_POS     => RX_EOF_POS,
             RX_SOF         => RX_SOF,
             RX_EOF         => RX_EOF,
-            RX_ADAPTER_ERR => (others => '0'),
+            RX_METADATA    => (others => '0'),
             RX_SRC_RDY     => RX_SRC_RDY,
 
             TX_DATA        => cut_data,
@@ -124,7 +124,7 @@ begin
             TX_SOF         => cut_sof,
             TX_EOF         => cut_eof,
             TX_SRC_RDY     => cut_src_rdy,
-            TX_ADAPTER_ERR => open,
+            TX_METADATA    => open,
             TX_CRC_CUT_ERR => open
         );
     end generate;

comp/nic/mac_lite/rx_mac_lite/top/umii/ver/tbench/test.sv

@@ -126,6 +126,8 @@ program TEST (
         mi32_tr.rw = 1;
         mi32_tr.be = '1;
 
+        #(10*MI_CLK_PERIOD);
+
         // set MAC address to CAM memory
         for (int i = 0; i < MAC_COUNT; i++) begin
             // Send low 32 bits
@@ -537,9 +539,9 @@ program TEST (
 
     task test1();
         $write("\n\n############ TEST CASE 1 ############\n\n");
-        //resetDesign();
-        initConfig();
         enableTestEnvironment();
+        resetDesign();
+        initConfig();
         generator.setEnabled(TRANSACTION_COUNT);
         wait(!generator.enabled);
         disableTestEnvironment();
@@ -549,7 +551,6 @@ program TEST (
 
     task test2();
         $write("\n\n############ TEST CASE 2 ############\n\n");
-        //resetDesign();
         mfb_responder.wordDelayEnable_wt = 1;
         mfb_responder.wordDelayDisable_wt = 1;
         mfb_responder.wordDelayLow = 1;
@@ -558,8 +559,8 @@ program TEST (
         mvb_responder.wordDelayDisable_wt = 1;
         mvb_responder.wordDelayLow = 1;
         mvb_responder.wordDelayHigh = 9;
-        initConfig();
         enableTestEnvironment();
+        initConfig();
         generator.setEnabled(TRANSACTION_COUNT);
         wait(!generator.enabled);
         disableTestEnvironment();
@@ -568,7 +569,6 @@ program TEST (
     endtask
 
     initial begin
-        resetDesign();
         createGeneratorEnvironment(FRAME_SIZE_MAX, FRAME_SIZE_MIN, MAC_COUNT);
         createEnvironment();
         test1();

comp/nic/mac_lite/rx_mac_lite/top/umii/ver/tbench/testbench.sv

@@ -10,11 +10,11 @@ module testbench;
 
     logic ASYNC_RESET;
     logic RX_CLK = 0;
-    logic RX_RESET;
+    logic RX_RESET = 1;
     logic TX_CLK = 0;
-    logic TX_RESET;
+    logic TX_RESET = 1;
     logic MI_CLK = 0;
-    logic MI_RESET;
+    logic MI_RESET = 1;
 
     iMiiRx #(MII_DATA_WIDTH)                                        RX_MII (RX_CLK, RX_RESET);
     iMfbTx #(TX_REGIONS,TX_REGION_SIZE,TX_BLOCK_SIZE,TX_ITEM_WIDTH) TX_MFB (TX_CLK, TX_RESET);

comp/nic/mac_lite/rx_mac_lite/ver/tbench/dut.sv

@@ -46,7 +46,7 @@ module DUT (
         .RX_MFB_EOF_POS  (RX_MFB.EOF_POS),
         .RX_MFB_SOF      (RX_MFB.SOF),
         .RX_MFB_EOF      (RX_MFB.EOF),
-        .RX_MFB_ERROR    (RX_MFB.META),
+        .RX_MFB_CRC_ERR  (RX_MFB.META),
         .RX_MFB_SRC_RDY  (RX_MFB.SRC_RDY),
 
         .ADAPTER_LINK_UP (1'b1),

comp/nic/mac_lite/rx_mac_lite/ver/tbench/test.sv

@@ -139,6 +139,8 @@ program TEST (
         mi32_tr.rw = 1;
         mi32_tr.be = '1;
 
+        #(10*MI_CLK_PERIOD);
+
         // set MAC address to CAM memory
         for (int i = 0; i < MAC_COUNT; i++) begin
             // Send low 32 bits
@@ -550,9 +552,9 @@ program TEST (
 
     task test1();
         $write("\n\n############ TEST CASE 1 ############\n\n");
-        //resetDesign();
-        initConfig();
         enableTestEnvironment();
+        resetDesign();
+        initConfig();
         generator.setEnabled(TRANSACTION_COUNT);
         wait(!generator.enabled);
         disableTestEnvironment();
@@ -562,7 +564,6 @@ program TEST (
 
     task test2();
         $write("\n\n############ TEST CASE 2 ############\n\n");
-        //resetDesign();
         mfb_responder.wordDelayEnable_wt = 3;
         mfb_responder.wordDelayDisable_wt = 2;
         mfb_responder.wordDelayLow = 5;
@@ -571,8 +572,9 @@ program TEST (
         mvb_responder.wordDelayDisable_wt = 1;
         mvb_responder.wordDelayLow = 5;
         mvb_responder.wordDelayHigh = 20;
-        initConfig();
         enableTestEnvironment();
+        //resetDesign();
+        initConfig();
         generator.setEnabled(TRANSACTION_COUNT);
         wait(!generator.enabled);
         disableTestEnvironment();
@@ -581,7 +583,6 @@ program TEST (
     endtask
 
     initial begin
-        resetDesign();
         createGeneratorEnvironment(FRAME_SIZE_MAX, FRAME_SIZE_MIN, MAC_COUNT);
         createEnvironment();
         test1();

comp/nic/mac_lite/rx_mac_lite/ver/tbench/testbench.sv

@@ -10,11 +10,11 @@ module testbench;
 
     logic ASYNC_RESET;
     logic RX_CLK = 0;
-    logic RX_RESET;
+    logic RX_RESET = 1;
     logic TX_CLK = 0;
-    logic TX_RESET;
+    logic TX_RESET = 1;
     logic MI_CLK = 0;
-    logic MI_RESET;
+    logic MI_RESET = 1;
 
     iMfbRx #(RX_REGIONS,RX_REGION_SIZE,RX_BLOCK_SIZE,RX_ITEM_WIDTH) RX_MFB (RX_CLK, RX_RESET);
     iMfbTx #(TX_REGIONS,TX_REGION_SIZE,TX_BLOCK_SIZE,TX_ITEM_WIDTH) TX_MFB (TX_CLK, TX_RESET);

comp/nic/mac_lite/tx_mac_lite/comp/crc_insert/crc_insert.vhd

@@ -186,7 +186,7 @@ begin
     shake_vld <= not shake_vld_n;
 
     -- psl assert_sync_crc :
-    --      assert always ((countones(reg0_mfb_eof) > countones(shake_vld)) or (not (ci_mfb_src_rdy = '1' and ci_mfb_dst_rdy = '1'))) abort (RESET) @rising_edge(CLK)
+    --      assert always ((countones(reg0_mfb_eof) <= countones(shake_vld)) or (not (ci_mfb_src_rdy = '1' and ci_mfb_dst_rdy = '1'))) abort (RESET) @rising_edge(CLK)
     --      report "TX_MAC_LITE_CRC_INSERT: CRC32 out of sync!";
 
 

comp/nic/mac_lite/tx_mac_lite/top/umii/ver/tbench/test.sv

@@ -14,11 +14,11 @@ import crc32_ethernet_pkg::*;
 program TEST (
     input  logic RX_CLK,
     input  logic RX_CLK_X2,
-    output logic RX_RESET,
+    output logic RX_RESET=1,
     input  logic TX_CLK,
-    output logic TX_RESET,
+    output logic TX_RESET=1,
     input  logic MI_CLK,
-    output logic MI_RESET,
+    output logic MI_RESET=1,
     iMfbRx.tb RX,
     iMiiTx.tb TX,
     iMi32.tb  MI32
@@ -93,6 +93,8 @@ program TEST (
         mi32Transaction = new();
         mi32Driver      = new("Mi32 Driver", null, MI32);
 
+        #(10*MI_CLK_PERIOD);
+
         // Disable OBUF
         mi32Transaction.rw      = 1;
         mi32Transaction.be      = '1;
@@ -219,8 +221,9 @@ program TEST (
 
     task test1();
         $write("\n\n############ TEST CASE 1 ############\n\n");
-        initObuf();
         enableTestEnvironment();
+        resetDesign();
+        initObuf();
         generator.setEnabled(TRANSACTION_COUNT);
         wait(!generator.enabled);
         disableTestEnvironment();
@@ -230,7 +233,6 @@ program TEST (
     endtask
 
     initial begin
-        resetDesign();
         createGeneratorEnvironment(FRAME_SIZE_MAX, FRAME_SIZE_MIN);
         createEnvironment();
         test1();

comp/nic/mac_lite/tx_mac_lite/ver/tbench/test.sv

@@ -13,11 +13,11 @@ import crc32_ethernet_pkg::*;
 program TEST (
     input  logic RX_CLK,
     input  logic RX_CLK_X2,
-    output logic RX_RESET,
+    output logic RX_RESET=1,
     input  logic TX_CLK,
-    output logic TX_RESET,
+    output logic TX_RESET=1,
     input  logic MI_CLK,
-    output logic MI_RESET,
+    output logic MI_RESET=1,
     iMfbRx.tb RX,
     iMfbTx.tb TX,
     iMfbTx.monitor MONITOR,
@@ -97,6 +97,8 @@ program TEST (
         mi32Transaction = new();
         mi32Driver      = new("Mi32 Driver", null, MI32);
 
+        #(10*MI_CLK_PERIOD);
+
         // Disable OBUF
         mi32Transaction.rw      = 1;
         mi32Transaction.be      = '1;
@@ -223,8 +225,9 @@ program TEST (
 
     task test1();
         $write("\n\n############ TEST CASE 1 ############\n\n");
-        initObuf();
         enableTestEnvironment();
+        resetDesign();
+        initObuf();
         generator.setEnabled(TRANSACTION_COUNT);
         wait(!generator.enabled);
         disableTestEnvironment();
@@ -234,7 +237,6 @@ program TEST (
     endtask
 
     initial begin
-        resetDesign();
         createGeneratorEnvironment(FRAME_SIZE_MAX, FRAME_SIZE_MIN);
         createEnvironment();
         test1();