From 521ed071b614c4835461749890e13ce824d79ac2 Mon Sep 17 00:00:00 2001 From: Cole Poirier Date: Mon, 12 Oct 2020 15:24:03 -0700 Subject: [PATCH] fix ModuleNotFound/Import errors found when running pytest, just due to things being renamed and not kept in sync --- src/soc/experiment/score6600.py | 2 +- src/soc/fu/compunits/test/test_div_compunit.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/soc/experiment/score6600.py b/src/soc/experiment/score6600.py index 7b80d76f..33388084 100644 --- 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 cd0f079a..35fc1ab1 100644 --- 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): -- 2.30.2