bring in cancel array into FURegDepMatrix

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

diff --git a/src/scoreboard/test_mem2_fu_matrix.py b/src/scoreboard/test_mem2_fu_matrix.py
index 50659e2e3d0afae8a79260e495dba7dced60b596..b75d21954185a08442499ada531f50e40f4d95eb 100644 (file)
--- a/src/scoreboard/test_mem2_fu_matrix.py
+++ b/src/scoreboard/test_mem2_fu_matrix.py
@@ -9,6 +9,7 @@ from scoreboard.global_pending import GlobalPending
 from scoreboard.group_picker import GroupPicker
 from scoreboard.issue_unit import IssueUnitGroup, IssueUnitArray, RegDecode
 from scoreboard.shadow import ShadowMatrix, BranchSpeculationRecord
+from scoreboard.addr_match import PartialAddrMatch
 
 from nmutil.latch import SRLatch
 from nmutil.nmoperator import eq
@@ -56,6 +57,21 @@ class MemSim:
         self.mem[addr>>self.ddepth] = data & ((1<<self.regwid)-1)
 
 
+class FUMemMatchMatrix(FURegDepMatrix, PartialAddrMatch):
+    """ implement a FU-Regs overload with memory-address matching
+    """
+    def __init__(self, n_fu, addrbitwid):
+        PartialAddrMatch.__init__(self, n_fu, addrbitwid)
+        FURegDepMatrix.__init__(self, n_fu, n_fu, 1, self.addr_match_o)
+
+    def elaborate(self, platform):
+        m = Module()
+        FURegDepMatrix._elaborate(self, m, platform)
+        PartialAddrMatch._elaborate(self, m, platform)
+
+        return m
+
+
 class MemFunctionUnits(Elaboratable):
 
     def __init__(self, n_ldsts):
@@ -91,9 +107,14 @@ class MemFunctionUnits(Elaboratable):
         intfudeps = FUFUDepMatrix(n_fus, n_fus)
         m.submodules.intfudeps = intfudeps
         # Integer FU-Reg Dep Matrix
-        intregdeps = FURegDepMatrix(n_fus, n_fus, 1)
+        intregdeps = FUMemMatchMatrix(n_fus, 11)
         m.submodules.intregdeps = intregdeps
 
+        # ok, because we do not know in advance what the AGEN (address gen)
+        # is, we have to make a transitive dependency set.  i.e. the LD
+        # (or ST) being requested now must depend on ALL prior LDs *AND* STs.
+        # these get dropped very rapidly once AGEN is carried out.
+
         # connect fureg matrix as a mem system
         comb += self.g_int_ld_pend_o.eq(intregdeps.v_rd_rsel_o)
         comb += self.g_int_st_pend_o.eq(intregdeps.v_wr_rsel_o)