use fanin_wr and fanin_rd

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "peakrdl-busdecoder"
-version = "0.6.9"
+version = "0.6.7"
 requires-python = ">=3.10"
 dependencies = [
     "jinja2~=3.1",

src/peakrdl_busdecoder/design_scanner.py

@@ -44,14 +44,3 @@ class DesignScanner(RDLListener):
             self.ds.has_external_addressable = True
             if not isinstance(node, RegNode):
                 self.ds.has_external_block = True
-
-    def enter_Reg(self, node: RegNode) -> None:
-        if node.external and node != self.top_node:
-            return
-
-        accesswidth = node.get_property("accesswidth")
-        if accesswidth is None:
-            return
-
-        if accesswidth > self.ds.cpuif_data_width:
-            self.ds.cpuif_data_width = accesswidth

tests/cocotb_lib/__init__.py

@@ -5,8 +5,6 @@ RDL_CASES: list[tuple[str, str]] = [
     ("multiple_reg.rdl", "multi_reg"),
     ("deep_hierarchy.rdl", "deep_hierarchy"),
     ("wide_status.rdl", "wide_status"),
-    ("wide_access_64.rdl", "wide_access_64"),
-    ("wide_access_128.rdl", "wide_access_128"),
     ("variable_layout.rdl", "variable_layout"),
     ("asymmetric_bus.rdl", "asymmetric_bus"),
 ]

tests/cocotb_lib/rdl/asymmetric_bus.rdl

@@ -73,7 +73,6 @@ addrmap asymmetric_bus {
 
     reg {
         regwidth = 64;
-        accesswidth = 32;
         field {
             sw = rw;
             hw = rw;
@@ -89,18 +88,11 @@ addrmap asymmetric_bus {
 
     reg {
         regwidth = 128;
-        accesswidth = 32;
         field {
             sw = rw;
             hw = rw;
             reset = 0x0;
-        } extended_id_low[31:0];
-
-        field {
-            sw = rw;
-            hw = rw;
-            reset = 0x0;
-        } extended_id_high[63:32];
+        } extended_id[63:0];
 
         field {
             sw = rw;

tests/cocotb_lib/rdl/variable_layout.rdl

@@ -69,7 +69,6 @@ regfile slice_rf {
 
     reg {
         regwidth = 64;
-        accesswidth = 32;
         field {
             sw = r;
             hw = w;

tests/cocotb_lib/rdl/wide_access_128.rdl

@@ -1,75 +0,0 @@
-reg payload128_reg_t {
-    regwidth = 128;
-    accesswidth = 128;
-    desc = "128-bit payload register.";
-
-    field {
-        sw = rw;
-        hw = rw;
-        reset = 0x0;
-    } word0[31:0];
-
-    field {
-        sw = rw;
-        hw = rw;
-        reset = 0x0;
-    } word1[63:32];
-
-    field {
-        sw = rw;
-        hw = rw;
-        reset = 0x0;
-    } word2[95:64];
-
-    field {
-        sw = rw;
-        hw = rw;
-        reset = 0x0;
-    } word3[127:96];
-};
-
-regfile block128_rf {
-    payload128_reg_t payload @ 0x0;
-
-    reg {
-        regwidth = 128;
-        accesswidth = 128;
-        field {
-            sw = r;
-            hw = w;
-            reset = 0x0;
-        } status0[31:0];
-
-        field {
-            sw = r;
-            hw = w;
-            reset = 0x0;
-        } status1[63:32];
-
-        field {
-            sw = r;
-            hw = w;
-            reset = 0x0;
-        } status2[95:64];
-
-        field {
-            sw = r;
-            hw = w;
-            reset = 0x0;
-        } status3[127:96];
-    } status @ 0x10;
-};
-
-addrmap wide_access_128 {
-    block128_rf blocks[2] @ 0x0 += 0x40;
-
-    reg {
-        regwidth = 64;
-        accesswidth = 64;
-        field {
-            sw = rw;
-            hw = rw;
-            reset = 0x0;
-        } id[63:0];
-    } id @ 0x100;
-};

tests/cocotb_lib/rdl/wide_access_64.rdl

@@ -1,56 +0,0 @@
-reg status64_reg_t {
-    regwidth = 64;
-    accesswidth = 64;
-    desc = "64-bit status register.";
-
-    field {
-        sw = r;
-        hw = w;
-        reset = 0x0;
-    } status_lo[31:0];
-
-    field {
-        sw = r;
-        hw = w;
-        reset = 0x0;
-    } status_hi[63:32];
-};
-
-regfile channel64_rf {
-    status64_reg_t status @ 0x0;
-
-    reg {
-        regwidth = 64;
-        accesswidth = 64;
-        field {
-            sw = rw;
-            hw = rw;
-            reset = 0x1;
-        } enable[0:0];
-
-        field {
-            sw = rw;
-            hw = rw;
-            reset = 0x0;
-        } mode[2:1];
-
-        field {
-            sw = rw;
-            hw = rw;
-            reset = 0x0;
-        } threshold[63:3];
-    } control @ 0x8;
-};
-
-addrmap wide_access_64 {
-    channel64_rf channels[4] @ 0x0 += 0x20;
-
-    reg {
-        regwidth = 32;
-        field {
-            sw = rw;
-            hw = rw;
-            reset = 0x0;
-        } flags[31:0];
-    } flags @ 0x100;
-};

tests/cocotb_lib/rdl/wide_status.rdl

@@ -1,6 +1,5 @@
 reg status_reg_t {
     regwidth = 64;
-    accesswidth = 32;
     desc = "Status register capturing wide flags and sticky bits.";
 
     field {
@@ -8,14 +7,7 @@ reg status_reg_t {
         hw = w;
         onread = rclr;
         reset = 0x0;
-    } flags_low[31:0];
-
-    field {
-        sw = r;
-        hw = w;
-        onread = rclr;
-        reset = 0x0;
-    } flags_high[62:32];
+    } flags[62:0];
 
     field {
         sw = rw;
@@ -26,7 +18,6 @@ reg status_reg_t {
 
 reg metrics_reg_t {
     regwidth = 64;
-    accesswidth = 32;
     desc = "Metrics register pairing counters with thresholds.";
 
     field {
@@ -49,30 +40,11 @@ addrmap wide_status {
 
     reg {
         regwidth = 128;
-        accesswidth = 32;
         field {
             sw = rw;
             hw = rw;
             reset = 0x0;
-        } configuration_0[31:0];
-
-        field {
-            sw = rw;
-            hw = rw;
-            reset = 0x0;
-        } configuration_1[63:32];
-
-        field {
-            sw = rw;
-            hw = rw;
-            reset = 0x0;
-        } configuration_2[95:64];
-
-        field {
-            sw = rw;
-            hw = rw;
-            reset = 0x0;
-        } configuration_3[127:96];
+        } configuration[127:0];
     } configuration @ 0x800;
 
     reg {

tests/generator/test_design_state.py

@@ -122,43 +122,3 @@ class TestDesignState:
 
         # Should infer 32-bit data width from field
         assert ds.cpuif_data_width == 32
-
-    def test_design_state_accesswidth_64(self, compile_rdl: Callable[..., AddrmapNode]) -> None:
-        """Test DesignState with explicit 64-bit access width."""
-        rdl_source = """
-        addrmap test {
-            reg {
-                regwidth = 64;
-                accesswidth = 64;
-                field {
-                    sw=rw;
-                    hw=r;
-                } data[63:0];
-            } my_reg @ 0x0;
-        };
-        """
-        top = compile_rdl(rdl_source, top="test")
-
-        ds = DesignState(top, {})
-
-        assert ds.cpuif_data_width == 64
-
-    def test_design_state_accesswidth_128(self, compile_rdl: Callable[..., AddrmapNode]) -> None:
-        """Test DesignState with explicit 128-bit access width."""
-        rdl_source = """
-        addrmap test {
-            reg {
-                regwidth = 128;
-                accesswidth = 128;
-                field {
-                    sw=rw;
-                    hw=r;
-                } data[127:0];
-            } my_reg @ 0x0;
-        };
-        """
-        top = compile_rdl(rdl_source, top="test")
-
-        ds = DesignState(top, {})
-
-        assert ds.cpuif_data_width == 128

uv.lock

@@ -526,7 +526,7 @@ wheels = [
 
 [[package]]
 name = "peakrdl-busdecoder"
-version = "0.6.8"
+version = "0.6.7"
 source = { editable = "." }
 dependencies = [
     { name = "jinja2" },