wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CSR IO's critical path elimination

Browse Source
This commit is contained in:
Blaise Tine
2020-12-06 16:07:36 -08:00
parent dada72f830
commit 0d0706411d
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
hw/rtl/VX_csr_arb.v
View File

@@ -4,8 +4,7 @@ module VX_csr_arb (
input wire clk, input wire clk,
input wire reset, input wire reset,
// bus select // bus select
input wire select_io_req,
input wire select_io_rsp, input wire select_io_rsp,
// input requets // input requets
@@ -28,19 +27,20 @@ module VX_csr_arb (
wire [31:0] csr_core_req_mask = csr_core_req_if.rs2_is_imm ? 32'(csr_core_req_if.rs1) : csr_core_req_if.rs1_data; wire [31:0] csr_core_req_mask = csr_core_req_if.rs2_is_imm ? 32'(csr_core_req_if.rs1) : csr_core_req_if.rs1_data;
// requests // requests
assign csr_pipe_req_if.valid = (~select_io_req) ? csr_core_req_if.valid : csr_io_req_if.valid; assign csr_pipe_req_if.valid = csr_core_req_if.valid || csr_io_req_if.valid;
assign csr_pipe_req_if.wid = (~select_io_req) ? csr_core_req_if.wid : 0; assign csr_pipe_req_if.wid = csr_core_req_if.wid;
assign csr_pipe_req_if.tmask = (~select_io_req) ? csr_core_req_if.tmask : 0; assign csr_pipe_req_if.tmask = csr_core_req_if.tmask;
assign csr_pipe_req_if.PC = (~select_io_req) ? csr_core_req_if.PC : 0; assign csr_pipe_req_if.PC = csr_core_req_if.PC;
assign csr_pipe_req_if.op_type = (~select_io_req) ? csr_core_req_if.op_type : (csr_io_req_if.rw ? `CSR_RW : `CSR_RS); assign csr_pipe_req_if.op_type = csr_core_req_if.valid ? csr_core_req_if.op_type : (csr_io_req_if.rw ? `CSR_RW : `CSR_RS);
assign csr_pipe_req_if.csr_addr = (~select_io_req) ? csr_core_req_if.csr_addr : csr_io_req_if.addr; assign csr_pipe_req_if.csr_addr = csr_core_req_if.valid ? csr_core_req_if.csr_addr : csr_io_req_if.addr;
assign csr_pipe_req_if.csr_mask = (~select_io_req) ? csr_core_req_mask : (csr_io_req_if.rw ? csr_io_req_if.data : 32'b0); assign csr_pipe_req_if.csr_mask = csr_core_req_if.valid ? csr_core_req_mask : (csr_io_req_if.rw ? csr_io_req_if.data : 32'b0);
assign csr_pipe_req_if.rd = (~select_io_req) ? csr_core_req_if.rd : 0; assign csr_pipe_req_if.rd = csr_core_req_if.rd;
assign csr_pipe_req_if.wb = (~select_io_req) ? csr_core_req_if.wb : 0; assign csr_pipe_req_if.wb = csr_core_req_if.wb;
assign csr_pipe_req_if.is_io = select_io_req; assign csr_pipe_req_if.is_io = !csr_core_req_if.valid;
assign csr_core_req_if.ready = csr_pipe_req_if.ready && (~select_io_req); // core always takes priority over IO bus
assign csr_io_req_if.ready = csr_pipe_req_if.ready && select_io_req; assign csr_core_req_if.ready = csr_pipe_req_if.ready;
assign csr_io_req_if.ready = csr_pipe_req_if.ready && !csr_core_req_if.valid;
// responses // responses
assign csr_io_rsp_if.valid = csr_pipe_rsp_if.valid & select_io_rsp; assign csr_io_rsp_if.valid = csr_pipe_rsp_if.valid & select_io_rsp;

12
hw/rtl/VX_csr_io_arb.v
View File

@@ -20,11 +20,6 @@ module VX_csr_io_arb #(
input wire [DATA_WIDTH-1:0] req_data_in, input wire [DATA_WIDTH-1:0] req_data_in,
output wire req_ready_in, output wire req_ready_in,
// output response
output wire rsp_valid_out,
output wire [DATA_WIDTH-1:0] rsp_data_out,
input wire rsp_ready_out,
// output request // output request
output wire [NUM_REQS-1:0] req_valid_out, output wire [NUM_REQS-1:0] req_valid_out,
output wire [NUM_REQS-1:0][ADDR_WIDTH-1:0] req_addr_out, output wire [NUM_REQS-1:0][ADDR_WIDTH-1:0] req_addr_out,
@@ -35,7 +30,12 @@ module VX_csr_io_arb #(
// input response // input response
input wire [NUM_REQS-1:0] rsp_valid_in, input wire [NUM_REQS-1:0] rsp_valid_in,
input wire [NUM_REQS-1:0][DATA_WIDTH-1:0] rsp_data_in, input wire [NUM_REQS-1:0][DATA_WIDTH-1:0] rsp_data_in,
output wire [NUM_REQS-1:0] rsp_ready_in output wire [NUM_REQS-1:0] rsp_ready_in,
// output response
output wire rsp_valid_out,
output wire [DATA_WIDTH-1:0] rsp_data_out,
input wire rsp_ready_out
); );
if (NUM_REQS > 1) begin if (NUM_REQS > 1) begin

2
hw/rtl/VX_csr_unit.v
View File

@@ -22,14 +22,12 @@ module VX_csr_unit #(
VX_csr_pipe_req_if csr_pipe_req_if(); VX_csr_pipe_req_if csr_pipe_req_if();
VX_commit_if csr_pipe_rsp_if(); VX_commit_if csr_pipe_rsp_if();
wire select_io_req = csr_io_req_if.valid;
wire select_io_rsp; wire select_io_rsp;
VX_csr_arb csr_arb ( VX_csr_arb csr_arb (
.clk (clk), .clk (clk),
.reset (reset), .reset (reset),
.select_io_req (select_io_req),
.select_io_rsp (select_io_rsp), .select_io_rsp (select_io_rsp),
.csr_core_req_if (csr_req_if), .csr_core_req_if (csr_req_if),