From 3f95480966d36a63075942bbf8fca3bd3f521b95 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 20 May 2020 01:58:38 +0100 Subject: [PATCH] fix a series of random imports --- src/soc/experiment/alu_hier.py | 2 +- src/soc/experiment/compalu_multi.py | 2 +- src/soc/scoreboard/test_mem_fu_matrix.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/soc/experiment/alu_hier.py b/src/soc/experiment/alu_hier.py index 2a10ed15..72de4874 100644 --- a/src/soc/experiment/alu_hier.py +++ b/src/soc/experiment/alu_hier.py @@ -17,7 +17,7 @@ from nmigen.compat.sim import run_simulation from soc.decoder.power_enums import InternalOp, Function, CryIn -from soc.alu.alu_input_record import CompALUOpSubset +from soc.fu.alu.alu_input_record import CompALUOpSubset import operator diff --git a/src/soc/experiment/compalu_multi.py b/src/soc/experiment/compalu_multi.py index f9cb83ea..0a9541a7 100644 --- a/src/soc/experiment/compalu_multi.py +++ b/src/soc/experiment/compalu_multi.py @@ -7,7 +7,7 @@ from nmutil.latch import SRLatch, latchregister from soc.decoder.power_decoder2 import Data from soc.decoder.power_enums import InternalOp -from alu_hier import CompALUOpSubset +from soc.fu.alu.alu_input_record import CompALUOpSubset """ Computation Unit (aka "ALU Manager"). diff --git a/src/soc/scoreboard/test_mem_fu_matrix.py b/src/soc/scoreboard/test_mem_fu_matrix.py index b85ce898..12dba0cc 100644 --- a/src/soc/scoreboard/test_mem_fu_matrix.py +++ b/src/soc/scoreboard/test_mem_fu_matrix.py @@ -21,7 +21,9 @@ from math import log import unittest # FIXME: fixed up imports -from ..experiment.score6600 import IssueToScoreboard, RegSim, instr_q, wait_for_busy_clear, wait_for_issue, CompUnitALUs, CompUnitBR +from soc.experiment.score6600 import (IssueToScoreboard, RegSim, instr_q, + wait_for_busy_clear, wait_for_issue, + CompUnitALUs, CompUnitBR) class Memory(Elaboratable): -- 2.30.2