From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 17 Apr 2020 12:05:10 +0000 (+0100)
Subject: whoops not using CompUnitMulti
X-Git-Tag: div_pipeline~1432^2~8
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8613a5adbf067fc5f67be82dd513dbc3699335fe;p=soc.git

whoops not using CompUnitMulti
---

diff --git a/src/soc/experiment/compalu_multi.py b/src/soc/experiment/compalu_multi.py
index f2eda4ed..56cdd4f9 100644
--- a/src/soc/experiment/compalu_multi.py
+++ b/src/soc/experiment/compalu_multi.py
@@ -97,7 +97,7 @@ class ComputationUnitNoDelay(Elaboratable):
         # write_requests all done
         wr_any = Signal(reset_less=True)
         req_done = Signal(reset_less=True)
-        m.d.comb += self.done_o.eq(~(self.req_rel_o.bool())
+        m.d.comb += self.done_o.eq(~(self.req_rel_o.bool()))
         m.d.comb += wr_any.eq(self.go_wr_i.bool())
         m.d.comb += req_done.eq(self.done_o & rst_l.q & wr_any)
 
diff --git a/src/soc/experiment/score6600_multi.py b/src/soc/experiment/score6600_multi.py
index 39f0b5a6..a04c1b97 100644
--- a/src/soc/experiment/score6600_multi.py
+++ b/src/soc/experiment/score6600_multi.py
@@ -15,6 +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.compalu_multi import ComputationUnitNoDelay as MultiCompUnit
 from soc.experiment.compldst import LDSTCompUnit
 from soc.experiment.testmem import TestMemory
 
@@ -272,7 +273,7 @@ class CompUnitALUs(CompUnitsBase):
         units = []
         for alu in alus:
             aluopwid = 3  # extra bit for immediate mode
-            units.append(ComputationUnitNoDelay(rwid, alu))
+            units.append(MultiCompUnit(rwid, alu))
 
         CompUnitsBase.__init__(self, rwid, units)