From 3ffc3b52e1749429f47e9fd51c292f174b12fae1 Mon Sep 17 00:00:00 2001 From: "Hazard (Cyprian Skrzypczak)" Date: Mon, 9 Dec 2024 23:05:27 +0100 Subject: [PATCH] Updated Transactron commit to 6520af4774f198c998a28ec0eb9ad198e04b4508 and fixed includes (#773) --- coreblocks/cache/refiller.py | 4 ++-- coreblocks/func_blocks/fu/jumpbranch.py | 2 +- coreblocks/func_blocks/fu/mul_unit.py | 2 ++ requirements.txt | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/coreblocks/cache/refiller.py b/coreblocks/cache/refiller.py index 92fea2911..91561ba7f 100644 --- a/coreblocks/cache/refiller.py +++ b/coreblocks/cache/refiller.py @@ -3,8 +3,8 @@ from coreblocks.params import ICacheParameters from coreblocks.interface.layouts import ICacheLayouts from coreblocks.peripherals.bus_adapter import BusMasterInterface -from transactron.core import Transaction -from transactron.lib import Forwarder, Method, TModule, def_method +from transactron.core import Transaction, Method, TModule, def_method +from transactron.lib import Forwarder from amaranth.utils import exact_log2 diff --git a/coreblocks/func_blocks/fu/jumpbranch.py b/coreblocks/func_blocks/fu/jumpbranch.py index 6cc31f66f..31b845e56 100644 --- a/coreblocks/func_blocks/fu/jumpbranch.py +++ b/coreblocks/func_blocks/fu/jumpbranch.py @@ -8,7 +8,7 @@ from transactron.core import def_method from transactron.lib import * from transactron.lib import logging -from transactron.utils import DependencyContext +from transactron.utils import DependencyContext, from_method_layout from coreblocks.params import GenParams, FunctionalComponentParams from coreblocks.arch import Funct3, OpType, ExceptionCause, Extension from coreblocks.interface.layouts import FuncUnitLayouts, JumpBranchLayouts, CommonLayoutFields diff --git a/coreblocks/func_blocks/fu/mul_unit.py b/coreblocks/func_blocks/fu/mul_unit.py index e6c9f0947..2bfb05f4e 100644 --- a/coreblocks/func_blocks/fu/mul_unit.py +++ b/coreblocks/func_blocks/fu/mul_unit.py @@ -13,6 +13,8 @@ from transactron import * from transactron.core import def_method from transactron.lib import * +from transactron.utils import MethodStruct + from coreblocks.func_blocks.fu.common.fu_decoder import DecoderManager diff --git a/requirements.txt b/requirements.txt index 19b874c8c..313005557 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ +amaranth==0.5.3 amaranth-stubs @ git+https://github.com/kuznia-rdzeni/amaranth-stubs.git@edb302b001433edf4c8568190adc9bd0c0039f45 -transactron @ git+https://github.com/kuznia-rdzeni/transactron.git@972047b7bfac3d2e193a428de35c976f9b17c51a amaranth-yosys==0.40.0.0.post100 -amaranth==0.5.3 dataclasses-json==0.6.3 +transactron @ git+https://github.com/kuznia-rdzeni/transactron.git@6520af4774f198c998a28ec0eb9ad198e04b4508