Migration to amaranth.lib.data (#357)

constants/ecp5_platforms.py

@@ -97,8 +97,8 @@ def make_resources(pins: PinManager) -> list[Resource]:
                 number,
                 en=pins.p(),
                 done=pins.p(),
-                data_in=pins.p(adapter.data_in.shape().width),
-                data_out=pins.p(adapter.data_out.shape().width),
+                data_in=pins.p(adapter.data_in.shape().size),
+                data_out=pins.p(adapter.data_out.shape().size),
             )
         ]
 

coreblocks/fu/fu_decoder.py

@@ -21,7 +21,7 @@ class Decoder(Elaboratable):
     def __init__(self, gen_params: GenParams, decode_fn: Type[IntFlag], ops: Sequence[tuple], check_optype: bool):
         layouts = gen_params.get(CommonLayoutFields)
 
-        self.exec_fn = Record(layouts.exec_fn_layout)
+        self.exec_fn = Signal(layouts.exec_fn_layout)
         self.decode_fn = Signal(decode_fn)
         self.ops = ops
         self.check_optype = check_optype

coreblocks/fu/mul_unit.py

@@ -45,13 +45,13 @@ def get_instructions(self) -> Sequence[tuple]:
         ]
 
 
-def get_input(arg: Record) -> tuple[Value, Value]:
+def get_input(arg: MethodStruct) -> tuple[Value, Value]:
     """
     Operation of getting two input values.
 
     Parameters
     ----------
-    arg: Record
+    arg: MethodStruct
         Arguments of functional unit issue call.
 
     Returns

coreblocks/lsu/dummyLsu.py

@@ -1,4 +1,5 @@
 from amaranth import *
+from amaranth.lib.data import View
 
 from transactron import Method, def_method, Transaction, TModule
 from coreblocks.params import *
@@ -220,7 +221,7 @@ def elaborate(self, platform):
         precommiting = Signal()  # start execution
         issued = Signal()  # instruction was issued to the bus
         flush = Signal()  # exception handling, requests are not issued
-        current_instr = Record(self.lsu_layouts.rs.data_layout)
+        current_instr = Signal(self.lsu_layouts.rs.data_layout)
 
         m.submodules.pma_checker = pma_checker = PMAChecker(self.gen_params)
         m.submodules.requester = requester = LSURequester(self.gen_params, self.bus)
@@ -248,7 +249,7 @@ def _():
             return {"rs_entry_id": 0}
 
         @def_method(m, self.insert)
-        def _(rs_data: Record, rs_entry_id: Value):
+        def _(rs_data: View, rs_entry_id: Value):
             m.d.sync += assign(current_instr, rs_data)
             m.d.sync += valid.eq(1)