Rename the internal DFF of latchregisters to avoid conflict

diff --git a/src/soc/experiment/compalu.py b/src/soc/experiment/compalu.py
index 0cc2651519e3da99daf45ed4336c344b3a714e12..52e21f7bd1d3dd7bfcf2d5dc188db730f8774a4b 100644 (file)
--- a/src/soc/experiment/compalu.py
+++ b/src/soc/experiment/compalu.py
@@ -98,11 +98,11 @@ class ComputationUnitNoDelay(Elaboratable):
 
         # create a latch/register for the operand
         oper_r = CompALUOpSubset()
-        latchregister(m, self.oper_i, oper_r, self.issue_i, "oper_r")
+        latchregister(m, self.oper_i, oper_r, self.issue_i, "oper_l")
 
         # and one for the output from the ALU
         data_r = Signal(self.rwid, reset_less=True)  # Dest register
-        latchregister(m, self.alu.o, data_r, req_l.q, "data_r")
+        latchregister(m, self.alu.o, data_r, req_l.q, "data_l")
 
         # pass the operation to the ALU
         m.d.comb += self.alu.op.eq(oper_r)

diff --git a/src/soc/experiment/compalu_multi.py b/src/soc/experiment/compalu_multi.py
index 75df2153517ecd733cd5270776e88d76b8df5d06..10d3ae7912a3b17c0e8476449da08b4b61adb4b7 100644 (file)
--- a/src/soc/experiment/compalu_multi.py
+++ b/src/soc/experiment/compalu_multi.py
@@ -205,14 +205,14 @@ class MultiCompUnit(RegSpecALUAPI, Elaboratable):
 
         # create a latch/register for the operand
         oper_r = self.opsubsetkls()
-        latchregister(m, self.oper_i, oper_r, self.issue_i, "oper_r")
+        latchregister(m, self.oper_i, oper_r, self.issue_i, "oper_l")
 
         # and for each output from the ALU
         drl = []
         for i in range(self.n_dst):
             name = "data_r%d" % i
             data_r = Signal(self.cu._get_srcwid(i), name=name, reset_less=True)
-            latchregister(m, self.get_out(i), data_r, req_l.q[i], name)
+            latchregister(m, self.get_out(i), data_r, req_l.q[i], name + "_l")
             drl.append(data_r)
 
         # pass the operation to the ALU

diff --git a/src/soc/experiment/compldst.py b/src/soc/experiment/compldst.py
index e4f51b6047463f01946ec8b00f1c4c2290d2b891..f5ee73b049a23f3be0c033f53951c03c0dfb9311 100644 (file)
--- a/src/soc/experiment/compldst.py
+++ b/src/soc/experiment/compldst.py
@@ -257,7 +257,7 @@ class LDSTCompUnit(Elaboratable):
 
         # create a latch/register for the operand
         oper_r = CompALUOpSubset()  # Dest register
-        latchregister(m, self.oper_i, oper_r, self.issue_i, name="oper_r")
+        latchregister(m, self.oper_i, oper_r, self.issue_i, name="oper_l")
 
         # and one for the output from the ALU
         data_r = Signal(self.rwid, reset_less=True)  # Dest register
@@ -288,8 +288,8 @@ class LDSTCompUnit(Elaboratable):
                                               self.src2_i))
 
         # create a latch/register for src1/src2 (include immediate select)
-        latchregister(m, self.src1_i, self.alu.a, src_l.q, name="src1_r")
-        latchregister(m, self.src2_i, src2_r, src_l.q, name="src2_r")
+        latchregister(m, self.src1_i, self.alu.a, src_l.q, name="src1_l")
+        latchregister(m, self.src2_i, src2_r, src_l.q, name="src2_l")
         latchregister(m, src2_or_imm, self.alu.b, src_sel, name="imm_r")
 
         # decode bits of operand (latched)

diff --git a/src/soc/experiment/compldst_multi.py b/src/soc/experiment/compldst_multi.py
index 6988c6f3f7dc3525682c88663599e33602cbe879..a0ee965d9a71af74249d5f4856423e7a26c69336 100644 (file)
--- a/src/soc/experiment/compldst_multi.py
+++ b/src/soc/experiment/compldst_multi.py
@@ -336,7 +336,7 @@ class LDSTCompUnit(Elaboratable):
 
         # create a latch/register for the operand
         oper_r = CompLDSTOpSubset()  # Dest register
-        latchregister(m, self.oper_i, oper_r, self.issue_i, name="oper_r")
+        latchregister(m, self.oper_i, oper_r, self.issue_i, name="oper_l")
 
         # and for LD
         ldd_r = Signal(self.rwid, reset_less=True)  # Dest register
@@ -347,7 +347,7 @@ class LDSTCompUnit(Elaboratable):
         for i in range(self.n_src):
             name = "src_r%d" % i
             src_r = Signal(self.rwid, name=name, reset_less=True)
-            latchregister(m, self.src_i[i], src_r, src_l.q[i], name)
+            latchregister(m, self.src_i[i], src_r, src_l.q[i], name + '_l')
             srl.append(src_r)
 
         # and one for the output from the ADD (for the EA)

diff --git a/src/soc/experiment/l0_cache.py b/src/soc/experiment/l0_cache.py
index ae26656b7f6b8bcdee3dcfa09893073b4c2f8934..09f8c1b677989adcbe80e7f1091026d3d4d28622 100644 (file)
--- a/src/soc/experiment/l0_cache.py
+++ b/src/soc/experiment/l0_cache.py
@@ -260,8 +260,8 @@ class L0CacheBuffer(Elaboratable):
         ld_idx = Signal(nbits, reset_less=False)
         st_idx = Signal(nbits, reset_less=False)
         # use these because of the sync-and-comb pass-through capability
-        latchregister(m, ldpick.o, ld_idx, idx_l.qn, name="ld_idx")
-        latchregister(m, stpick.o, st_idx, idx_l.qn, name="st_idx")
+        latchregister(m, ldpick.o, ld_idx, idx_l.qn, name="ld_idx_l")
+        latchregister(m, stpick.o, st_idx, idx_l.qn, name="st_idx_l")
 
         # convenience variables to reference the "picked" port
         ldport = self.dports[ld_idx].pi