From 55419d7098a433122bf4d940cf38af17e33f045a Mon Sep 17 00:00:00 2001
From: Aaron Barnes <42706182+barnes88@users.noreply.github.com>
Date: Fri, 12 Jul 2024 15:35:38 -0600
Subject: Reg bank patch (#41)

* remove implicit casting, cleanup unused bank_warp_shift parameter

* update cu init function prototype

* remove m_bank_warp_shift from function call
---
 src/gpgpu-sim/shader.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/gpgpu-sim/shader.h')

diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h
index 0897302..95e142e 100644
--- a/src/gpgpu-sim/shader.h
+++ b/src/gpgpu-sim/shader.h
@@ -336,8 +336,8 @@ inline unsigned wid_from_hw_tid(unsigned tid, unsigned warp_size) {
 const unsigned WARP_PER_CTA_MAX = 64;
 typedef std::bitset<WARP_PER_CTA_MAX> warp_set_t;
 
-int register_bank(int regnum, int wid, unsigned num_banks,
-                  unsigned bank_warp_shift, bool sub_core_model,
+unsigned register_bank(int regnum, int wid, unsigned num_banks,
+                  bool sub_core_model,
                   unsigned banks_per_sched, unsigned sched_id);
 
 class shader_core_ctx;
@@ -681,7 +681,7 @@ class opndcoll_rfu_t {  // operand collector based register file unit
    public:
     op_t() { m_valid = false; }
     op_t(collector_unit_t *cu, unsigned op, unsigned reg, unsigned num_banks,
-         unsigned bank_warp_shift, bool sub_core_model,
+        bool sub_core_model,
          unsigned banks_per_sched, unsigned sched_id) {
       m_valid = true;
       m_warp = NULL;
@@ -689,11 +689,11 @@ class opndcoll_rfu_t {  // operand collector based register file unit
       m_operand = op;
       m_register = reg;
       m_shced_id = sched_id;
-      m_bank = register_bank(reg, cu->get_warp_id(), num_banks, bank_warp_shift,
+      m_bank = register_bank(reg, cu->get_warp_id(), num_banks,
                              sub_core_model, banks_per_sched, sched_id);
     }
     op_t(const warp_inst_t *warp, unsigned reg, unsigned num_banks,
-         unsigned bank_warp_shift, bool sub_core_model,
+         bool sub_core_model,
          unsigned banks_per_sched, unsigned sched_id) {
       m_valid = true;
       m_warp = warp;
@@ -701,7 +701,7 @@ class opndcoll_rfu_t {  // operand collector based register file unit
       m_cu = NULL;
       m_operand = -1;
       m_shced_id = sched_id;
-      m_bank = register_bank(reg, warp->warp_id(), num_banks, bank_warp_shift,
+      m_bank = register_bank(reg, warp->warp_id(), num_banks,
                              sub_core_model, banks_per_sched, sched_id);
     }
 
@@ -934,7 +934,6 @@ class opndcoll_rfu_t {  // operand collector based register file unit
       m_not_ready.reset();
       m_warp_id = -1;
       m_num_banks = 0;
-      m_bank_warp_shift = 0;
     }
     // accessors
     bool ready() const;
@@ -951,7 +950,7 @@ class opndcoll_rfu_t {  // operand collector based register file unit
     unsigned get_reg_id() const { return m_reg_id; }
 
     // modifiers
-    void init(unsigned n, unsigned num_banks, unsigned log2_warp_size,
+    void init(unsigned n, unsigned num_banks,
               const core_config *config, opndcoll_rfu_t *rfu,
               bool m_sub_core_model, unsigned reg_id,
               unsigned num_banks_per_sched);
@@ -973,7 +972,6 @@ class opndcoll_rfu_t {  // operand collector based register file unit
     op_t *m_src_op;
     std::bitset<MAX_REG_OPERANDS * 2> m_not_ready;
     unsigned m_num_banks;
-    unsigned m_bank_warp_shift;
     opndcoll_rfu_t *m_rfu;
 
     unsigned m_num_banks_per_sched;
@@ -1025,7 +1023,6 @@ class opndcoll_rfu_t {  // operand collector based register file unit
   unsigned m_num_collector_sets;
   // unsigned m_num_collectors;
   unsigned m_num_banks;
-  unsigned m_bank_warp_shift;
   unsigned m_warp_size;
   std::vector<collector_unit_t *> m_cu;
   arbiter_t m_arbiter;
-- 
cgit v1.3