from nmigen import Module, Signal, Elaboratable, Array, Cat
#from nmutil.latch import SRLatch
-from .dependence_cell import DependenceCell
-from .fu_wr_pending import FU_RW_Pend
-from .reg_select import Reg_Rsv
+from scoreboard.dependence_cell import DependencyRow
+from scoreboard.fu_wr_pending import FU_RW_Pend
+from scoreboard.reg_select import Reg_Rsv
"""
6600 Dependency Table Matrix inputs / outputs
---------------------------------------------
- d s1 s2 i d s1 s2 i d s1 s2 i d s1 s2 i
- | | | | | | | | | | | | | | | |
- v v v v v v v v v v v v v v v v
+ d s1 s2 i d s1 s2 i d s1 s2 i d s1 s2 i
+ | | | | | | | | | | | | | | | |
+ v v v v v v v v v v v v v v v v
go_rd/go_wr -> dm-r0-fu0 dm-r1-fu0 dm-r2-fu0 dm-r3-fu0 -> wr/rd-pend
go_rd/go_wr -> dm-r0-fu1 dm-r1-fu1 dm-r2-fu1 dm-r3-fu1 -> wr/rd-pend
go_rd/go_wr -> dm-r0-fu2 dm-r1-fu2 dm-r2-fu2 dm-r3-fu2 -> wr/rd-pend
self.dest_i = Signal(n_reg_col, reset_less=True) # Dest in (top)
self.src1_i = Signal(n_reg_col, reset_less=True) # oper1 in (top)
self.src2_i = Signal(n_reg_col, reset_less=True) # oper2 in (top)
- self.issue_i = Signal(n_reg_col, reset_less=True) # Issue in (top)
+ 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)
# ---
# matrix of dependency cells
# ---
- dm = Array(Array(DependenceCell() for r in range(self.n_fu_row)) \
- for f in range(self.n_reg_col))
- for rn in range(self.n_reg_col):
- for fu in range(self.n_fu_row):
- setattr(m.submodules, "dm_r%d_fu%d" % (rn, fu), dm[rn][fu])
+ dm = Array(DependencyRow(self.n_reg_col) for r in range(self.n_fu_row))
+ for fu in range(self.n_fu_row):
+ setattr(m.submodules, "dr_fu%d" % fu, dm[fu])
# ---
# array of Function Unit Pending vectors
rd_src1_pend = []
rd_src2_pend = []
for fu in range(self.n_fu_row):
+ dc = dm[fu]
fup = fupend[fu]
dest_fwd_o = []
src1_fwd_o = []
src2_fwd_o = []
for rn in range(self.n_reg_col):
- dc = dm[rn][fu]
- # accumulate cell fwd outputs for dest/src1/src2
- dest_fwd_o.append(dc.dest_fwd_o)
- src1_fwd_o.append(dc.src1_fwd_o)
- src2_fwd_o.append(dc.src2_fwd_o)
+ # accumulate cell fwd outputs for dest/src1/src2
+ dest_fwd_o.append(dc.dest_fwd_o[rn])
+ src1_fwd_o.append(dc.src1_fwd_o[rn])
+ src2_fwd_o.append(dc.src2_fwd_o[rn])
# connect cell fwd outputs to FU Vector in [Cat is gooood]
m.d.comb += [fup.dest_fwd_i.eq(Cat(*dest_fwd_o)),
fup.src1_fwd_i.eq(Cat(*src1_fwd_o)),
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
# ---
src1_rsel_o = []
src2_rsel_o = []
for fu in range(self.n_fu_row):
- dc = dm[rn][fu]
+ dc = dm[fu]
# accumulate cell reg-select outputs dest/src1/src2
- dest_rsel_o.append(dc.dest_rsel_o)
- src1_rsel_o.append(dc.src1_rsel_o)
- src2_rsel_o.append(dc.src2_rsel_o)
+ dest_rsel_o.append(dc.dest_rsel_o[rn])
+ src1_rsel_o.append(dc.src1_rsel_o[rn])
+ src2_rsel_o.append(dc.src2_rsel_o[rn])
# connect cell reg-select outputs to Reg Vector In
m.d.comb += [rsv.dest_rsel_i.eq(Cat(*dest_rsel_o)),
rsv.src1_rsel_i.eq(Cat(*src1_rsel_o)),
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
# ---
- for rn in range(self.n_reg_col):
- dest_i = []
- src1_i = []
- src2_i = []
- issue_i = []
- for fu in range(self.n_fu_row):
- dc = dm[rn][fu]
- # accumulate cell inputs dest/src1/src2
- dest_i.append(dc.dest_i)
- src1_i.append(dc.src1_i)
- src2_i.append(dc.src2_i)
- issue_i.append(dc.issue_i)
+ for fu in range(self.n_fu_row):
+ dc = dm[fu]
# wire up inputs from module to row cell inputs (Cat is gooood)
- m.d.comb += [Cat(*dest_i).eq(self.dest_i),
- Cat(*src1_i).eq(self.src1_i),
- Cat(*src2_i).eq(self.src2_i),
- Cat(*issue_i).eq(self.issue_i),
+ m.d.comb += [dc.dest_i.eq(self.dest_i),
+ dc.src1_i.eq(self.src1_i),
+ dc.src2_i.eq(self.src2_i),
]
# ---
- # connect Dependency Matrix go_rd_i/go_wr_i to module go_rd/go_wr
+ # connect Dep issue_i/go_rd_i/go_wr_i to module issue_i/go_rd/go_wr
# ---
+ go_rd_i = []
+ go_wr_i = []
+ issue_i = []
for fu in range(self.n_fu_row):
- go_rd_i = []
- go_wr_i = []
- for rn in range(self.n_reg_col):
- dc = dm[rn][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)
- # 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),
- ]
+ 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)
+ 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(*issue_i).eq(self.issue_i),
+ ]
return m
yield self.rd_pend_o
yield self.rd_src1_pend_o
yield self.rd_src2_pend_o
-
+
def ports(self):
return list(self)
projects / soc.git / blobdiff