removed rename block

openhwgroup · Sep 7, 2023 · 8355a70 · 8355a70
1 parent 1c847c3
commit 8355a70
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 129 deletions.
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/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