MVB Hash Table Simple - cocotb [HOTFIX]: update the Cocotb test to be compatible with the new MVB drivers and monitors

Author: danielkondys

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

@@ -29,6 +29,7 @@
 from cocotbext.ofm.utils.servicer import Servicer
 from cocotbext.ofm.utils.device import get_dtb
 from cocotbext.ofm.utils.math import ceildiv
+from cocotbext.ofm.mvb.transaction import MvbTrClassic
 
 import itertools
 from math import log2
@@ -117,7 +118,7 @@ def load_file(self, path: str, params: dict) -> (dict, list, list, dict):
                 out_keys.append(mvb_key)
                 out_data[mvb_key] = data
 
-                table.append([h, (mvb_key << (self.stream_out._item_width * 8 + 1)) + ((data << 1) + 1)])
+                table.append([h, (mvb_key << ((self.stream_out.item_widths["data"] // 8) * 8 + 1)) + ((data << 1) + 1)])
 
             out_config.append(table)
 
@@ -175,9 +176,9 @@ async def run_test(dut, config_file: str = "test_configs/test_config_1B.yaml", c
     cocotb.log.debug(f"TABLE_CAPACITY: {table_capacity}")
 
     """Asserting that the read configuration match configuration of the drivers connected to the component."""
-    assert mvb_items == tb.stream_in._items
-    assert mvb_key_width_bytes == tb.stream_in._item_width
-    assert data_out_width_bytes == tb.stream_out._item_width
+    assert mvb_items == tb.stream_in.items
+    assert mvb_key_width_bytes == tb.stream_in.item_widths["data"] // 8 # FIXME
+    assert data_out_width_bytes == tb.stream_out.item_widths["data"] // 8 # FIXME
     assert hash_width == log2(table_capacity)
 
     """Loading configuration from a config file"""
@@ -237,10 +238,14 @@ async def run_test(dut, config_file: str = "test_configs/test_config_1B.yaml", c
     for transaction in random_packets(item_width, item_width, pkt_count):
         int_transaction = int.from_bytes(transaction, "little")
 
+        mvb_tr = MvbTrClassic()
         if int_transaction in model_keys:
-            tb.model((model_data[int_transaction].to_bytes(data_out_width_bytes, 'little'), 1))
+            mvb_tr.data = model_data[int_transaction]
+            vld = 1
         else:
-            tb.model(((0).to_bytes(data_out_width_bytes, 'little'), 0))
+            mvb_tr.data = 0
+            vld = 0
+        tb.model((mvb_tr, vld))
 
         cocotb.log.info(f"generated transaction: {transaction.hex()}")
         tb.stream_in.append(transaction)

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

@@ -5,18 +5,35 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 from cocotbext.ofm.mvb.monitors import MVBMonitor
+from cocotbext.ofm.mvb.transaction import MvbTrClassic
 
 
 class MVB_HASH_TABLE_SIMPLE_Monitor(MVBMonitor):
     _signals = ["data", "match", "vld", "src_rdy", "dst_rdy"]
 
-    def receive_data(self, data, offset):
+    def recv_bytes(self, vld):
+        data_val = self.bus.data.value
+        data_val.big_endian = False
+        data_bytes = data_val.buff
+
         match_val = self.bus.match.value
         match_val.big_endian = False
 
         self.log.debug(f"MATCH: {match_val}")
 
-        if match_val[offset] == 1:
-            self._recv((data[offset*self._item_width:(offset+1)*self._item_width], 1))
-        else:
-            self._recv((self._item_width * b'\x00', 0))
+        item_bytes = self._item_widths["data"] // 8
+        for i in range(self._items):
+            # Mask and shift the Valid signal per each Item
+            if vld & 1:
+                if match_val & 1:
+                    # Getting the data slice (Item) from the "bytes" transaction
+                    data_b = data_bytes[i*item_bytes : (i+1)*item_bytes]
+                    # Converting the data slice (Item) to the MvbTrClassic object
+                    mvb_tr = MvbTrClassic.from_bytes(data_b)
+                    self._recv((mvb_tr, 1))
+                else:
+                    mvb_tr = MvbTrClassic()
+                    mvb_tr.data = 0
+                    self._recv((mvb_tr, 0))
+            match_val >>= 1
+            vld >>= 1