diff --git a/test/fu/__init__.py b/test/backend/__init__.py similarity index 100% rename from test/fu/__init__.py rename to test/backend/__init__.py diff --git a/test/stages/test_backend.py b/test/backend/test_annoucement.py similarity index 100% rename from test/stages/test_backend.py rename to test/backend/test_annoucement.py diff --git a/test/stages/test_retirement.py b/test/backend/test_retirement.py similarity index 100% rename from test/stages/test_retirement.py rename to test/backend/test_retirement.py diff --git a/test/lsu/__init__.py b/test/core_structs/__init__.py similarity index 100% rename from test/lsu/__init__.py rename to test/core_structs/__init__.py diff --git a/test/structs_common/test_rat.py b/test/core_structs/test_rat.py similarity index 100% rename from test/structs_common/test_rat.py rename to test/core_structs/test_rat.py diff --git a/test/structs_common/test_reorder_buffer.py b/test/core_structs/test_reorder_buffer.py similarity index 100% rename from test/structs_common/test_reorder_buffer.py rename to test/core_structs/test_reorder_buffer.py diff --git a/test/stages/__init__.py b/test/func_blocks/__init__.py similarity index 100% rename from test/stages/__init__.py rename to test/func_blocks/__init__.py diff --git a/test/structs_common/__init__.py b/test/func_blocks/csr/__init__.py similarity index 100% rename from test/structs_common/__init__.py rename to test/func_blocks/csr/__init__.py diff --git a/test/structs_common/test_csr.py b/test/func_blocks/csr/test_csr.py similarity index 100% rename from test/structs_common/test_csr.py rename to test/func_blocks/csr/test_csr.py diff --git a/test/transactions/__init__.py b/test/func_blocks/fu/__init__.py similarity index 100% rename from test/transactions/__init__.py rename to test/func_blocks/fu/__init__.py diff --git a/test/utils/__init__.py b/test/func_blocks/fu/common/__init__.py similarity index 100% rename from test/utils/__init__.py rename to test/func_blocks/fu/common/__init__.py diff --git a/test/structs_common/test_rs.py b/test/func_blocks/fu/common/test_rs.py similarity index 100% rename from test/structs_common/test_rs.py rename to test/func_blocks/fu/common/test_rs.py diff --git a/test/fu/functional_common.py b/test/func_blocks/fu/functional_common.py similarity index 100% rename from test/fu/functional_common.py rename to test/func_blocks/fu/functional_common.py diff --git a/test/fu/test_alu.py b/test/func_blocks/fu/test_alu.py similarity index 98% rename from test/fu/test_alu.py rename to test/func_blocks/fu/test_alu.py index 5d14e2b25..a4c091cbf 100644 --- a/test/fu/test_alu.py +++ b/test/func_blocks/fu/test_alu.py @@ -1,7 +1,7 @@ from coreblocks.frontend.decoder import Funct3, Funct7, OpType from coreblocks.func_blocks.fu.alu import AluFn, ALUComponent -from test.fu.functional_common import ExecFn, FunctionalUnitTestCase +from test.func_blocks.fu.functional_common import ExecFn, FunctionalUnitTestCase from transactron.utils import signed_to_int diff --git a/test/fu/test_div_unit.py b/test/func_blocks/fu/test_div_unit.py similarity index 96% rename from test/fu/test_div_unit.py rename to test/func_blocks/fu/test_div_unit.py index e7afee8da..2be7f90ae 100644 --- a/test/fu/test_div_unit.py +++ b/test/func_blocks/fu/test_div_unit.py @@ -3,7 +3,7 @@ from coreblocks.frontend.decoder import Funct3, Funct7, OpType from coreblocks.func_blocks.fu.div_unit import DivFn, DivComponent -from test.fu.functional_common import ExecFn, FunctionalUnitTestCase +from test.func_blocks.fu.functional_common import ExecFn, FunctionalUnitTestCase from transactron.utils import signed_to_int, int_to_signed diff --git a/test/fu/test_exception_unit.py b/test/func_blocks/fu/test_exception_unit.py similarity index 95% rename from test/fu/test_exception_unit.py rename to test/func_blocks/fu/test_exception_unit.py index 61e66904b..8306edd7e 100644 --- a/test/fu/test_exception_unit.py +++ b/test/func_blocks/fu/test_exception_unit.py @@ -2,7 +2,7 @@ from coreblocks.frontend.decoder.isa import ExceptionCause from coreblocks.frontend.decoder import OpType, Funct3 -from test.fu.functional_common import ExecFn, FunctionalUnitTestCase +from test.func_blocks.fu.functional_common import ExecFn, FunctionalUnitTestCase class TestExceptionUnit(FunctionalUnitTestCase[ExceptionUnitFn.Fn]): diff --git a/test/fu/test_fu_decoder.py b/test/func_blocks/fu/test_fu_decoder.py similarity index 100% rename from test/fu/test_fu_decoder.py rename to test/func_blocks/fu/test_fu_decoder.py diff --git a/test/fu/test_jb_unit.py b/test/func_blocks/fu/test_jb_unit.py similarity index 98% rename from test/fu/test_jb_unit.py rename to test/func_blocks/fu/test_jb_unit.py index 6253e6838..cc0fb792d 100644 --- a/test/fu/test_jb_unit.py +++ b/test/func_blocks/fu/test_jb_unit.py @@ -11,7 +11,7 @@ from transactron.utils import signed_to_int -from test.fu.functional_common import ExecFn, FunctionalUnitTestCase +from test.func_blocks.fu.functional_common import ExecFn, FunctionalUnitTestCase class JumpBranchWrapper(Elaboratable): diff --git a/test/fu/test_mul_unit.py b/test/func_blocks/fu/test_mul_unit.py similarity index 96% rename from test/fu/test_mul_unit.py rename to test/func_blocks/fu/test_mul_unit.py index 983875bfe..6711ac6e4 100644 --- a/test/fu/test_mul_unit.py +++ b/test/func_blocks/fu/test_mul_unit.py @@ -5,7 +5,7 @@ from transactron.utils import signed_to_int, int_to_signed -from test.fu.functional_common import ExecFn, FunctionalUnitTestCase +from test.func_blocks.fu.functional_common import ExecFn, FunctionalUnitTestCase @parameterized_class( diff --git a/test/fu/test_shift_unit.py b/test/func_blocks/fu/test_shift_unit.py similarity index 95% rename from test/fu/test_shift_unit.py rename to test/func_blocks/fu/test_shift_unit.py index 52ec15783..8dfd6e47f 100644 --- a/test/fu/test_shift_unit.py +++ b/test/func_blocks/fu/test_shift_unit.py @@ -1,7 +1,7 @@ from coreblocks.frontend.decoder import Funct3, Funct7, OpType from coreblocks.func_blocks.fu.shift_unit import ShiftUnitFn, ShiftUnitComponent -from test.fu.functional_common import ExecFn, FunctionalUnitTestCase +from test.func_blocks.fu.functional_common import ExecFn, FunctionalUnitTestCase class TestShiftUnit(FunctionalUnitTestCase[ShiftUnitFn.Fn]): diff --git a/test/fu/test_unsigned_mul_unit.py b/test/func_blocks/fu/test_unsigned_mul_unit.py similarity index 100% rename from test/fu/test_unsigned_mul_unit.py rename to test/func_blocks/fu/test_unsigned_mul_unit.py diff --git a/test/fu/test_zbc.py b/test/func_blocks/fu/test_zbc.py similarity index 96% rename from test/fu/test_zbc.py rename to test/func_blocks/fu/test_zbc.py index 2d2ceb354..46f8ad77c 100644 --- a/test/fu/test_zbc.py +++ b/test/func_blocks/fu/test_zbc.py @@ -4,7 +4,7 @@ from coreblocks.frontend.decoder import Funct3, Funct7, OpType from coreblocks.params.configurations import test_core_config -from test.fu.functional_common import ExecFn, FunctionalUnitTestCase +from test.func_blocks.fu.functional_common import ExecFn, FunctionalUnitTestCase # Instruction semantics are based on pseudocode from the spec diff --git a/test/fu/test_zbs.py b/test/func_blocks/fu/test_zbs.py similarity index 94% rename from test/fu/test_zbs.py rename to test/func_blocks/fu/test_zbs.py index ab6f271f9..50198f0a5 100644 --- a/test/fu/test_zbs.py +++ b/test/func_blocks/fu/test_zbs.py @@ -1,7 +1,7 @@ from coreblocks.frontend.decoder import Funct3, Funct7, OpType from coreblocks.func_blocks.fu.zbs import ZbsFunction, ZbsComponent -from test.fu.functional_common import ExecFn, FunctionalUnitTestCase +from test.func_blocks.fu.functional_common import ExecFn, FunctionalUnitTestCase class TestZbsUnit(FunctionalUnitTestCase[ZbsFunction.Fn]): diff --git a/test/func_blocks/lsu/__init__.py b/test/func_blocks/lsu/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/test/lsu/test_dummylsu.py b/test/func_blocks/lsu/test_dummylsu.py similarity index 100% rename from test/lsu/test_dummylsu.py rename to test/func_blocks/lsu/test_dummylsu.py diff --git a/test/lsu/test_pma.py b/test/func_blocks/lsu/test_pma.py similarity index 100% rename from test/lsu/test_pma.py rename to test/func_blocks/lsu/test_pma.py diff --git a/test/priv/__init__.py b/test/priv/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/test/priv/traps/__init__.py b/test/priv/traps/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/test/structs_common/test_exception.py b/test/priv/traps/test_exception.py similarity index 100% rename from test/structs_common/test_exception.py rename to test/priv/traps/test_exception.py diff --git a/test/transactron/core/__init__.py b/test/transactron/core/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/test/transactions/test_transactions.py b/test/transactron/core/test_transactions.py similarity index 100% rename from test/transactions/test_transactions.py rename to test/transactron/core/test_transactions.py diff --git a/test/transactron/lib/__init__.py b/test/transactron/lib/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/test/utils/test_fifo.py b/test/transactron/lib/test_fifo.py similarity index 100% rename from test/utils/test_fifo.py rename to test/transactron/lib/test_fifo.py diff --git a/test/transactions/test_transaction_lib.py b/test/transactron/lib/test_transaction_lib.py similarity index 100% rename from test/transactions/test_transaction_lib.py rename to test/transactron/lib/test_transaction_lib.py diff --git a/test/transactions/test_adapter.py b/test/transactron/test_adapter.py similarity index 100% rename from test/transactions/test_adapter.py rename to test/transactron/test_adapter.py diff --git a/test/transactions/test_assign.py b/test/transactron/test_assign.py similarity index 100% rename from test/transactions/test_assign.py rename to test/transactron/test_assign.py diff --git a/test/transactions/test_branches.py b/test/transactron/test_branches.py similarity index 100% rename from test/transactions/test_branches.py rename to test/transactron/test_branches.py diff --git a/test/transactions/test_methods.py b/test/transactron/test_methods.py similarity index 100% rename from test/transactions/test_methods.py rename to test/transactron/test_methods.py diff --git a/test/transactions/test_simultaneous.py b/test/transactron/test_simultaneous.py similarity index 100% rename from test/transactions/test_simultaneous.py rename to test/transactron/test_simultaneous.py diff --git a/test/transactron/utils/__init__.py b/test/transactron/utils/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/test/utils/test_onehotswitch.py b/test/transactron/utils/test_onehotswitch.py similarity index 100% rename from test/utils/test_onehotswitch.py rename to test/transactron/utils/test_onehotswitch.py diff --git a/test/utils/test_utils.py b/test/transactron/utils/test_utils.py similarity index 100% rename from test/utils/test_utils.py rename to test/transactron/utils/test_utils.py