from nmigen.cli import verilog, rtlil
from nmigen import Module, Signal, Elaboratable, Array, Cat
-#from nmutil.latch import SRLatch
from scoreboard.dependence_cell import DependencyRow
from scoreboard.fu_wr_pending import FU_RW_Pend
from scoreboard.reg_select import Reg_Rsv
+from scoreboard.global_pending import GlobalPending
"""
# Register "Global" vectors for determining RaW and WaR hazards
self.wr_pend_i = Signal(n_reg_col, reset_less=True) # wr pending (top)
self.rd_pend_i = Signal(n_reg_col, reset_less=True) # rd pending (top)
- self.wr_rsel_o = Signal(n_reg_col, reset_less=True) # wr pending (bot)
- self.rd_rsel_o = Signal(n_reg_col, reset_less=True) # rd pending (bot)
+ self.v_wr_rsel_o = Signal(n_reg_col, reset_less=True) # wr pending (bot)
+ self.v_rd_rsel_o = Signal(n_reg_col, reset_less=True) # rd pending (bot)
- self.issue_i = Signal(n_fu_row, reset_less=True) # Issue in (top)
- self.go_wr_i = Signal(n_fu_row, reset_less=True) # Go Write in (left)
+ self.issue_i = Signal(n_fu_row, reset_less=True) # Issue in (top)
+ self.go_wr_i = Signal(n_fu_row, reset_less=True) # Go Write in (left)
self.go_rd_i = Signal(n_fu_row, reset_less=True) # Go Read in (left)
+ self.go_die_i = Signal(n_fu_row, reset_less=True) # Go Die in (left)
# for Register File Select Lines (horizontal), per-reg
self.dest_rsel_o = Signal(n_reg_col, reset_less=True) # dest reg (bot)
m.d.comb += self.rd_src1_pend_o.eq(Cat(*rd_src1_pend))
m.d.comb += self.rd_src2_pend_o.eq(Cat(*rd_src2_pend))
- print ("wr pend len", len(wr_pend))
-
# ---
# connect Reg Selection vector
# ---
dest_rsel.append(rsv.dest_rsel_o)
src1_rsel.append(rsv.src1_rsel_o)
src2_rsel.append(rsv.src2_rsel_o)
- print ("dest_rsel_rsv len", len(rsv.dest_rsel_o))
# ... and output them from this module (horizontal, width=REGs)
m.d.comb += self.dest_rsel_o.eq(Cat(*dest_rsel))
m.d.comb += self.src1_rsel_o.eq(Cat(*src1_rsel))
m.d.comb += self.src2_rsel_o.eq(Cat(*src2_rsel))
- print ("dest rsel len", len(dest_rsel), self.dest_rsel_o)
# ---
# connect Dependency Matrix dest/src1/src2/issue to module d/s/s/i
# ---
dc.wr_pend_i.eq(self.wr_pend_i),
]
- # accumulate and OR rsel bits (should be done in a separate module)
+ # accumulate rsel bits into read/write pending vectors.
rd_pend_v = []
wr_pend_v = []
- for rn in range(self.n_reg_col):
- rd_l = []
- wr_l = []
- for fu in range(self.n_fu_row):
- dc = dm[fu]
- rd_l.append(dc.rd_rsel_o[rn])
- wr_l.append(dc.wr_rsel_o[rn])
- rd_pend_v.append(Cat(*rd_l).bool())
- wr_pend_v.append(Cat(*wr_l).bool())
+ for fu in range(self.n_fu_row):
+ dc = dm[fu]
+ rd_pend_v.append(dc.v_rd_rsel_o)
+ wr_pend_v.append(dc.v_wr_rsel_o)
+ rd_v = GlobalPending(self.n_reg_col, rd_pend_v)
+ wr_v = GlobalPending(self.n_reg_col, wr_pend_v)
+ m.submodules.rd_v = rd_v
+ m.submodules.wr_v = wr_v
- m.d.comb += self.rd_rsel_o.eq(Cat(*rd_pend_v))
- m.d.comb += self.wr_rsel_o.eq(Cat(*wr_pend_v))
+ m.d.comb += self.v_rd_rsel_o.eq(rd_v.g_pend_o)
+ m.d.comb += self.v_wr_rsel_o.eq(wr_v.g_pend_o)
# ---
# connect Dep issue_i/go_rd_i/go_wr_i to module issue_i/go_rd/go_wr
# ---
go_rd_i = []
go_wr_i = []
+ go_die_i = []
issue_i = []
for fu in range(self.n_fu_row):
dc = dm[fu]
# accumulate cell fwd outputs for dest/src1/src2
go_rd_i.append(dc.go_rd_i)
go_wr_i.append(dc.go_wr_i)
+ go_die_i.append(dc.go_die_i)
issue_i.append(dc.issue_i)
# wire up inputs from module to row cell inputs (Cat is gooood)
m.d.comb += [Cat(*go_rd_i).eq(self.go_rd_i),
Cat(*go_wr_i).eq(self.go_wr_i),
+ Cat(*go_die_i).eq(self.go_die_i),
Cat(*issue_i).eq(self.issue_i),
]
yield self.issue_i
yield self.go_wr_i
yield self.go_rd_i
+ yield self.go_die_i
yield self.dest_rsel_o
yield self.src1_rsel_o
yield self.src2_rsel_o
yield self.rd_pend_o
yield self.wr_pend_i
yield self.rd_pend_i
- yield self.wr_rsel_o
- yield self.rd_rsel_o
+ yield self.v_wr_rsel_o
+ yield self.v_rd_rsel_o
yield self.rd_src1_pend_o
yield self.rd_src2_pend_o
projects / soc.git / blobdiff