Do not waste address space on generic regs if unused

pulp-platform · Sep 10, 2020 · 9323a2a · 9323a2a
1 parent f262cb1
commit 9323a2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rtl/hwpe_ctrl_regfile.sv b/rtl/hwpe_ctrl_regfile.sv
@@ -40,8 +40,8 @@ module hwpe_ctrl_regfile
   localparam int unsigned N_REGISTERS         = REGFILE_N_REGISTERS;
   localparam int unsigned N_MANDATORY_REGS    = REGFILE_N_MANDATORY_REGS;
   localparam int unsigned N_RESERVED_REGS     = REGFILE_N_RESERVED_REGS;
-  localparam int unsigned N_MAX_IO_REGS       = REGFILE_N_MAX_IO_REGS;
-  localparam int unsigned N_MAX_GENERIC_REGS  = REGFILE_N_MAX_GENERIC_REGS;
+  localparam int unsigned N_MAX_IO_REGS       = 2**$clog2(N_IO_REGS-1);
+  localparam int unsigned N_MAX_GENERIC_REGS  = 2**$clog2(N_GENERIC_REGS-1);
   localparam int unsigned LOG_REGS            = $clog2(N_REGISTERS);
   localparam int unsigned LOG_REGS_MC         = LOG_REGS+LOG_CONTEXT;
 

diff --git a/rtl/hwpe_ctrl_slave.sv b/rtl/hwpe_ctrl_slave.sv
@@ -45,8 +45,8 @@ module hwpe_ctrl_slave
   localparam int unsigned LOG_REGS            = $clog2(N_REGISTERS);
   localparam int unsigned LOG_CONTEXT         = N_CONTEXT > 1 ? $clog2(N_CONTEXT) : 1;
   localparam int unsigned LOG_REGS_MC         = LOG_REGS+LOG_CONTEXT;
-  localparam int unsigned N_MAX_IO_REGS       = REGFILE_N_MAX_IO_REGS;
-  localparam int unsigned N_MAX_GENERIC_REGS  = REGFILE_N_MAX_GENERIC_REGS;
+  localparam int unsigned N_MAX_IO_REGS       = 2**$clog2(N_IO_REGS-1);
+  localparam int unsigned N_MAX_GENERIC_REGS  = 2**$clog2(N_GENERIC_REGS-1);
 
   regfile_in_t  regfile_in;
   regfile_out_t regfile_out;