Merge branch 'schwarz-fix-jenkins_long_logs' into 'devel'

Remove excesive logging in some cocotb verifications

See merge request ndk/ndk-fpga!439

Author: martinspinler

comp/base/hash/ver/cocotb/cocotb_test.py

@@ -151,7 +151,7 @@ def hash_func(key: bytes, seed: bytes):
         transaction["SEED"] = randint(0, 2**seed_width-1)
         transaction["META"] = randint(0, 2**meta_width-1)
 
-        cocotb.log.info(f"{i=}, {transaction=}")
+        #cocotb.log.info(f"{i=}, {transaction=}")
 
         hash = hash_func(transaction["KEY"].to_bytes(key_width_bytes, "little"), transaction["SEED"].to_bytes(seed_width_bytes, "little"))
 

comp/base/mem/mp_bram/cocotb/cocotb_test.py

@@ -41,10 +41,8 @@ async def write_read_test(dut, pkt_count=1000, item_width_min=1, item_width_max=
 
     addr_width = len(tb.stream_in.bus.WR_ADDR[0])
 
-    cocotb.log.info("-------------------------------------Write and immediate read---------------------------------")
-
-    for transaction in random_packets(item_width_min, item_width_max, pkt_count):
-        cocotb.log.info(f"generated transaction: {transaction.hex()}")
+    for i, transaction in enumerate(random_packets(item_width_min, item_width_max, pkt_count)):
+        #cocotb.log.info(f"generated transaction: {transaction.hex()}")
 
         address = randint(0, (2**addr_width-1)-(len(transaction)*8))
 
@@ -53,11 +51,14 @@ async def write_read_test(dut, pkt_count=1000, item_width_min=1, item_width_max=
         tb.ref_ram.write(address, transaction) # writting transaction to reference RAM
 
         output = await tb.stream_in.read(address, len(transaction), parallel=parallel_read)
-        cocotb.log.info(f"received transaction:  {output.hex()}")
+        #cocotb.log.info(f"received transaction:  {output.hex()}")
 
         if output != transaction:
             raise TestFailure(f"Expected {transaction.hex()}, got {output.hex()}")
 
+        if i % 100 == 0:
+            cocotb.log.info(f"Processed requests {i}/{pkt_count}.")
+
     cocotb.log.info("--------------------Comparing end state of reference RAM and simulated RAM--------------------")
 
     for i in range(2**addr_width):
@@ -72,19 +73,23 @@ async def write_read_test(dut, pkt_count=1000, item_width_min=1, item_width_max=
 
 @cocotb.test()
 async def test_simple(dut):
+    "Serial write and read"
     await write_read_test(dut)
 
 
 @cocotb.test()
 async def test_parallel_write(dut):
+    "Parallel write, serial read"
     await write_read_test(dut, parallel_write=True)
 
 
 @cocotb.test()
 async def test_parallel_read(dut):
+    "Serial write, parallel read"
     await write_read_test(dut, parallel_read=True)
 
 
 @cocotb.test()
 async def test_parallel_write_read(dut):
+    "Parallel write and read"
     await write_read_test(dut, parallel_write=True, parallel_read=True)

comp/mvb_tools/storage/mvb_hash_table_simple/cocotb/cocotb_test.py

@@ -147,7 +147,7 @@ async def run_test(dut, config_file: str = "test_configs/test_config_1B.yaml", c
     #     pkt_count: how many random packets are to be generated.
 
     cocotb.start_soon(Clock(dut.CLK, 5, units='ns').start())
-    tb = testbench(dut, debug=True)
+    tb = testbench(dut, debug=False)
     await tb.reset()
 
     tb.backpressure.start(BackpressureGenerator(BackpressureConfig(1, 5, 0.5)))
@@ -247,7 +247,7 @@ async def run_test(dut, config_file: str = "test_configs/test_config_1B.yaml", c
         mvb_req_tr = MvbReqTrHashTableSimple()
         mvb_req_tr.key = int_transaction
 
-        cocotb.log.info(f"generated transaction: {hex(mvb_req_tr.key)}")
+        #cocotb.log.info(f"generated transaction: {hex(mvb_req_tr.key)}")
         tb.stream_in.append(mvb_req_tr)
 
     last_num = 0

comp/nic/mac_lite/rx_mac_lite/comp/adapters/mac_seg/cocotb/cocotb_test.py

@@ -54,7 +54,7 @@ async def run_test(dut, pkt_count=10000, frame_size_min=60, frame_size_max=2048)
 
     for transaction in random_packets(frame_size_min, frame_size_max, pkt_count):
         tb.model(transaction)
-        cocotb.log.info("generated transaction: " + transaction.hex())
+        #cocotb.log.info("generated transaction: " + transaction.hex())
         tb.stream_in.append(transaction)
 
     last_num = 0