clean up names, also note that readable is true if no writes are pending

[soc.git] / src / scoreboard / fu_fu_matrix.py

diff --git a/src/scoreboard/fu_fu_matrix.py b/src/scoreboard/fu_fu_matrix.py
index e682bb2865d7c11084ea406c8015c91a457433fc..d8eaa8588c42eb8712d463109da2e9ce12c418c8 100644 (file)
--- a/src/scoreboard/fu_fu_matrix.py
+++ b/src/scoreboard/fu_fu_matrix.py
@@ -1,6 +1,6 @@
 from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
-from nmigen import Module, Signal, Elaboratable, Array, Cat
+from nmigen import Module, Signal, Elaboratable, Array, Cat, Const
 
 #from nmutil.latch import SRLatch
 from .fu_dep_cell import FUDependenceCell
@@ -61,14 +61,14 @@ class FUFUDepMatrix(Elaboratable):
             writable.append(fu.writable_o)
 
         # ... and output them from this module (horizontal, width=REGs)
-        m.d.comb += self.readable_o.eq(Cat(*writable))
-        m.d.comb += self.writable_o.eq(Cat(*readable))
+        m.d.comb += self.readable_o.eq(Cat(*readable))
+        m.d.comb += self.writable_o.eq(Cat(*writable))
 
         # ---
         # connect FU Pending
         # ---
         for y in range(self.n_fu_row):
-            fu = fur[x]
+            fu = fur[y]
             rd_wait_o = []
             wr_wait_o = []
             for x in range(self.n_fu_col):
@@ -81,11 +81,11 @@ class FUFUDepMatrix(Elaboratable):
                          fu.wr_pend_i.eq(Cat(*wr_wait_o)),
                         ]
         # ---
-        # connect Dependency Matrix issue to module issue
+        # connect Dependency Matrix dest/src1/src2/issue to module d/s/s/i
         # ---
-        for y in range(self.n_fu_row):
+        for x in range(self.n_fu_col):
             issue_i = []
-            for x in range(self.n_fu_col):
+            for y in range(self.n_fu_row):
                 dc = dm[x][y]
                 # accumulate cell inputs issue
                 issue_i.append(dc.issue_i)
@@ -111,10 +111,16 @@ class FUFUDepMatrix(Elaboratable):
         # ---
         # connect Matrix pending
         # ---
-        for x in range(self.n_fu_col):
+        for y in range(self.n_fu_row):
             rd_pend_i = []
             wr_pend_i = []
-            for y in range(self.n_fu_row):
+            for x in range(self.n_fu_col):
+                if x == y: # ignore hazards on the diagonal: self-against-self
+                    dummyrd = Signal(reset_less=True)
+                    dummywr = Signal(reset_less=True)
+                    rd_pend_i.append(dummyrd)
+                    wr_pend_i.append(dummywr)
+                    continue
                 dc = dm[x][y]
                 # accumulate cell rd_pend/wr_pend/go_rd/go_wr
                 rd_pend_i.append(dc.rd_pend_i)