Remove Rename Block (#1359)

openhwgroup · Sep 11, 2023 · 2b8c7a0 · 2b8c7a0
2 parents f7b7953 + 2921f87
commit 2b8c7a0
Show file tree

Hide file tree

Showing 18 changed files with 8 additions and 158 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -236,7 +236,7 @@ pub_hwconfig:
     matrix:
       - DV_SIMULATORS: ["veri-testharness,spike"]
         DV_HWCONFIG_OPTS:
-          - "--default_config=cv32a60x --isa=rv32imac --RenameEn=1"
+          - "--default_config=cv32a60x --isa=rv32imac"
   variables:
     DASHBOARD_JOB_TITLE: "HW config $DV_SIMULATORS $DV_HWCONFIG_OPTS"
     DASHBOARD_JOB_DESCRIPTION: "Short tests to challenge target configurations"

diff --git a/.gitlab-ci/expected_synth.yml b/.gitlab-ci/expected_synth.yml
@@ -3,4 +3,4 @@ cv64a6_imafdc_sv39:
 cv32a60x:
   gates: 160719
 cv32a6_embedded:
-  gates: 127977
+  gates: 128515
diff --git a/core/Flist.cva6 b/core/Flist.cva6
@@ -121,7 +121,6 @@ ${CVA6_REPO_DIR}/core/serdiv.sv
 ${CVA6_REPO_DIR}/core/perf_counters.sv
 ${CVA6_REPO_DIR}/core/ariane_regfile_ff.sv
 ${CVA6_REPO_DIR}/core/ariane_regfile_fpga.sv
-${CVA6_REPO_DIR}/core/re_name.sv
 // NOTE: scoreboard.sv modified for DSIM (unchanged for other simulators)
 ${CVA6_REPO_DIR}/core/scoreboard.sv
 ${CVA6_REPO_DIR}/core/store_buffer.sv

diff --git a/core/include/ariane_pkg.sv b/core/include/ariane_pkg.sv
@@ -128,8 +128,6 @@ package ariane_pkg;
     localparam ASID_WIDTH    = (riscv::XLEN == 64) ? 16 : 1;
     localparam BITS_SATURATION_COUNTER = 2;
 
-    localparam ENABLE_RENAME = cva6_config_pkg::CVA6ConfigRenameEn;
-
     localparam ISSUE_WIDTH = 1;
 
     // depth of store-buffers, this needs to be a power of two
@@ -161,8 +159,8 @@ package ariane_pkg;
     localparam riscv::xlen_t OPENHWGROUP_MVENDORID = {{riscv::XLEN-32{1'b0}}, 32'h0602};
     localparam riscv::xlen_t ARIANE_MARCHID = {{riscv::XLEN-32{1'b0}}, 32'd3};
 
-    // 32 registers + 1 bit for re-naming = 6
-    localparam REG_ADDR_SIZE = 6;
+    // 32 registers
+    localparam REG_ADDR_SIZE = 5;
 
     // Read ports for general purpose register files
     localparam NR_RGPR_PORTS = 2;

diff --git a/core/include/cv32a60x_config_pkg.sv b/core/include/cv32a60x_config_pkg.sv
@@ -37,8 +37,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 16384;
     localparam CVA6ConfigIcacheSetAssoc = 4;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/include/cv32a6_embedded_config_pkg.sv b/core/include/cv32a6_embedded_config_pkg.sv
@@ -36,8 +36,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 16384;
     localparam CVA6ConfigIcacheSetAssoc = 4;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/include/cv32a6_ima_sv32_fpga_config_pkg.sv b/core/include/cv32a6_ima_sv32_fpga_config_pkg.sv
@@ -37,8 +37,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 8192;
     localparam CVA6ConfigIcacheSetAssoc = 2;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/include/cv32a6_imac_sv0_config_pkg.sv b/core/include/cv32a6_imac_sv0_config_pkg.sv
@@ -37,8 +37,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 16384;
     localparam CVA6ConfigIcacheSetAssoc = 4;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/include/cv32a6_imac_sv32_config_pkg.sv b/core/include/cv32a6_imac_sv32_config_pkg.sv
@@ -37,8 +37,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 16384;
     localparam CVA6ConfigIcacheSetAssoc = 4;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/include/cv32a6_imafc_sv32_config_pkg.sv b/core/include/cv32a6_imafc_sv32_config_pkg.sv
@@ -37,8 +37,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 16384;
     localparam CVA6ConfigIcacheSetAssoc = 4;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/include/cv64a6_imadfcv_sv39_polara_config_pkg.sv b/core/include/cv64a6_imadfcv_sv39_polara_config_pkg.sv
@@ -37,8 +37,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 16384;
     localparam CVA6ConfigIcacheSetAssoc = 4;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/include/cv64a6_imafdc_sv39_config_pkg.sv b/core/include/cv64a6_imafdc_sv39_config_pkg.sv
@@ -37,8 +37,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 16384;
     localparam CVA6ConfigIcacheSetAssoc = 4;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/include/cv64a6_imafdc_sv39_openpiton_config_pkg.sv b/core/include/cv64a6_imafdc_sv39_openpiton_config_pkg.sv
@@ -37,8 +37,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 16384;
     localparam CVA6ConfigIcacheSetAssoc = 4;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/include/cv64a6_imafdcv_sv39_config_pkg.sv b/core/include/cv64a6_imafdcv_sv39_config_pkg.sv
@@ -37,8 +37,6 @@ package cva6_config_pkg;
     localparam CVA6ConfigDataUserEn = 0;
     localparam CVA6ConfigDataUserWidth = CVA6ConfigXlen;
 
-    localparam CVA6ConfigRenameEn = 0;
-
     localparam CVA6ConfigIcacheByteSize = 16384;
     localparam CVA6ConfigIcacheSetAssoc = 4;
     localparam CVA6ConfigIcacheLineWidth = 128;

diff --git a/core/issue_read_operands.sv b/core/issue_read_operands.sv
@@ -24,7 +24,7 @@ module issue_read_operands import ariane_pkg::*; #(
     input  logic                                   flush_i,
     // stall
     input  logic                                   stall_i,
-    // coming from rename
+    // coming from decoder
     input  scoreboard_entry_t                      issue_instr_i,
     input  logic                                   issue_instr_valid_i,
     output logic                                   issue_ack_o,

diff --git a/core/issue_stage.sv b/core/issue_stage.sv
@@ -112,10 +112,6 @@ module issue_stage import ariane_pkg::*; #(
     rs3_len_t                  rs3_sb_iro;
     logic                      rs3_valid_iro_sb;
 
-    scoreboard_entry_t         issue_instr_rename_sb;
-    logic                      issue_instr_valid_rename_sb;
-    logic                      issue_ack_sb_rename;
-
     scoreboard_entry_t         issue_instr_sb_iro;
     logic                      issue_instr_valid_sb_iro;
     logic                      issue_ack_iro_sb;
@@ -129,23 +125,6 @@ module issue_stage import ariane_pkg::*; #(
     assign issue_instr_o    = issue_instr_sb_iro;
     assign issue_instr_hs_o = issue_instr_valid_sb_iro & issue_ack_iro_sb;
 
-    // ---------------------------------------------------------
-    // 1. Re-name
-    // ---------------------------------------------------------
-    re_name #(
-        .CVA6Cfg    ( CVA6Cfg    )
-    ) i_re_name (
-        .clk_i                  ( clk_i                        ),
-        .rst_ni                 ( rst_ni                       ),
-        .flush_i                ( flush_i                      ),
-        .flush_unissied_instr_i ( flush_unissued_instr_i       ),
-        .issue_instr_i          ( decoded_instr_i              ),
-        .issue_instr_valid_i    ( decoded_instr_valid_i        ),
-        .issue_ack_o            ( decoded_instr_ack_o          ),
-        .issue_instr_o          ( issue_instr_rename_sb        ),
-        .issue_instr_valid_o    ( issue_instr_valid_rename_sb  ),
-        .issue_ack_i            ( issue_ack_sb_rename          )
-    );
 
     // ---------------------------------------------------------
     // 2. Manage instructions in a scoreboard
@@ -170,9 +149,9 @@ module issue_stage import ariane_pkg::*; #(
         .rs3_o                 ( rs3_sb_iro                                ),
         .rs3_valid_o           ( rs3_valid_iro_sb                          ),
 
-        .decoded_instr_i       ( issue_instr_rename_sb                     ),
-        .decoded_instr_valid_i ( issue_instr_valid_rename_sb               ),
-        .decoded_instr_ack_o   ( issue_ack_sb_rename                       ),
+        .decoded_instr_i       ( decoded_instr_i                           ),
+        .decoded_instr_valid_i ( decoded_instr_valid_i                     ),
+        .decoded_instr_ack_o   ( decoded_instr_ack_o                       ),
         .issue_instr_o         ( issue_instr_sb_iro                        ),
         .issue_instr_valid_o   ( issue_instr_valid_sb_iro                  ),
         .issue_ack_i           ( issue_ack_iro_sb                          ),

diff --git a/core/re_name.sv b/core/re_name.sv
diff --git a/util/config_pkg_generator.py b/util/config_pkg_generator.py
@@ -55,8 +55,6 @@ def setup_parser_config_generator():
                       help="Data User enable ? 1 : enable, 0 : disable")
   parser.add_argument("--duser_w", type=int, default=None, choices=list(range(1,64)),
                       help="Data User Width ? [1-64]")
-  parser.add_argument("--RenameEn", type=int, default=None, choices=[0,1],
-                      help="RenameEn ? 1 : enable, 0 : disable")
   parser.add_argument("--IcacheByteSize", type=int, default=None,
                       help="Instruction cache size in bytes")
   parser.add_argument("--IcacheSetAssoc", type=int, default=None,
@@ -131,7 +129,6 @@ def setup_parser_config_generator():
   "iuser_w" : "CVA6ConfigFetchUserWidth",
   "duser_en" : "CVA6ConfigDataUserEn",
   "duser_w" : "CVA6ConfigDataUserWidth",
-  "RenameEn" : "CVA6ConfigRenameEn",
   "IcacheByteSize" : "CVA6ConfigIcacheByteSize",
   "IcacheSetAssoc" : "CVA6ConfigIcacheSetAssoc",
   "IcacheLineWidth" : "CVA6ConfigIcacheLineWidth",