fix ModuleNotFound/Import errors found when running pytest, just due to

things being renamed and not kept in sync

diff --git a/src/soc/experiment/score6600.py b/src/soc/experiment/score6600.py
index 7b80d76f6d3105cc321b80278b03edd236d8766b..333880847337c7a85dde5fa4206e631bd7bb0e26 100644 (file)
--- a/src/soc/experiment/score6600.py
+++ b/src/soc/experiment/score6600.py
@@ -15,7 +15,7 @@ from soc.scoreboard.instruction_q import Instruction, InstructionQ
 from soc.scoreboard.memfu import MemFunctionUnits
 
 from soc.experiment.compalu import ComputationUnitNoDelay
-from soc.experiment.compldst import LDSTCompUnit
+from soc.experiment.compldst_multi import LDSTCompUnit
 from soc.experiment.testmem import TestMemory
 
 from soc.experiment.alu_hier import ALU, BranchALU, CompALUOpSubset

diff --git a/src/soc/fu/compunits/test/test_div_compunit.py b/src/soc/fu/compunits/test/test_div_compunit.py
index cd0f079ad776deafdbff41cab848a062fa67a67a..35fc1ab161bddbeb4be9e63fdaab624511bb548b 100644 (file)
--- a/src/soc/fu/compunits/test/test_div_compunit.py
+++ b/src/soc/fu/compunits/test/test_div_compunit.py
@@ -5,14 +5,14 @@ from soc.fu.div.test.test_pipe_caller import get_cu_inputs
 from soc.fu.div.test.test_pipe_caller import DivTestCases  # creates the tests
 
 from soc.fu.test.common import ALUHelpers
-from soc.fu.compunits.compunits import DivFunctionUnit
+from soc.fu.compunits.compunits import DivFSMFunctionUnit
 from soc.fu.compunits.test.test_compunit import TestRunner
 from soc.config.endian import bigendian
 
 
 class DivTestRunner(TestRunner):
     def __init__(self, test_data):
-        super().__init__(test_data, DivFunctionUnit, self,
+        super().__init__(test_data, DivFSMFunctionUnit, self,
                          Function.DIV, bigendian)
 
     def get_cu_inputs(self, dec2, sim):