From bf9fd29729e8b01a21d7a89175fef1b3bff57d88 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Mon, 20 May 2019 11:19:13 +0100 Subject: [PATCH] nearly there with readable/writable on FU matrix --- src/experiment/score6600.py | 3 --- src/scoreboard/fu_fu_matrix.py | 12 ++++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/experiment/score6600.py b/src/experiment/score6600.py index 31f267a9..daec9029 100644 --- a/src/experiment/score6600.py +++ b/src/experiment/score6600.py @@ -412,9 +412,6 @@ def scoreboard_sim(dut, alusim): yield from print_reg(dut, [1,2,3]) yield yield from print_reg(dut, [1,2,3]) - yield - yield - yield yield yield from print_reg(dut, [1,2,3]) diff --git a/src/scoreboard/fu_fu_matrix.py b/src/scoreboard/fu_fu_matrix.py index 239f26b7..e682bb28 100644 --- a/src/scoreboard/fu_fu_matrix.py +++ b/src/scoreboard/fu_fu_matrix.py @@ -61,8 +61,8 @@ class FUFUDepMatrix(Elaboratable): writable.append(fu.writable_o) # ... and output them from this module (horizontal, width=REGs) - m.d.comb += self.readable_o.eq(Cat(*readable)) - m.d.comb += self.writable_o.eq(Cat(*writable)) + m.d.comb += self.readable_o.eq(Cat(*writable)) + m.d.comb += self.writable_o.eq(Cat(*readable)) # --- # connect FU Pending @@ -95,10 +95,10 @@ class FUFUDepMatrix(Elaboratable): # --- # connect Matrix go_rd_i/go_wr_i to module readable/writable # --- - for x in range(self.n_fu_col): + for y in range(self.n_fu_row): go_rd_i = [] go_wr_i = [] - for y in range(self.n_fu_row): + for x in range(self.n_fu_col): dc = dm[x][y] # accumulate cell go_rd/go_wr go_rd_i.append(dc.go_rd_i) @@ -111,10 +111,10 @@ class FUFUDepMatrix(Elaboratable): # --- # connect Matrix pending # --- - for y in range(self.n_fu_row): + for x in range(self.n_fu_col): rd_pend_i = [] wr_pend_i = [] - for x in range(self.n_fu_col): + for y in range(self.n_fu_row): dc = dm[x][y] # accumulate cell rd_pend/wr_pend/go_rd/go_wr rd_pend_i.append(dc.rd_pend_i) -- 2.30.2