add regfile selection

diff --git a/src/scoreboard/dependence_cell.py b/src/scoreboard/dependence_cell.py
index 103cf2d2fec2404ec12508eab7090c62bc620c22..3624d1a48d1da1c6dd850c769260f97d5ee8ed68 100644 (file)
--- a/src/scoreboard/dependence_cell.py
+++ b/src/scoreboard/dependence_cell.py
@@ -3,7 +3,7 @@ from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Elaboratable
 from nmutil.latch import SRLatch
 
-class DepencenceCell(Elaboratable):
+class DependenceCell(Elaboratable):
     """ implements 11.4.7 mitch alsup dependence cell, p27
     """
     def __init__(self):
@@ -45,14 +45,14 @@ class DepencenceCell(Elaboratable):
         m.d.sync += src2_l.r.eq(self.go_read_i)
 
         # FU "Forward Progress" (read out horizontally)
-        m.d.comb += self.dest_rsel_o.eq(dest_l.q & self.go_write_i)
-        m.d.comb += self.src1_rsel_o.eq(src1_l.q & self.go_read_i)
-        m.d.comb += self.src2_rsel_o.eq(src2_l.q & self.go_read_i)
+        m.d.comb += self.dest_rsel_o.eq(dest_l.qn & self.go_write_i)
+        m.d.comb += self.src1_rsel_o.eq(src1_l.qn & self.go_read_i)
+        m.d.comb += self.src2_rsel_o.eq(src2_l.qn & self.go_read_i)
 
         # Register File Select (read out vertically)
-        m.d.comb += self.dest_fwd_o.eq(dest_l.q & self.dest_i)
-        m.d.comb += self.src1_fwd_o.eq(src1_l.q & self.src1_i)
-        m.d.comb += self.src2_fwd_o.eq(src2_l.q & self.src2_i)
+        m.d.comb += self.dest_fwd_o.eq(dest_l.qn & self.dest_i)
+        m.d.comb += self.src1_fwd_o.eq(src1_l.qn & self.src1_i)
+        m.d.comb += self.src2_fwd_o.eq(src2_l.qn & self.src2_i)
 
         return m
 
@@ -74,21 +74,27 @@ class DepencenceCell(Elaboratable):
         return list(self)
 
 def dcell_sim(dut):
-    yield dut.s.eq(0)
-    yield dut.r.eq(0)
+    yield dut.dest_i.eq(1)
+    yield dut.issue_i.eq(1)
     yield
-    yield dut.s.eq(1)
+    yield dut.issue_i.eq(0)
     yield
-    yield dut.s.eq(0)
+    yield dut.src1_i.eq(1)
+    yield dut.issue_i.eq(1)
     yield
-    yield dut.r.eq(1)
+    yield dut.issue_i.eq(0)
     yield
-    yield dut.r.eq(0)
+    yield dut.go_read_i.eq(1)
     yield
+    yield dut.go_read_i.eq(0)
+    yield
+    yield dut.go_write_i.eq(1)
+    yield
+    yield dut.go_write_i.eq(0)
     yield
 
 def test_dcell():
-    dut = DepencenceCell()
+    dut = DependenceCell()
     vl = rtlil.convert(dut, ports=dut.ports())
     with open("test_dcell.il", "w") as f:
         f.write(vl)

diff --git a/src/scoreboard/reg_select.py b/src/scoreboard/reg_select.py
new file mode 100644 (file)
index 0000000..9d16741
--- /dev/null
+++ b/src/scoreboard/reg_select.py
@@ -0,0 +1,19 @@
+from nmigen import Elaboratable, Module, Array, Signal
+
+class RegReservation(Elaboratable):
+    def __init__(self, fu_count):
+        self.fu_count = fu_count
+        self.dest_rsel_i = Signal(fu_count, reset_less=True)
+        self.src1_rsel_i = Signal(fu_count, reset_less=True)
+        self.src2_rsel_i = Signal(fu_count, reset_less=True)
+        self.dest_rsel_o = Signal(reset_less=True)
+        self.src1_rsel_o = Signal(reset_less=True)
+        self.src2_rsel_o = Signal(reset_less=True)
+
+    def elaboratable(self, platform):
+        m = Module()
+        m.d.comb += self.dest_rsel_o.eq(self.dest_rsel_i.bool())
+        m.d.comb += self.src1_rsel_o.eq(self.src1_rsel_i.bool())
+        m.d.comb += self.src2_rsel_o.eq(self.src2_rsel_i.bool())
+        return m
+