Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Rename Block #1359

Merged
merged 5 commits into from
Sep 11, 2023
Merged

Remove Rename Block #1359

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8355a70
removed rename block
fatimasaleem Sep 4, 2023
2309869
removed rename parameter from the config files
fatimasaleem Sep 4, 2023
8febe20
updating the REG_ADDR_SIZE
fatimasaleem Sep 4, 2023
2a249ad
removing the rename param from CI
fatimasaleem Sep 7, 2023
2921f87
updated the gates count for embedded config
fatimasaleem Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/Flist.cva6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions core/include/ariane_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv32a60x_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv32a6_embedded_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv32a6_ima_sv32_fpga_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv32a6_imac_sv0_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv32a6_imac_sv32_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv32a6_imafc_sv32_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv64a6_imadfcv_sv39_polara_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv64a6_imafdc_sv39_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv64a6_imafdc_sv39_openpiton_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions core/include/cv64a6_imafdcv_sv39_config_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/issue_read_operands.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
27 changes: 3 additions & 24 deletions core/issue_stage.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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 ),
Expand Down
103 changes: 0 additions & 103 deletions core/re_name.sv
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions util/config_pkg_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down