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

minor update

Browse Source
This commit is contained in:
Blaise Tine
2021-02-04 15:28:04 -08:00
parent 778453e43f
commit 111cc29482
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hw/rtl/cache/VX_bank.v vendored
View File

@@ -57,7 +57,7 @@ module VX_bank #(
input wire [`REQS_BITS-1:0] core_req_tid, input wire [`REQS_BITS-1:0] core_req_tid,
input wire core_req_rw, input wire core_req_rw,
input wire [`LINE_ADDR_WIDTH-1:0] core_req_addr, input wire [`LINE_ADDR_WIDTH-1:0] core_req_addr,
input wire [`WORD_SELECT_BITS-1:0] core_req_wsel, input wire [`UP(`WORD_SELECT_BITS)-1:0] core_req_wsel,
input wire [WORD_SIZE-1:0] core_req_byteen, input wire [WORD_SIZE-1:0] core_req_byteen,
input wire [`WORD_WIDTH-1:0] core_req_data, input wire [`WORD_WIDTH-1:0] core_req_data,
input wire [CORE_TAG_WIDTH-1:0] core_req_tag, input wire [CORE_TAG_WIDTH-1:0] core_req_tag,
@@ -97,7 +97,7 @@ module VX_bank #(
wire creq_full, creq_empty; wire creq_full, creq_empty;
wire creq_rw; wire creq_rw;
wire [`LINE_ADDR_WIDTH-1:0] creq_addr; wire [`LINE_ADDR_WIDTH-1:0] creq_addr;
wire [`WORD_SELECT_BITS-1:0] creq_wsel; wire [`UP(`WORD_SELECT_BITS)-1:0] creq_wsel;
wire [WORD_SIZE-1:0] creq_byteen; wire [WORD_SIZE-1:0] creq_byteen;
wire [`WORD_WIDTH-1:0] creq_data; wire [`WORD_WIDTH-1:0] creq_data;
wire [CORE_TAG_WIDTH-1:0] creq_tag; wire [CORE_TAG_WIDTH-1:0] creq_tag;
@@ -107,7 +107,7 @@ module VX_bank #(
assign core_req_ready = !creq_full; assign core_req_ready = !creq_full;
VX_fifo_queue #( VX_fifo_queue #(
.DATAW (CORE_TAG_WIDTH + `REQS_BITS + 1 + `LINE_ADDR_WIDTH + `WORD_SELECT_BITS + WORD_SIZE + `WORD_WIDTH), .DATAW (CORE_TAG_WIDTH + `REQS_BITS + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_BITS) + WORD_SIZE + `WORD_WIDTH),
.SIZE (CREQ_SIZE), .SIZE (CREQ_SIZE),
.BUFFERED (1) .BUFFERED (1)
) core_req_queue ( ) core_req_queue (
@@ -130,13 +130,13 @@ module VX_bank #(
wire mshr_pending; wire mshr_pending;
wire mshr_valid; wire mshr_valid;
wire [`LINE_ADDR_WIDTH-1:0] mshr_addr; wire [`LINE_ADDR_WIDTH-1:0] mshr_addr;
wire [`WORD_SELECT_BITS-1:0] mshr_wsel; wire [`UP(`WORD_SELECT_BITS)-1:0] mshr_wsel;
wire [WORD_SIZE-1:0] mshr_byteen; wire [WORD_SIZE-1:0] mshr_byteen;
wire [CORE_TAG_WIDTH-1:0] mshr_tag; wire [CORE_TAG_WIDTH-1:0] mshr_tag;
wire [`REQS_BITS-1:0] mshr_tid; wire [`REQS_BITS-1:0] mshr_tid;
wire [`LINE_ADDR_WIDTH-1:0] addr_st0, addr_st1; wire [`LINE_ADDR_WIDTH-1:0] addr_st0, addr_st1;
wire [`WORD_SELECT_BITS-1:0] wsel_st0, wsel_st1; wire [`UP(`WORD_SELECT_BITS)-1:0] wsel_st0, wsel_st1;
wire mem_rw_st0, mem_rw_st1; wire mem_rw_st0, mem_rw_st1;
wire [WORD_SIZE-1:0] byteen_st0, byteen_st1; wire [WORD_SIZE-1:0] byteen_st0, byteen_st1;
wire [`CACHE_LINE_WIDTH-1:0] data_st0, data_st1; wire [`CACHE_LINE_WIDTH-1:0] data_st0, data_st1;
@@ -204,7 +204,7 @@ module VX_bank #(
`endif `endif
VX_pipe_register #( VX_pipe_register #(
.DATAW (1 + 1 + 1 + `LINE_ADDR_WIDTH + `WORD_SELECT_BITS + 1 + WORD_SIZE + `CACHE_LINE_WIDTH + `REQS_BITS + CORE_TAG_WIDTH + 1 + 1), .DATAW (1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_BITS) + 1 + WORD_SIZE + `CACHE_LINE_WIDTH + `REQS_BITS + CORE_TAG_WIDTH + 1 + 1),
.RESETW (1) .RESETW (1)
) pipe_reg0 ( ) pipe_reg0 (
.clk (clk), .clk (clk),
@@ -278,7 +278,7 @@ module VX_bank #(
assign incoming_fill_st0 = dram_rsp_valid && (addr_st0 == dram_rsp_addr); assign incoming_fill_st0 = dram_rsp_valid && (addr_st0 == dram_rsp_addr);
VX_pipe_register #( VX_pipe_register #(
.DATAW (1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `WORD_SELECT_BITS + `CACHE_LINE_WIDTH + 1 + WORD_SIZE + `REQS_BITS + CORE_TAG_WIDTH), .DATAW (1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_BITS) + `CACHE_LINE_WIDTH + 1 + WORD_SIZE + `REQS_BITS + CORE_TAG_WIDTH),
.RESETW (1) .RESETW (1)
) pipe_reg1 ( ) pipe_reg1 (
.clk (clk), .clk (clk),

4
hw/rtl/cache/VX_cache.v vendored
View File

@@ -90,7 +90,7 @@ module VX_cache #(
wire [NUM_BANKS-1:0] per_bank_core_req_valid; wire [NUM_BANKS-1:0] per_bank_core_req_valid;
wire [NUM_BANKS-1:0] per_bank_core_req_rw; wire [NUM_BANKS-1:0] per_bank_core_req_rw;
wire [NUM_BANKS-1:0][`LINE_ADDR_WIDTH-1:0] per_bank_core_req_addr; wire [NUM_BANKS-1:0][`LINE_ADDR_WIDTH-1:0] per_bank_core_req_addr;
wire [NUM_BANKS-1:0][`WORD_SELECT_BITS-1:0] per_bank_core_req_wsel; wire [NUM_BANKS-1:0][`UP(`WORD_SELECT_BITS)-1:0] per_bank_core_req_wsel;
wire [NUM_BANKS-1:0][WORD_SIZE-1:0] per_bank_core_req_byteen; wire [NUM_BANKS-1:0][WORD_SIZE-1:0] per_bank_core_req_byteen;
wire [NUM_BANKS-1:0][`WORD_WIDTH-1:0] per_bank_core_req_data; wire [NUM_BANKS-1:0][`WORD_WIDTH-1:0] per_bank_core_req_data;
wire [NUM_BANKS-1:0][CORE_TAG_WIDTH-1:0] per_bank_core_req_tag; wire [NUM_BANKS-1:0][CORE_TAG_WIDTH-1:0] per_bank_core_req_tag;
@@ -212,7 +212,7 @@ module VX_cache #(
wire curr_bank_core_req_valid; wire curr_bank_core_req_valid;
wire curr_bank_core_req_rw; wire curr_bank_core_req_rw;
wire [`LINE_ADDR_WIDTH-1:0] curr_bank_core_req_addr; wire [`LINE_ADDR_WIDTH-1:0] curr_bank_core_req_addr;
wire [`WORD_SELECT_BITS-1:0] curr_bank_core_req_wsel; wire [`UP(`WORD_SELECT_BITS)-1:0] curr_bank_core_req_wsel;
wire [WORD_SIZE-1:0] curr_bank_core_req_byteen; wire [WORD_SIZE-1:0] curr_bank_core_req_byteen;
wire [`WORD_WIDTH-1:0] curr_bank_core_req_data; wire [`WORD_WIDTH-1:0] curr_bank_core_req_data;
wire [CORE_TAG_WIDTH-1:0] curr_bank_core_req_tag; wire [CORE_TAG_WIDTH-1:0] curr_bank_core_req_tag;

2
hw/rtl/cache/VX_cache_config.vh vendored
View File

@@ -13,7 +13,7 @@
`define REQ_INST_META_WIDTH (CORE_TAG_WIDTH + WORD_SIZE + `REQS_BITS) `define REQ_INST_META_WIDTH (CORE_TAG_WIDTH + WORD_SIZE + `REQS_BITS)
// metadata word_sel // metadata word_sel
`define MSHR_DATA_WIDTH (`REQ_INST_META_WIDTH + `WORD_SELECT_BITS) `define MSHR_DATA_WIDTH (`REQ_INST_META_WIDTH + `UP(`WORD_SELECT_BITS))
`define WORD_WIDTH (8 * WORD_SIZE) `define WORD_WIDTH (8 * WORD_SIZE)

2
hw/rtl/cache/VX_data_access.v vendored
View File

@@ -39,7 +39,7 @@ module VX_data_access #(
// writing // writing
input wire writeen, input wire writeen,
input wire is_fill, input wire is_fill,
input wire [`WORD_SELECT_BITS-1:0] wsel, input wire [`UP(`WORD_SELECT_BITS)-1:0] wsel,
input wire [WORD_SIZE-1:0] byteen, input wire [WORD_SIZE-1:0] byteen,
input wire [`CACHE_LINE_WIDTH-1:0] wrdata input wire [`CACHE_LINE_WIDTH-1:0] wrdata
); );