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
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").
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):