From 05c77e1f35a7216fc9883b0330fb8370c6aab4fc Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 8 May 2019 03:19:02 +0100 Subject: [PATCH] rename rel_req to req_rel --- src/experiment/cscore.py | 6 ++++++ src/scoreboard/group_picker.py | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/experiment/cscore.py b/src/experiment/cscore.py index 6464a8c0..fdb2b6d7 100644 --- a/src/experiment/cscore.py +++ b/src/experiment/cscore.py @@ -128,6 +128,12 @@ class Scoreboard(Elaboratable): # connect Function Units #--------- + # Group Picker... done manually for now. TODO: cat array of pick sigs + m.d.comb += il[0].go_rd_i.eq(intpick1.go_rd_o[0]) # add + m.d.comb += il[1].go_rd_i.eq(intpick1.go_rd_o[1]) # subtract + m.d.comb += il[0].go_wr_i.eq(intpick1.go_wr_o[0]) # add + m.d.comb += il[1].go_wr_i.eq(intpick1.go_wr_o[1]) # subtract + return m diff --git a/src/scoreboard/group_picker.py b/src/scoreboard/group_picker.py index 78f83414..9518fdf9 100644 --- a/src/scoreboard/group_picker.py +++ b/src/scoreboard/group_picker.py @@ -45,7 +45,7 @@ class GroupPicker(Elaboratable): # inputs self.readable_i = Signal(wid, reset_less=True) # readable in (top) self.writable_i = Signal(wid, reset_less=True) # writable in (top) - self.rel_req_i = Signal(wid, reset_less=True) # release request in (top) + self.req_rel_i = Signal(wid, reset_less=True) # release request in (top) # outputs self.go_rd_o = Signal(wid, reset_less=True) # go read (bottom) @@ -58,7 +58,7 @@ class GroupPicker(Elaboratable): m.submodules.wpick = wpick = PriorityPicker(self.gp_wid) # combine release (output ready signal) with writeable - m.d.comb += wpick.i.eq(self.writable_i & self.rel_req_i) + m.d.comb += wpick.i.eq(self.writable_i & self.req_rel_i) m.d.comb += self.go_wr_o.eq(wpick.o) m.d.comb += rpick.i.eq(self.readable_i) @@ -69,7 +69,7 @@ class GroupPicker(Elaboratable): def __iter__(self): yield self.readable_i yield self.writable_i - yield self.rel_req_i + yield self.req_rel_i yield self.go_rd_o yield self.go_wr_o -- 2.30.2