Handle dynamic decoder managers

Author: tilk

coreblocks/func_blocks/fu/alu.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass, KW_ONLY
+from dataclasses import dataclass, KW_ONLY, field
 from typing import Sequence
 from amaranth import *
 
@@ -284,7 +284,10 @@ class ALUComponent(FunctionalComponentParams):
     zba_enable: bool = False
     zbb_enable: bool = False
     zicond_enable: bool = False
-    decoder_manager: AluFn = AluFn(zba_enable=zba_enable, zbb_enable=zbb_enable, zicond_enable=zicond_enable)
+    decoder_manager: AluFn = field(init=False)
+
+    def get_decoder_manager(self):
+        return AluFn(zba_enable=self.zba_enable, zbb_enable=self.zbb_enable, zicond_enable=self.zicond_enable)
 
     def get_module(self, gen_params: GenParams) -> FuncUnit:
         return AluFuncUnit(gen_params, self.decoder_manager)

coreblocks/func_blocks/fu/lsu/dummyLsu.py

@@ -161,5 +161,8 @@ def get_module(self, gen_params: GenParams) -> FuncUnit:
         unit = LSUDummy(gen_params, bus_master)
         return unit
 
+    def get_decoder_manager(self):
+        pass  # LSU component currently doesn't have a decoder manager
+
     def get_optypes(self) -> set[OpType]:
         return {OpType.LOAD, OpType.STORE, OpType.FENCE}

coreblocks/func_blocks/fu/shift_unit.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass, KW_ONLY
+from dataclasses import dataclass, KW_ONLY, field
 from typing import Sequence
 from amaranth import *
 
@@ -114,7 +114,10 @@ def _(arg):
 class ShiftUnitComponent(FunctionalComponentParams):
     _: KW_ONLY
     zbb_enable: bool = False
-    decoder_manager: ShiftUnitFn = ShiftUnitFn(zbb_enable=zbb_enable)
+    decoder_manager: ShiftUnitFn = field(init=False)
+
+    def get_decoder_manager(self):
+        return ShiftUnitFn(zbb_enable=self.zbb_enable)
 
     def get_module(self, gen_params: GenParams) -> FuncUnit:
         return ShiftFuncUnit(gen_params, self.decoder_manager)

coreblocks/params/fu_params.py

@@ -41,10 +41,17 @@ class FunctionalComponentParams(ABC):
     _: KW_ONLY
     decoder_manager: "DecoderManager" = field(init=False)
 
+    def __post_init__(self):
+        if not hasattr(self, "decoder_manager"):
+            object.__setattr__(self, "decoder_manager", self.get_decoder_manager())
+
     @abstractmethod
     def get_module(self, gen_params: "GenParams") -> FuncUnit:
         raise NotImplementedError()
 
+    def get_decoder_manager(self) -> "DecoderManager":
+        raise NotImplementedError()
+
     def get_optypes(self) -> set["OpType"]:
         return self.decoder_manager.get_op_types()