From 95148f3c1e7aa023f3292be5e1f9163503d944d0 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 18 May 2019 07:50:36 +0100 Subject: [PATCH] now using readable/writable from fu-fu matrix, seems to be working --- src/experiment/cscore.py | 12 ++++++------ src/scoreboard/fn_unit.py | 6 +++--- src/scoreboard/fu_picker_vec.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/experiment/cscore.py b/src/experiment/cscore.py index 0a321b5f..b57190cf 100644 --- a/src/experiment/cscore.py +++ b/src/experiment/cscore.py @@ -174,15 +174,15 @@ class Scoreboard(Elaboratable): intfu_rd_pend_v = Signal(n_int_fus, reset_less = True) intfu_wr_pend_v = Signal(n_int_fus, reset_less = True) for i in range(n_int_fus): - m.d.comb += intfu_rd_pend_v[i].eq(if_l[i].int_rd_pend_o.bool()) - m.d.comb += intfu_wr_pend_v[i].eq(if_l[i].int_wr_pend_o.bool()) - #m.d.comb += intfu_rd_pend_v[i].eq(if_l[i].int_readable_o) - #m.d.comb += intfu_wr_pend_v[i].eq(if_l[i].int_writable_o) + #m.d.comb += intfu_rd_pend_v[i].eq(if_l[i].int_rd_pend_o.bool()) + #m.d.comb += intfu_wr_pend_v[i].eq(if_l[i].int_wr_pend_o.bool()) + m.d.comb += intfu_rd_pend_v[i].eq(if_l[i].int_readable_o) + m.d.comb += intfu_wr_pend_v[i].eq(if_l[i].int_writable_o) # Connect INT Fn Unit global wr/rd pending for fu in if_l: - m.d.comb += fu.g_int_wr_pend_i.eq(intfu_wr_pend_v) - m.d.comb += fu.g_int_rd_pend_i.eq(intfu_rd_pend_v) + m.d.sync += fu.g_int_wr_pend_i.eq(intfu_wr_pend_v) + m.d.sync += fu.g_int_rd_pend_i.eq(intfu_rd_pend_v) # Connect FU-FU Matrix, NOTE: FN Units readable/writable considered # to be unit "read-pending / write-pending" diff --git a/src/scoreboard/fn_unit.py b/src/scoreboard/fn_unit.py index 3edabbde..30669429 100644 --- a/src/scoreboard/fn_unit.py +++ b/src/scoreboard/fn_unit.py @@ -164,8 +164,8 @@ class FnUnit(Elaboratable): g_rd = Signal(self.reg_width, reset_less=True) ro = Signal(reset_less=True) m.d.comb += g_rd.eq(self.g_wr_pend_i & self.rd_pend_o) - m.d.comb += ro.eq(~g_rd.bool()) - m.d.comb += self.readable_o.eq(ro & rd_l.q) + m.d.comb += ro.eq(~g_rd.bool() & rd_l.q) + m.d.comb += self.readable_o.eq(ro) # writable output signal g_wr_v = Signal(self.reg_width, reset_less=True) @@ -173,7 +173,7 @@ class FnUnit(Elaboratable): wo = Signal(reset_less=True) m.d.comb += g_wr_v.eq(g_pend_i & xx_pend_o) m.d.comb += g_wr.eq(~g_wr_v.bool()) - m.d.comb += wo.eq(g_wr & rd_l.qn & self.req_rel_i & shadown) + m.d.comb += wo.eq(g_wr & rd_l.q & shadown) m.d.comb += writable_o.eq(wo) return m diff --git a/src/scoreboard/fu_picker_vec.py b/src/scoreboard/fu_picker_vec.py index 21ed7fc2..fd44c45f 100644 --- a/src/scoreboard/fu_picker_vec.py +++ b/src/scoreboard/fu_picker_vec.py @@ -16,6 +16,6 @@ class FU_Pick_Vec(Elaboratable): def elaborate(self, platform): m = Module() m.d.comb += self.readable_o.eq(self.rd_pend_i.bool()) - m.d.comb += self.writable_o.eq(~self.wr_pend_i.bool()) + m.d.comb += self.writable_o.eq(self.wr_pend_i.bool()) return m -- 2.30.2