floogen(test): Fix unit tests

Author: fischeti

floogen/model/routing.py

@@ -367,16 +367,13 @@ def trim(self):
         # Validate the routing table
         self.model_validate(self)
 
-    def render(self, **kwargs):
+    def render(self, aw=None):
         """Render the SystemVerilog routing table."""
         string = ""
         rules = self.rules.copy()
-        if "id_offset" in kwargs and kwargs["id_offset"] is not None:
-            for rule in rules:
-                rule.dest -= kwargs["id_offset"]
         # typedef of the address rule
         string += sv_param_decl(f"{snake_to_camel(self.name)}NumRules", len(rules)) + "\n"
-        addr_type = f"logic [{kwargs["aw"]-1}:0]" if "aw" in kwargs else "id_t"
+        addr_type = f"logic [{aw-1}:0]" if aw is not None else "id_t"
         rule_type_dict = {}
         rule_type_dict = {"idx": "id_t", "start_addr": addr_type, "end_addr": addr_type}
         string += sv_struct_typedef(self.rule_type(), rule_type_dict)
@@ -389,7 +386,7 @@ def render(self, **kwargs):
             )
             return string
         for i, rule in enumerate(rules):
-            rules_str += f"{rule.render(**kwargs)}"
+            rules_str += f"{rule.render(aw)}"
             rules_str += ',' if i != len(rules) - 1 else ' '
             if rule.desc is not None:
                 rules_str += f"// {rule.desc}\n"

floogen/tests/address_test.py

@@ -76,7 +76,7 @@ def test_routing_table_len():
     """Test the length of a RoutingTable object."""
     rule1 = RouteMapRule(addr_range=AddrRange(start=0, end=10), dest=SimpleId(id=1))
     rule2 = RouteMapRule(addr_range=AddrRange(start=11, end=20), dest=SimpleId(id=2))
-    routing_table = RouteMap(rules=[rule1, rule2])
+    routing_table = RouteMap(name="test_map", rules=[rule1, rule2])
     assert len(routing_table) == 2
 
 
@@ -85,7 +85,7 @@ def test_check_no_overlapping_ranges():
     rule1 = RouteMapRule(addr_range=AddrRange(start=0, end=10), dest=SimpleId(id=1))
     rule2 = RouteMapRule(addr_range=AddrRange(start=5, end=15), dest=SimpleId(id=2))
     with pytest.raises(ValueError):
-        RouteMap(rules=[rule1, rule2])
+        RouteMap(name="test_map", rules=[rule1, rule2])
 
 
 def test_trim():
@@ -94,7 +94,7 @@ def test_trim():
     rule2 = RouteMapRule(addr_range=AddrRange(start=10, end=20), dest=SimpleId(id=1))
     rule3 = RouteMapRule(addr_range=AddrRange(start=20, end=30), dest=SimpleId(id=2))
     rule4 = RouteMapRule(addr_range=AddrRange(start=31, end=40), dest=SimpleId(id=2))
-    routing_table = RouteMap(rules=[rule1, rule2, rule3, rule4])
+    routing_table = RouteMap(name="test_map", rules=[rule1, rule2, rule3, rule4])
     routing_table.trim()
     expected_rules = [
         RouteMapRule(addr_range=AddrRange(start=0, end=20), dest=SimpleId(id=1)),