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

rename MSRQ to MSHR

Browse Source
This commit is contained in:
Blaise Tine
2020-11-28 17:32:00 -05:00
parent ac1883a13f
commit b85391389b
13 changed files with 177 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/opae/vlsim/Makefile
View File

@@ -10,7 +10,7 @@ DBG_PRINT_FLAGS += -DDBG_PRINT_PIPELINE
DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_ICACHE DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_ICACHE
DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_DCACHE DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_DCACHE
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_BANK DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_BANK
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSRQ DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSHR
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_SNP DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_SNP

2
driver/rtlsim/Makefile
View File

@@ -10,7 +10,7 @@ DBG_PRINT_FLAGS += -DDBG_PRINT_PIPELINE
DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_ICACHE DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_ICACHE
DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_DCACHE DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_DCACHE
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_BANK DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_BANK
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSRQ DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSHR
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_SNP DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_SNP

2
hw/rtl/VX_cluster.v
View File

@@ -420,7 +420,7 @@ module VX_cluster #(
.WORD_SIZE (`L2WORD_SIZE), .WORD_SIZE (`L2WORD_SIZE),
.NUM_REQUESTS (`L2NUM_REQUESTS), .NUM_REQUESTS (`L2NUM_REQUESTS),
.CREQ_SIZE (`L2CREQ_SIZE), .CREQ_SIZE (`L2CREQ_SIZE),
.MRVQ_SIZE (`L2MRVQ_SIZE), .MSHR_SIZE (`L2MSHR_SIZE),
.DRFQ_SIZE (`L2DRFQ_SIZE), .DRFQ_SIZE (`L2DRFQ_SIZE),
.SNRQ_SIZE (`L2SNRQ_SIZE), .SNRQ_SIZE (`L2SNRQ_SIZE),
.CWBQ_SIZE (`L2CWBQ_SIZE), .CWBQ_SIZE (`L2CWBQ_SIZE),

24
hw/rtl/VX_config.vh
View File

@@ -207,9 +207,9 @@
`define DCWBQ_SIZE 4 `define DCWBQ_SIZE 4
`endif `endif
// Miss Reserv Queue Knob // Miss Handling Register Size
`ifndef DMRVQ_SIZE `ifndef DMSHR_SIZE
`define DMRVQ_SIZE `MAX(`LSUQ_SIZE, 4) `define DMSHR_SIZE `MAX(`LSUQ_SIZE, 4)
`endif `endif
// DRAM Request Queue Size // DRAM Request Queue Size
@@ -249,9 +249,9 @@
`define ICWBQ_SIZE 4 `define ICWBQ_SIZE 4
`endif `endif
// Miss Reserv Queue Knob // Miss Handling Register Size
`ifndef IMRVQ_SIZE `ifndef IMSHR_SIZE
`define IMRVQ_SIZE 4 `define IMSHR_SIZE 4
`endif `endif
// DRAM Request Queue Size // DRAM Request Queue Size
@@ -308,9 +308,9 @@
`define L2CWBQ_SIZE 4 `define L2CWBQ_SIZE 4
`endif `endif
// Miss Reserv Queue Knob // Miss Handling Register Size
`ifndef L2MRVQ_SIZE `ifndef L2MSHR_SIZE
`define L2MRVQ_SIZE 8 `define L2MSHR_SIZE 8
`endif `endif
// DRAM Request Queue Size // DRAM Request Queue Size
@@ -355,9 +355,9 @@
`define L3CWBQ_SIZE 4 `define L3CWBQ_SIZE 4
`endif `endif
// Miss Reserv Queue Knob // Miss Handling Register Size
`ifndef L3MRVQ_SIZE `ifndef L3MSHR_SIZE
`define L3MRVQ_SIZE 8 `define L3MSHR_SIZE 8
`endif `endif
// DRAM Request Queue Size // DRAM Request Queue Size

6
hw/rtl/VX_mem_unit.v
View File

@@ -66,7 +66,7 @@ module VX_mem_unit # (
.WORD_SIZE (`SWORD_SIZE), .WORD_SIZE (`SWORD_SIZE),
.NUM_REQUESTS (`SNUM_REQUESTS), .NUM_REQUESTS (`SNUM_REQUESTS),
.CREQ_SIZE (`SCREQ_SIZE), .CREQ_SIZE (`SCREQ_SIZE),
.MRVQ_SIZE (8), .MSHR_SIZE (8),
.DRFQ_SIZE (1), .DRFQ_SIZE (1),
.SNRQ_SIZE (1), .SNRQ_SIZE (1),
.CWBQ_SIZE (`SCWBQ_SIZE), .CWBQ_SIZE (`SCWBQ_SIZE),
@@ -138,7 +138,7 @@ module VX_mem_unit # (
.WORD_SIZE (`DWORD_SIZE), .WORD_SIZE (`DWORD_SIZE),
.NUM_REQUESTS (`DNUM_REQUESTS), .NUM_REQUESTS (`DNUM_REQUESTS),
.CREQ_SIZE (`DCREQ_SIZE), .CREQ_SIZE (`DCREQ_SIZE),
.MRVQ_SIZE (`DMRVQ_SIZE), .MSHR_SIZE (`DMSHR_SIZE),
.DRFQ_SIZE (`DDRFQ_SIZE), .DRFQ_SIZE (`DDRFQ_SIZE),
.SNRQ_SIZE (`DSNRQ_SIZE), .SNRQ_SIZE (`DSNRQ_SIZE),
.CWBQ_SIZE (`DCWBQ_SIZE), .CWBQ_SIZE (`DCWBQ_SIZE),
@@ -211,7 +211,7 @@ module VX_mem_unit # (
.WORD_SIZE (`IWORD_SIZE), .WORD_SIZE (`IWORD_SIZE),
.NUM_REQUESTS (`INUM_REQUESTS), .NUM_REQUESTS (`INUM_REQUESTS),
.CREQ_SIZE (`ICREQ_SIZE), .CREQ_SIZE (`ICREQ_SIZE),
.MRVQ_SIZE (`IMRVQ_SIZE), .MSHR_SIZE (`IMSHR_SIZE),
.DRFQ_SIZE (`IDRFQ_SIZE), .DRFQ_SIZE (`IDRFQ_SIZE),
.SNRQ_SIZE (1), .SNRQ_SIZE (1),
.CWBQ_SIZE (`ICWBQ_SIZE), .CWBQ_SIZE (`ICWBQ_SIZE),

2
hw/rtl/Vortex.v
View File

@@ -393,7 +393,7 @@ module Vortex (
.WORD_SIZE (`L3WORD_SIZE), .WORD_SIZE (`L3WORD_SIZE),
.NUM_REQUESTS (`L3NUM_REQUESTS), .NUM_REQUESTS (`L3NUM_REQUESTS),
.CREQ_SIZE (`L3CREQ_SIZE), .CREQ_SIZE (`L3CREQ_SIZE),
.MRVQ_SIZE (`L3MRVQ_SIZE), .MSHR_SIZE (`L3MSHR_SIZE),
.DRFQ_SIZE (`L3DRFQ_SIZE), .DRFQ_SIZE (`L3DRFQ_SIZE),
.SNRQ_SIZE (`L3SNRQ_SIZE), .SNRQ_SIZE (`L3SNRQ_SIZE),
.CWBQ_SIZE (`L3CWBQ_SIZE), .CWBQ_SIZE (`L3CWBQ_SIZE),

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

@@ -18,7 +18,7 @@ module VX_bank #(
// Core Request Queue Size // Core Request Queue Size
parameter CREQ_SIZE = 1, parameter CREQ_SIZE = 1,
// Miss Reserv Queue Knob // Miss Reserv Queue Knob
parameter MRVQ_SIZE = 1, parameter MSHR_SIZE = 1,
// DRAM Response Queue Size // DRAM Response Queue Size
parameter DRFQ_SIZE = 1, parameter DRFQ_SIZE = 1,
// Snoop Req Queue Size // Snoop Req Queue Size
@@ -244,23 +244,23 @@ module VX_bank #(
.full (reqq_full) .full (reqq_full)
); );
wire msrq_pop; wire mshr_pop;
wire msrq_full; wire mshr_full;
wire msrq_almfull; wire mshr_almfull;
wire msrq_valid_st0; wire mshr_valid_st0;
wire[`REQS_BITS-1:0] msrq_tid_st0; wire[`REQS_BITS-1:0] mshr_tid_st0;
wire [`LINE_ADDR_WIDTH-1:0] msrq_addr_st0; wire [`LINE_ADDR_WIDTH-1:0] mshr_addr_st0;
wire [`UP(`WORD_SELECT_WIDTH)-1:0] msrq_wsel_st0; wire [`UP(`WORD_SELECT_WIDTH)-1:0] mshr_wsel_st0;
wire [`WORD_WIDTH-1:0] msrq_writeword_st0; wire [`WORD_WIDTH-1:0] mshr_writeword_st0;
wire [`REQ_TAG_WIDTH-1:0] msrq_tag_st0; wire [`REQ_TAG_WIDTH-1:0] mshr_tag_st0;
wire msrq_rw_st0; wire mshr_rw_st0;
wire [WORD_SIZE-1:0] msrq_byteen_st0; wire [WORD_SIZE-1:0] mshr_byteen_st0;
wire msrq_is_snp_st0; wire mshr_is_snp_st0;
wire msrq_snp_invalidate_st0; wire mshr_snp_invalidate_st0;
wire is_msrq_miss_st2; wire is_mshr_miss_st2;
wire is_msrq_miss_st3; wire is_mshr_miss_st3;
wire msrq_push_stall; wire mshr_push_stall;
wire cwbq_push_stall; wire cwbq_push_stall;
wire dwbq_push_stall; wire dwbq_push_stall;
wire snpq_push_stall; wire snpq_push_stall;
@@ -269,13 +269,13 @@ module VX_bank #(
wire is_fill_st1; wire is_fill_st1;
// determine which queue to pop next in piority order // determine which queue to pop next in piority order
wire msrq_pop_unqual = msrq_valid_st0; wire mshr_pop_unqual = mshr_valid_st0;
wire dfpq_pop_unqual = !msrq_pop_unqual && !dfpq_empty; wire dfpq_pop_unqual = !mshr_pop_unqual && !dfpq_empty;
wire reqq_pop_unqual = !msrq_pop_unqual && !dfpq_pop_unqual && !reqq_empty && !msrq_almfull; wire reqq_pop_unqual = !mshr_pop_unqual && !dfpq_pop_unqual && !reqq_empty && !mshr_almfull;
wire snrq_pop_unqual = !msrq_pop_unqual && !dfpq_pop_unqual && !reqq_pop_unqual && !snrq_empty && !msrq_almfull; wire snrq_pop_unqual = !mshr_pop_unqual && !dfpq_pop_unqual && !reqq_pop_unqual && !snrq_empty && !mshr_almfull;
assign msrq_pop = msrq_pop_unqual && !pipeline_stall assign mshr_pop = mshr_pop_unqual && !pipeline_stall
&& !(is_msrq_miss_st2 || is_msrq_miss_st3); // stop if previous request was a miss && !(is_mshr_miss_st2 || is_mshr_miss_st3); // stop if previous request was a miss
assign dfpq_pop = dfpq_pop_unqual && !pipeline_stall; assign dfpq_pop = dfpq_pop_unqual && !pipeline_stall;
assign reqq_pop = reqq_pop_unqual && !pipeline_stall; assign reqq_pop = reqq_pop_unqual && !pipeline_stall;
assign snrq_pop = snrq_pop_unqual && !pipeline_stall; assign snrq_pop = snrq_pop_unqual && !pipeline_stall;
@@ -284,14 +284,14 @@ module VX_bank #(
wire valid_st0; wire valid_st0;
wire [`LINE_ADDR_WIDTH-1:0] addr_st0; wire [`LINE_ADDR_WIDTH-1:0] addr_st0;
wire [`UP(`WORD_SELECT_WIDTH)-1:0] wsel_st0; wire [`UP(`WORD_SELECT_WIDTH)-1:0] wsel_st0;
wire is_msrq_st0; wire is_mshr_st0;
wire [`WORD_WIDTH-1:0] writeword_st0; wire [`WORD_WIDTH-1:0] writeword_st0;
wire [`BANK_LINE_WIDTH-1:0] writedata_st0; wire [`BANK_LINE_WIDTH-1:0] writedata_st0;
wire [`REQ_INST_META_WIDTH-1:0] inst_meta_st0; wire [`REQ_INST_META_WIDTH-1:0] inst_meta_st0;
wire is_snp_st0; wire is_snp_st0;
wire snp_invalidate_st0; wire snp_invalidate_st0;
wire msrq_pending_hazard_unqual_st0; wire mshr_pending_hazard_unqual_st0;
wire valid_st1; wire valid_st1;
wire [`LINE_ADDR_WIDTH-1:0] addr_st1; wire [`LINE_ADDR_WIDTH-1:0] addr_st1;
@@ -301,19 +301,19 @@ module VX_bank #(
wire [`BANK_LINE_WIDTH-1:0] writedata_st1; wire [`BANK_LINE_WIDTH-1:0] writedata_st1;
wire is_snp_st1; wire is_snp_st1;
wire snp_invalidate_st1; wire snp_invalidate_st1;
wire is_msrq_st1; wire is_mshr_st1;
wire msrq_pending_hazard_st1; wire mshr_pending_hazard_st1;
wire miss_st3; wire miss_st3;
wire force_miss_st3; wire force_miss_st3;
wire [`LINE_ADDR_WIDTH-1:0] addr_st3; wire [`LINE_ADDR_WIDTH-1:0] addr_st3;
assign is_msrq_st0 = msrq_pop_unqual; assign is_mshr_st0 = mshr_pop_unqual;
assign is_fill_st0 = dfpq_pop_unqual; assign is_fill_st0 = dfpq_pop_unqual;
assign valid_st0 = dfpq_pop || msrq_pop || reqq_pop || snrq_pop; assign valid_st0 = dfpq_pop || mshr_pop || reqq_pop || snrq_pop;
assign addr_st0 = msrq_pop_unqual ? msrq_addr_st0 : assign addr_st0 = mshr_pop_unqual ? mshr_addr_st0 :
dfpq_pop_unqual ? dfpq_addr_st0 : dfpq_pop_unqual ? dfpq_addr_st0 :
reqq_pop_unqual ? reqq_addr_st0[`LINE_SELECT_ADDR_RNG] : reqq_pop_unqual ? reqq_addr_st0[`LINE_SELECT_ADDR_RNG] :
snrq_pop_unqual ? snrq_addr_st0 : snrq_pop_unqual ? snrq_addr_st0 :
@@ -321,34 +321,34 @@ module VX_bank #(
if (`WORD_SELECT_WIDTH != 0) begin if (`WORD_SELECT_WIDTH != 0) begin
assign wsel_st0 = reqq_pop_unqual ? reqq_addr_st0[`WORD_SELECT_WIDTH-1:0] : assign wsel_st0 = reqq_pop_unqual ? reqq_addr_st0[`WORD_SELECT_WIDTH-1:0] :
msrq_pop_unqual ? msrq_wsel_st0 : mshr_pop_unqual ? mshr_wsel_st0 :
0; 0;
end else begin end else begin
`UNUSED_VAR (msrq_wsel_st0) `UNUSED_VAR (mshr_wsel_st0)
assign wsel_st0 = 0; assign wsel_st0 = 0;
end end
assign writedata_st0 = dfpq_filldata_st0; assign writedata_st0 = dfpq_filldata_st0;
assign inst_meta_st0 = msrq_pop_unqual ? {`REQ_TAG_WIDTH'(msrq_tag_st0), msrq_rw_st0, msrq_byteen_st0, msrq_tid_st0} : assign inst_meta_st0 = mshr_pop_unqual ? {`REQ_TAG_WIDTH'(mshr_tag_st0), mshr_rw_st0, mshr_byteen_st0, mshr_tid_st0} :
reqq_pop_unqual ? {`REQ_TAG_WIDTH'(reqq_tag_st0), reqq_rw_st0, reqq_byteen_st0, reqq_tid_st0} : reqq_pop_unqual ? {`REQ_TAG_WIDTH'(reqq_tag_st0), reqq_rw_st0, reqq_byteen_st0, reqq_tid_st0} :
snrq_pop_unqual ? {`REQ_TAG_WIDTH'(snrq_tag_st0), 1'b0, WORD_SIZE'(0), `REQS_BITS'(0)} : snrq_pop_unqual ? {`REQ_TAG_WIDTH'(snrq_tag_st0), 1'b0, WORD_SIZE'(0), `REQS_BITS'(0)} :
0; 0;
assign is_snp_st0 = msrq_pop_unqual ? msrq_is_snp_st0 : assign is_snp_st0 = mshr_pop_unqual ? mshr_is_snp_st0 :
snrq_pop_unqual ? 1 : snrq_pop_unqual ? 1 :
0; 0;
assign snp_invalidate_st0 = msrq_pop_unqual ? msrq_snp_invalidate_st0 : assign snp_invalidate_st0 = mshr_pop_unqual ? mshr_snp_invalidate_st0 :
snrq_pop_unqual ? snrq_invalidate_st0 : snrq_pop_unqual ? snrq_invalidate_st0 :
0; 0;
assign writeword_st0 = msrq_pop_unqual ? msrq_writeword_st0 : assign writeword_st0 = mshr_pop_unqual ? mshr_writeword_st0 :
reqq_pop_unqual ? reqq_writeword_st0 : reqq_pop_unqual ? reqq_writeword_st0 :
0; 0;
// we have a miss in msrq or in stage 3 for the current address // we have a miss in msrq or in stage 3 for the current address
wire msrq_pending_hazard_st0 = msrq_pending_hazard_unqual_st0 wire mshr_pending_hazard_st0 = mshr_pending_hazard_unqual_st0
|| ((miss_st3 || force_miss_st3) && (addr_st3 == addr_st0)); || ((miss_st3 || force_miss_st3) && (addr_st3 == addr_st0));
`ifdef DBG_CACHE_REQ_INFO `ifdef DBG_CACHE_REQ_INFO
@@ -366,8 +366,8 @@ module VX_bank #(
.reset (reset), .reset (reset),
.stall (pipeline_stall), .stall (pipeline_stall),
.flush (1'b0), .flush (1'b0),
.in ({is_msrq_st0, is_snp_st0, snp_invalidate_st0, msrq_pending_hazard_st0, valid_st0, addr_st0, wsel_st0, writeword_st0, inst_meta_st0, is_fill_st0, writedata_st0}), .in ({is_mshr_st0, is_snp_st0, snp_invalidate_st0, mshr_pending_hazard_st0, valid_st0, addr_st0, wsel_st0, writeword_st0, inst_meta_st0, is_fill_st0, writedata_st0}),
.out ({is_msrq_st1, is_snp_st1, snp_invalidate_st1, msrq_pending_hazard_st1, valid_st1, addr_st1, wsel_st1, writeword_st1, inst_meta_st1, is_fill_st1, writedata_st1}) .out ({is_mshr_st1, is_snp_st1, snp_invalidate_st1, mshr_pending_hazard_st1, valid_st1, addr_st1, wsel_st1, writeword_st1, inst_meta_st1, is_fill_st1, writedata_st1})
); );
`ifdef DBG_CACHE_REQ_INFO `ifdef DBG_CACHE_REQ_INFO
@@ -401,9 +401,9 @@ module VX_bank #(
// force miss to ensure commit order when a new request has pending previous requests to same block // force miss to ensure commit order when a new request has pending previous requests to same block
// also force a miss for msrq requests when previous requests got a miss // also force a miss for msrq requests when previous requests got a miss
wire force_miss_st1 = (valid_st1 && !is_msrq_st1 && !is_fill_st1 wire force_miss_st1 = (valid_st1 && !is_mshr_st1 && !is_fill_st1
&& (msrq_pending_hazard_st1 || st2_pending_hazard_st1 || st3_pending_hazard_st1)) && (mshr_pending_hazard_st1 || st2_pending_hazard_st1 || st3_pending_hazard_st1))
|| (valid_st1 && is_msrq_st1 && is_msrq_miss_st2); || (valid_st1 && is_mshr_st1 && is_mshr_miss_st2);
VX_tag_access #( VX_tag_access #(
.BANK_ID (BANK_ID), .BANK_ID (BANK_ID),
@@ -460,7 +460,7 @@ module VX_bank #(
wire is_fill_st2; wire is_fill_st2;
wire is_snp_st2; wire is_snp_st2;
wire snp_invalidate_st2; wire snp_invalidate_st2;
wire is_msrq_st2; wire is_mshr_st2;
VX_generic_register #( VX_generic_register #(
.N(1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_WIDTH) + `WORD_WIDTH + `TAG_SELECT_BITS + 1 + 1 + `BANK_LINE_WIDTH + WORD_SIZE + `REQ_INST_META_WIDTH) .N(1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_WIDTH) + `WORD_WIDTH + `TAG_SELECT_BITS + 1 + 1 + `BANK_LINE_WIDTH + WORD_SIZE + `REQ_INST_META_WIDTH)
@@ -469,8 +469,8 @@ module VX_bank #(
.reset (reset), .reset (reset),
.stall (pipeline_stall), .stall (pipeline_stall),
.flush (1'b0), .flush (1'b0),
.in ({is_msrq_st1, writeen_st1, force_miss_st1, is_snp_st1, snp_invalidate_st1, is_fill_st1, valid_st1, addr_st1, wsel_st1, writeword_st1, readtag_st1, miss_st1, dirty_st1, writedata_st1, mem_byteen_st1, inst_meta_st1}), .in ({is_mshr_st1, writeen_st1, force_miss_st1, is_snp_st1, snp_invalidate_st1, is_fill_st1, valid_st1, addr_st1, wsel_st1, writeword_st1, readtag_st1, miss_st1, dirty_st1, writedata_st1, mem_byteen_st1, inst_meta_st1}),
.out ({is_msrq_st2, writeen_st2, force_miss_st2, is_snp_st2, snp_invalidate_st2, is_fill_st2, valid_st2, addr_st2, wsel_st2, writeword_st2, readtag_st2, miss_st2, dirty_st2, writedata_st2, mem_byteen_st2, inst_meta_st2}) .out ({is_mshr_st2, writeen_st2, force_miss_st2, is_snp_st2, snp_invalidate_st2, is_fill_st2, valid_st2, addr_st2, wsel_st2, writeword_st2, readtag_st2, miss_st2, dirty_st2, writedata_st2, mem_byteen_st2, inst_meta_st2})
); );
`ifdef DBG_CACHE_REQ_INFO `ifdef DBG_CACHE_REQ_INFO
@@ -481,7 +481,7 @@ module VX_bank #(
end end
`endif `endif
assign is_msrq_miss_st2 = (miss_st2 || force_miss_st2) && is_msrq_st2; assign is_mshr_miss_st2 = (miss_st2 || force_miss_st2) && is_mshr_st2;
VX_data_access #( VX_data_access #(
.BANK_ID (BANK_ID), .BANK_ID (BANK_ID),
@@ -532,7 +532,7 @@ module VX_bank #(
wire [`TAG_SELECT_BITS-1:0] readtag_st3; wire [`TAG_SELECT_BITS-1:0] readtag_st3;
wire is_snp_st3; wire is_snp_st3;
wire snp_invalidate_st3; wire snp_invalidate_st3;
wire is_msrq_st3; wire is_mshr_st3;
wire send_core_rsp_st3; wire send_core_rsp_st3;
wire send_dwb_req_st3; wire send_dwb_req_st3;
wire do_writeback_st3; wire do_writeback_st3;
@@ -551,7 +551,7 @@ module VX_bank #(
wire send_fill_req_st2 = valid_st2 && miss_st2 wire send_fill_req_st2 = valid_st2 && miss_st2
&& (!force_miss_st2 && (!force_miss_st2
|| (is_msrq_st2 && addr_st2 != addr_st3)) || (is_mshr_st2 && addr_st2 != addr_st3))
&& !incoming_fill_st2; && !incoming_fill_st2;
wire do_writeback_st2 = valid_st2 && dirty_st2 wire do_writeback_st2 = valid_st2 && dirty_st2
@@ -569,8 +569,8 @@ module VX_bank #(
.reset (reset), .reset (reset),
.stall (pipeline_stall), .stall (pipeline_stall),
.flush (1'b0), .flush (1'b0),
.in ({is_msrq_st2, incoming_fill_st2, send_core_rsp_st2, send_dwb_req_st2, do_writeback_st2, send_snp_rsp_st2, force_miss_st2, is_snp_st2, snp_invalidate_st2, valid_st2, addr_st2, wsel_st2, writeword_st2, readword_st2, readdata_st2, readtag_st2, miss_st2, dirtyb_st2, inst_meta_st2}), .in ({is_mshr_st2, incoming_fill_st2, send_core_rsp_st2, send_dwb_req_st2, do_writeback_st2, send_snp_rsp_st2, force_miss_st2, is_snp_st2, snp_invalidate_st2, valid_st2, addr_st2, wsel_st2, writeword_st2, readword_st2, readdata_st2, readtag_st2, miss_st2, dirtyb_st2, inst_meta_st2}),
.out ({is_msrq_st3, incoming_fill_st3, send_core_rsp_st3, send_dwb_req_st3, do_writeback_st3, send_snp_rsp_st3, force_miss_st3, is_snp_st3, snp_invalidate_st3, valid_st3, addr_st3, wsel_st3, writeword_st3, readword_st3, readdata_st3, readtag_st3, miss_st3, dirtyb_st3, inst_meta_st3}) .out ({is_mshr_st3, incoming_fill_st3, send_core_rsp_st3, send_dwb_req_st3, do_writeback_st3, send_snp_rsp_st3, force_miss_st3, is_snp_st3, snp_invalidate_st3, valid_st3, addr_st3, wsel_st3, writeword_st3, readword_st3, readdata_st3, readtag_st3, miss_st3, dirtyb_st3, inst_meta_st3})
); );
`ifdef DBG_CACHE_REQ_INFO `ifdef DBG_CACHE_REQ_INFO
@@ -581,7 +581,7 @@ module VX_bank #(
end end
`endif `endif
assign is_msrq_miss_st3 = (miss_st3 || force_miss_st3) && is_msrq_st3; assign is_mshr_miss_st3 = (miss_st3 || force_miss_st3) && is_mshr_st3;
// Enqueue to miss reserv if it's a valid miss // Enqueue to miss reserv if it's a valid miss
@@ -590,11 +590,11 @@ module VX_bank #(
wire req_rw_st3; wire req_rw_st3;
wire[WORD_SIZE-1:0] req_byteen_st3; wire[WORD_SIZE-1:0] req_byteen_st3;
wire msrq_push_unqual = miss_st3 || force_miss_st3; wire mshr_push_unqual = miss_st3 || force_miss_st3;
assign msrq_push_stall = msrq_push_unqual && msrq_full; assign mshr_push_stall = mshr_push_unqual && mshr_full;
wire msrq_push = msrq_push_unqual wire mshr_push = mshr_push_unqual
&& !msrq_full && !mshr_full
&& !cwbq_push_stall && !cwbq_push_stall
&& !dwbq_push_stall && !dwbq_push_stall
&& !snpq_push_stall; && !snpq_push_stall;
@@ -602,98 +602,98 @@ module VX_bank #(
assign {req_tag_st3, req_rw_st3, req_byteen_st3, req_tid_st3} = inst_meta_st3; assign {req_tag_st3, req_rw_st3, req_byteen_st3, req_tid_st3} = inst_meta_st3;
if (DRAM_ENABLE) begin if (DRAM_ENABLE) begin
wire msrq_dequeue_st3 = valid_st3 && is_msrq_st3 && !msrq_push_unqual && !pipeline_stall; wire mshr_dequeue_st3 = valid_st3 && is_mshr_st3 && !mshr_push_unqual && !pipeline_stall;
// mark msrq entry that match DRAM fill as 'ready' // mark msrq entry that match DRAM fill as 'ready'
wire update_ready_st0 = dfpq_pop; wire update_ready_st0 = dfpq_pop;
// push missed requests as 'ready' if it was a forced miss but actually had a hit // push missed requests as 'ready' if it was a forced miss but actually had a hit
// or the fill request is comming for the missed block // or the fill request is comming for the missed block
wire msrq_init_ready_state_st3 = !miss_st3 || incoming_fill_st3; wire mshr_init_ready_state_st3 = !miss_st3 || incoming_fill_st3;
VX_cache_miss_resrv #( VX_cache_miss_resrv #(
.BANK_ID (BANK_ID), .BANK_ID (BANK_ID),
.CACHE_ID (CACHE_ID), .CACHE_ID (CACHE_ID),
.CORE_TAG_ID_BITS (CORE_TAG_ID_BITS), .CORE_TAG_ID_BITS (CORE_TAG_ID_BITS),
.BANK_LINE_SIZE (BANK_LINE_SIZE), .BANK_LINE_SIZE (BANK_LINE_SIZE),
.NUM_BANKS (NUM_BANKS), .NUM_BANKS (NUM_BANKS),
.WORD_SIZE (WORD_SIZE), .WORD_SIZE (WORD_SIZE),
.NUM_REQUESTS (NUM_REQUESTS), .NUM_REQUESTS (NUM_REQUESTS),
.MRVQ_SIZE (MRVQ_SIZE), .MSHR_SIZE (MSHR_SIZE),
.CORE_TAG_WIDTH (CORE_TAG_WIDTH), .CORE_TAG_WIDTH (CORE_TAG_WIDTH),
.SNP_TAG_WIDTH (SNP_TAG_WIDTH) .SNP_TAG_WIDTH (SNP_TAG_WIDTH)
) cache_miss_resrv ( ) cache_miss_resrv (
.clk (clk), .clk (clk),
.reset (reset), .reset (reset),
`ifdef DBG_CACHE_REQ_INFO `ifdef DBG_CACHE_REQ_INFO
.debug_pc_st0 (debug_pc_st0), .debug_pc_st0 (debug_pc_st0),
.debug_rd_st0 (debug_rd_st0), .debug_rd_st0 (debug_rd_st0),
.debug_wid_st0 (debug_wid_st0), .debug_wid_st0 (debug_wid_st0),
.debug_tagid_st0(debug_tagid_st0), .debug_tagid_st0 (debug_tagid_st0),
.debug_pc_st3 (debug_pc_st3), .debug_pc_st3 (debug_pc_st3),
.debug_rd_st3 (debug_rd_st3), .debug_rd_st3 (debug_rd_st3),
.debug_wid_st3 (debug_wid_st3), .debug_wid_st3 (debug_wid_st3),
.debug_tagid_st3(debug_tagid_st3), .debug_tagid_st3 (debug_tagid_st3),
`endif `endif
// enqueue // enqueue
.enqueue_st3 (msrq_push), .enqueue_st3 (mshr_push),
.enqueue_addr_st3 (addr_st3), .enqueue_addr_st3 (addr_st3),
.enqueue_wsel_st3 (wsel_st3), .enqueue_wsel_st3 (wsel_st3),
.enqueue_data_st3 (writeword_st3), .enqueue_data_st3 (writeword_st3),
.enqueue_tid_st3 (req_tid_st3), .enqueue_tid_st3 (req_tid_st3),
.enqueue_tag_st3 (req_tag_st3), .enqueue_tag_st3 (req_tag_st3),
.enqueue_rw_st3 (req_rw_st3), .enqueue_rw_st3 (req_rw_st3),
.enqueue_byteen_st3 (req_byteen_st3), .enqueue_byteen_st3 (req_byteen_st3),
.enqueue_is_snp_st3 (is_snp_st3), .enqueue_is_snp_st3 (is_snp_st3),
.enqueue_snp_inv_st3 (snp_invalidate_st3), .enqueue_snp_inv_st3(snp_invalidate_st3),
.enqueue_msrq_st3 (is_msrq_st3), .enqueue_mshr_st3 (is_mshr_st3),
.enqueue_ready_st3 (msrq_init_ready_state_st3), .enqueue_ready_st3 (mshr_init_ready_state_st3),
.enqueue_full (msrq_full), .enqueue_full (mshr_full),
.enqueue_almfull (msrq_almfull), .enqueue_almfull (mshr_almfull),
// fill // fill
.update_ready_st0 (update_ready_st0), .update_ready_st0 (update_ready_st0),
.addr_st0 (addr_st0), .addr_st0 (addr_st0),
.pending_hazard_st0 (msrq_pending_hazard_unqual_st0), .pending_hazard_st0 (mshr_pending_hazard_unqual_st0),
// dequeue // dequeue
.schedule_st0 (msrq_pop), .schedule_st0 (mshr_pop),
.dequeue_valid_st0 (msrq_valid_st0), .dequeue_valid_st0 (mshr_valid_st0),
.dequeue_addr_st0 (msrq_addr_st0), .dequeue_addr_st0 (mshr_addr_st0),
.dequeue_wsel_st0 (msrq_wsel_st0), .dequeue_wsel_st0 (mshr_wsel_st0),
.dequeue_data_st0 (msrq_writeword_st0), .dequeue_data_st0 (mshr_writeword_st0),
.dequeue_tid_st0 (msrq_tid_st0), .dequeue_tid_st0 (mshr_tid_st0),
.dequeue_tag_st0 (msrq_tag_st0), .dequeue_tag_st0 (mshr_tag_st0),
.dequeue_rw_st0 (msrq_rw_st0), .dequeue_rw_st0 (mshr_rw_st0),
.dequeue_byteen_st0 (msrq_byteen_st0), .dequeue_byteen_st0 (mshr_byteen_st0),
.dequeue_is_snp_st0 (msrq_is_snp_st0), .dequeue_is_snp_st0 (mshr_is_snp_st0),
.dequeue_snp_inv_st0 (msrq_snp_invalidate_st0), .dequeue_snp_inv_st0(mshr_snp_invalidate_st0),
.dequeue_st3 (msrq_dequeue_st3) .dequeue_st3 (mshr_dequeue_st3)
); );
end else begin end else begin
`UNUSED_VAR (valid_st3) `UNUSED_VAR (valid_st3)
`UNUSED_VAR (msrq_push) `UNUSED_VAR (mshr_push)
`UNUSED_VAR (wsel_st3) `UNUSED_VAR (wsel_st3)
`UNUSED_VAR (writeword_st3) `UNUSED_VAR (writeword_st3)
`UNUSED_VAR (snp_invalidate_st3) `UNUSED_VAR (snp_invalidate_st3)
`UNUSED_VAR (req_byteen_st3) `UNUSED_VAR (req_byteen_st3)
`UNUSED_VAR (is_snp_st3) `UNUSED_VAR (is_snp_st3)
`UNUSED_VAR (incoming_fill_st3) `UNUSED_VAR (incoming_fill_st3)
assign msrq_pending_hazard_unqual_st0 = 0; assign mshr_pending_hazard_unqual_st0 = 0;
assign msrq_full = 0; assign mshr_full = 0;
assign msrq_almfull = 0; assign mshr_almfull = 0;
assign msrq_valid_st0 = 0; assign mshr_valid_st0 = 0;
assign msrq_addr_st0 = 0; assign mshr_addr_st0 = 0;
assign msrq_wsel_st0 = 0; assign mshr_wsel_st0 = 0;
assign msrq_writeword_st0 = 0; assign mshr_writeword_st0 = 0;
assign msrq_tid_st0 = 0; assign mshr_tid_st0 = 0;
assign msrq_tag_st0 = 0; assign mshr_tag_st0 = 0;
assign msrq_rw_st0 = 0; assign mshr_rw_st0 = 0;
assign msrq_byteen_st0 = 0; assign mshr_byteen_st0 = 0;
assign msrq_is_snp_st0 = 0; assign mshr_is_snp_st0 = 0;
assign msrq_snp_invalidate_st0 = 0; assign mshr_snp_invalidate_st0 = 0;
end end
// Enqueue core response // Enqueue core response
@@ -705,7 +705,7 @@ module VX_bank #(
wire cwbq_push = cwbq_push_unqual wire cwbq_push = cwbq_push_unqual
&& !cwbq_full && !cwbq_full
&& !msrq_push_stall && !mshr_push_stall
&& !dwbq_push_stall && !dwbq_push_stall
&& !snpq_push_stall; && !snpq_push_stall;
@@ -742,7 +742,7 @@ module VX_bank #(
wire dwbq_push = dwbq_push_unqual wire dwbq_push = dwbq_push_unqual
&& !dwbq_full && !dwbq_full
&& !msrq_push_stall && !mshr_push_stall
&& !cwbq_push_stall && !cwbq_push_stall
&& !snpq_push_stall; && !snpq_push_stall;
@@ -797,7 +797,7 @@ module VX_bank #(
wire snpq_push = snpq_push_unqual wire snpq_push = snpq_push_unqual
&& !snpq_full && !snpq_full
&& !msrq_push_stall && !mshr_push_stall
&& !cwbq_push_stall && !cwbq_push_stall
&& !dwbq_push_stall; && !dwbq_push_stall;
@@ -834,7 +834,7 @@ module VX_bank #(
&& dwbq_empty; // ensure all writebacks are sent && dwbq_empty; // ensure all writebacks are sent
// bank pipeline stall // bank pipeline stall
assign pipeline_stall = msrq_push_stall assign pipeline_stall = mshr_push_stall
|| cwbq_push_stall || cwbq_push_stall
|| dwbq_push_stall || dwbq_push_stall
|| snpq_push_stall; || snpq_push_stall;
@@ -844,7 +844,7 @@ module VX_bank #(
`SCOPE_ASSIGN (valid_st2, valid_st2); `SCOPE_ASSIGN (valid_st2, valid_st2);
`SCOPE_ASSIGN (valid_st3, valid_st3); `SCOPE_ASSIGN (valid_st3, valid_st3);
`SCOPE_ASSIGN (is_msrq_st1, is_msrq_st1); `SCOPE_ASSIGN (is_mshr_st1, is_mshr_st1);
`SCOPE_ASSIGN (miss_st1, miss_st1); `SCOPE_ASSIGN (miss_st1, miss_st1);
`SCOPE_ASSIGN (dirty_st1, dirty_st1); `SCOPE_ASSIGN (dirty_st1, dirty_st1);
`SCOPE_ASSIGN (force_miss_st1, force_miss_st1); `SCOPE_ASSIGN (force_miss_st1, force_miss_st1);
@@ -860,10 +860,10 @@ module VX_bank #(
always @(posedge clk) begin always @(posedge clk) begin
if (miss_st3 && (incoming_fill_st3 || incoming_fill_dfp_st3)) begin if (miss_st3 && (incoming_fill_st3 || incoming_fill_dfp_st3)) begin
$display("%t: incoming fill - addr=%0h, st3=%b, dfp=%b", $time, `LINE_TO_BYTE_ADDR(addr_st3, BANK_ID), incoming_fill_st3, incoming_fill_dfp_st3); $display("%t: incoming fill - addr=%0h, st3=%b, dfp=%b", $time, `LINE_TO_BYTE_ADDR(addr_st3, BANK_ID), incoming_fill_st3, incoming_fill_dfp_st3);
assert(!is_msrq_st3); assert(!is_mshr_st3);
end end
if (pipeline_stall) begin if (pipeline_stall) begin
$display("%t: cache%0d:%0d pipeline-stall: msrq=%b, cwbq=%b, dwbq=%b, snpq=%b", $time, CACHE_ID, BANK_ID, msrq_push_stall, cwbq_push_stall, dwbq_push_stall, snpq_push_stall); $display("%t: cache%0d:%0d pipeline-stall: msrq=%b, cwbq=%b, dwbq=%b, snpq=%b", $time, CACHE_ID, BANK_ID, mshr_push_stall, cwbq_push_stall, dwbq_push_stall, snpq_push_stall);
end end
if (dfpq_pop) begin if (dfpq_pop) begin
$display("%t: cache%0d:%0d fill-rsp: addr=%0h, data=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), dfpq_filldata_st0); $display("%t: cache%0d:%0d fill-rsp: addr=%0h, data=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), dfpq_filldata_st0);

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

@@ -17,7 +17,7 @@ module VX_cache #(
// Core Request Queue Size // Core Request Queue Size
parameter CREQ_SIZE = 4, parameter CREQ_SIZE = 4,
// Miss Reserv Queue Knob // Miss Reserv Queue Knob
parameter MRVQ_SIZE = 8, parameter MSHR_SIZE = 8,
// DRAM Response Queue Size // DRAM Response Queue Size
parameter DRFQ_SIZE = 4, parameter DRFQ_SIZE = 4,
// Snoop Req Queue Size // Snoop Req Queue Size
@@ -264,7 +264,7 @@ module VX_cache #(
.WORD_SIZE (WORD_SIZE), .WORD_SIZE (WORD_SIZE),
.NUM_REQUESTS (NUM_REQUESTS), .NUM_REQUESTS (NUM_REQUESTS),
.CREQ_SIZE (CREQ_SIZE), .CREQ_SIZE (CREQ_SIZE),
.MRVQ_SIZE (MRVQ_SIZE), .MSHR_SIZE (MSHR_SIZE),
.DRFQ_SIZE (DRFQ_SIZE), .DRFQ_SIZE (DRFQ_SIZE),
.SNRQ_SIZE (SNRQ_SIZE), .SNRQ_SIZE (SNRQ_SIZE),
.CWBQ_SIZE (CWBQ_SIZE), .CWBQ_SIZE (CWBQ_SIZE),

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

@@ -15,7 +15,7 @@
`define REQ_INST_META_WIDTH (`REQ_TAG_WIDTH + 1 + WORD_SIZE + `REQS_BITS) `define REQ_INST_META_WIDTH (`REQ_TAG_WIDTH + 1 + WORD_SIZE + `REQS_BITS)
// data metadata word_sel is_snp snp_invalidate // data metadata word_sel is_snp snp_invalidate
`define MRVQ_METADATA_WIDTH (`WORD_WIDTH + `REQ_INST_META_WIDTH + `UP(`WORD_SELECT_WIDTH) + 1 + 1) `define MSHR_METADATA_WIDTH (`WORD_WIDTH + `REQ_INST_META_WIDTH + `UP(`WORD_SELECT_WIDTH) + 1 + 1)
`define BANK_BITS `LOG2UP(NUM_BANKS) `define BANK_BITS `LOG2UP(NUM_BANKS)

50
hw/rtl/cache/VX_cache_miss_resrv.v vendored
View File

@@ -13,7 +13,7 @@ module VX_cache_miss_resrv #(
// Number of Word requests per cycle // Number of Word requests per cycle
parameter NUM_REQUESTS = 1, parameter NUM_REQUESTS = 1,
// Miss Reserv Queue Knob // Miss Reserv Queue Knob
parameter MRVQ_SIZE = 1, parameter MSHR_SIZE = 1,
// core request tag size // core request tag size
parameter CORE_TAG_WIDTH = 1, parameter CORE_TAG_WIDTH = 1,
// Snooping request tag width // Snooping request tag width
@@ -48,7 +48,7 @@ module VX_cache_miss_resrv #(
input wire[WORD_SIZE-1:0] enqueue_byteen_st3, input wire[WORD_SIZE-1:0] enqueue_byteen_st3,
input wire enqueue_is_snp_st3, input wire enqueue_is_snp_st3,
input wire enqueue_snp_inv_st3, input wire enqueue_snp_inv_st3,
input wire enqueue_msrq_st3, input wire enqueue_mshr_st3,
input wire enqueue_ready_st3, input wire enqueue_ready_st3,
output wire enqueue_full, output wire enqueue_full,
output wire enqueue_almfull, output wire enqueue_almfull,
@@ -74,24 +74,24 @@ module VX_cache_miss_resrv #(
); );
localparam FULL_DISTANCE = 3; // need 3 cycles window to prevent pipeline lock localparam FULL_DISTANCE = 3; // need 3 cycles window to prevent pipeline lock
wire [`MRVQ_METADATA_WIDTH-1:0] metadata_table; wire [`MSHR_METADATA_WIDTH-1:0] metadata_table;
`NO_RW_RAM_CHECK reg [`LINE_ADDR_WIDTH-1:0] addr_table [MRVQ_SIZE-1:0]; `NO_RW_RAM_CHECK reg [`LINE_ADDR_WIDTH-1:0] addr_table [MSHR_SIZE-1:0];
reg [MRVQ_SIZE-1:0] valid_table; reg [MSHR_SIZE-1:0] valid_table;
reg [MRVQ_SIZE-1:0] ready_table; reg [MSHR_SIZE-1:0] ready_table;
reg [`LOG2UP(MRVQ_SIZE)-1:0] schedule_ptr, restore_ptr; reg [`LOG2UP(MSHR_SIZE)-1:0] schedule_ptr, restore_ptr;
reg [`LOG2UP(MRVQ_SIZE)-1:0] head_ptr; reg [`LOG2UP(MSHR_SIZE)-1:0] head_ptr;
reg [`LOG2UP(MRVQ_SIZE)-1:0] tail_ptr; reg [`LOG2UP(MSHR_SIZE)-1:0] tail_ptr;
reg [`LOG2UP(MRVQ_SIZE+1)-1:0] size; reg [`LOG2UP(MSHR_SIZE+1)-1:0] size;
`STATIC_ASSERT(MRVQ_SIZE > FULL_DISTANCE, ("invalid size")) `STATIC_ASSERT(MSHR_SIZE > FULL_DISTANCE, ("invalid size"))
assign enqueue_full = (size == $bits(size)'(MRVQ_SIZE)); assign enqueue_full = (size == $bits(size)'(MSHR_SIZE));
assign enqueue_almfull = (size >= $bits(size)'(MRVQ_SIZE-FULL_DISTANCE)); assign enqueue_almfull = (size >= $bits(size)'(MSHR_SIZE-FULL_DISTANCE));
wire [MRVQ_SIZE-1:0] valid_address_match; wire [MSHR_SIZE-1:0] valid_address_match;
for (genvar i = 0; i < MRVQ_SIZE; i++) begin for (genvar i = 0; i < MSHR_SIZE; i++) begin
assign valid_address_match[i] = valid_table[i] && (addr_table[i] == addr_st0); assign valid_address_match[i] = valid_table[i] && (addr_table[i] == addr_st0);
end end
@@ -110,9 +110,9 @@ module VX_cache_miss_resrv #(
dequeue_is_snp_st0, dequeue_is_snp_st0,
dequeue_snp_inv_st0} = metadata_table; dequeue_snp_inv_st0} = metadata_table;
wire msrq_push = enqueue_st3 && !enqueue_msrq_st3; wire mshr_push = enqueue_st3 && !enqueue_mshr_st3;
wire [`LOG2UP(MRVQ_SIZE)-1:0] head_ptr_n = head_ptr + $bits(head_ptr)'(1); wire [`LOG2UP(MSHR_SIZE)-1:0] head_ptr_n = head_ptr + $bits(head_ptr)'(1);
always @(posedge clk) begin always @(posedge clk) begin
if (reset) begin if (reset) begin
@@ -130,7 +130,7 @@ module VX_cache_miss_resrv #(
if (enqueue_st3) begin if (enqueue_st3) begin
assert(!enqueue_full); assert(!enqueue_full);
if (enqueue_msrq_st3) begin if (enqueue_mshr_st3) begin
// returning missed msrq entry, restore schedule // returning missed msrq entry, restore schedule
valid_table[restore_ptr] <= 1; valid_table[restore_ptr] <= 1;
ready_table[restore_ptr] <= enqueue_ready_st3; ready_table[restore_ptr] <= enqueue_ready_st3;
@@ -158,14 +158,14 @@ module VX_cache_miss_resrv #(
end end
always @(posedge clk) begin always @(posedge clk) begin
if (enqueue_st3 && !enqueue_msrq_st3) begin if (enqueue_st3 && !enqueue_mshr_st3) begin
addr_table[tail_ptr] <= enqueue_addr_st3; addr_table[tail_ptr] <= enqueue_addr_st3;
end end
end end
VX_dp_ram #( VX_dp_ram #(
.DATAW(`MRVQ_METADATA_WIDTH), .DATAW(`MSHR_METADATA_WIDTH),
.SIZE(MRVQ_SIZE), .SIZE(MSHR_SIZE),
.BYTEENW(1), .BYTEENW(1),
.BUFFERED(0), .BUFFERED(0),
.RWCHECK(1) .RWCHECK(1)
@@ -173,20 +173,20 @@ module VX_cache_miss_resrv #(
.clk(clk), .clk(clk),
.waddr(tail_ptr), .waddr(tail_ptr),
.raddr(schedule_ptr), .raddr(schedule_ptr),
.wren(msrq_push), .wren(mshr_push),
.byteen(1'b1), .byteen(1'b1),
.rden(1'b1), .rden(1'b1),
.din({enqueue_data_st3, enqueue_tid_st3, enqueue_tag_st3, enqueue_rw_st3, enqueue_byteen_st3, enqueue_wsel_st3, enqueue_is_snp_st3, enqueue_snp_inv_st3}), .din({enqueue_data_st3, enqueue_tid_st3, enqueue_tag_st3, enqueue_rw_st3, enqueue_byteen_st3, enqueue_wsel_st3, enqueue_is_snp_st3, enqueue_snp_inv_st3}),
.dout(metadata_table) .dout(metadata_table)
); );
`ifdef DBG_PRINT_CACHE_MSRQ `ifdef DBG_PRINT_CACHE_MSHR
always @(posedge clk) begin always @(posedge clk) begin
if (update_ready_st0 || schedule_st0 || enqueue_st3 || dequeue_st3) begin if (update_ready_st0 || schedule_st0 || enqueue_st3 || dequeue_st3) begin
if (schedule_st0) if (schedule_st0)
$display("%t: cache%0d:%0d msrq-schedule: addr%0d=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, schedule_ptr, `LINE_TO_BYTE_ADDR(dequeue_addr_st0, BANK_ID), debug_wid_st0, debug_pc_st0); $display("%t: cache%0d:%0d msrq-schedule: addr%0d=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, schedule_ptr, `LINE_TO_BYTE_ADDR(dequeue_addr_st0, BANK_ID), debug_wid_st0, debug_pc_st0);
if (enqueue_st3) begin if (enqueue_st3) begin
if (enqueue_msrq_st3) if (enqueue_mshr_st3)
$display("%t: cache%0d:%0d msrq-restore: addr%0d=%0h, ready=%b", $time, CACHE_ID, BANK_ID, restore_ptr, `LINE_TO_BYTE_ADDR(enqueue_addr_st3, BANK_ID), enqueue_ready_st3); $display("%t: cache%0d:%0d msrq-restore: addr%0d=%0h, ready=%b", $time, CACHE_ID, BANK_ID, restore_ptr, `LINE_TO_BYTE_ADDR(enqueue_addr_st3, BANK_ID), enqueue_ready_st3);
else else
$display("%t: cache%0d:%0d msrq-enq: addr%0d=%0h, ready=%b, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, tail_ptr, `LINE_TO_BYTE_ADDR(enqueue_addr_st3, BANK_ID), enqueue_ready_st3, debug_wid_st3, debug_pc_st3); $display("%t: cache%0d:%0d msrq-enq: addr%0d=%0h, ready=%b, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, tail_ptr, `LINE_TO_BYTE_ADDR(enqueue_addr_st3, BANK_ID), enqueue_ready_st3, debug_wid_st3, debug_pc_st3);
@@ -194,7 +194,7 @@ module VX_cache_miss_resrv #(
if (dequeue_st3) if (dequeue_st3)
$display("%t: cache%0d:%0d msrq-deq addr%0d, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, head_ptr, debug_wid_st3, debug_pc_st3); $display("%t: cache%0d:%0d msrq-deq addr%0d, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, head_ptr, debug_wid_st3, debug_pc_st3);
$write("%t: cache%0d:%0d msrq-table", $time, CACHE_ID, BANK_ID); $write("%t: cache%0d:%0d msrq-table", $time, CACHE_ID, BANK_ID);
for (integer j = 0; j < MRVQ_SIZE; j++) begin for (integer j = 0; j < MSHR_SIZE; j++) begin
if (valid_table[j]) begin if (valid_table[j]) begin
$write(" "); $write(" ");
if (schedule_ptr == $bits(schedule_ptr)'(j)) $write("*"); if (schedule_ptr == $bits(schedule_ptr)'(j)) $write("*");

2
hw/scripts/scope.json
View File

@@ -208,7 +208,7 @@
"addr_st1": 32, "addr_st1": 32,
"addr_st2": 32, "addr_st2": 32,
"addr_st3": 32, "addr_st3": 32,
"is_msrq_st1": 1, "is_mshr_st1": 1,
"miss_st1": 1, "miss_st1": 1,
"dirty_st1": 1, "dirty_st1": 1,
"!force_miss_st1": 1, "!force_miss_st1": 1,

2
hw/simulate/Makefile
View File

@@ -10,7 +10,7 @@ DBG_PRINT_FLAGS += -DDBG_PRINT_PIPELINE
DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_ICACHE DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_ICACHE
DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_DCACHE DBG_PRINT_FLAGS += -DDBG_PRINT_CORE_DCACHE
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_BANK DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_BANK
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSRQ DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSHR
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_SNP DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_SNP

2
hw/unit_tests/cache/Makefile vendored
View File

@@ -7,7 +7,7 @@ DBG_PRINT_FLAGS = -DDBG_PRINT_CORE_ICACHE \
-DDBG_PRINT_CORE_DCACHE \ -DDBG_PRINT_CORE_DCACHE \
-DDBG_PRINT_CACHE_BANK \ -DDBG_PRINT_CACHE_BANK \
-DDBG_PRINT_CACHE_SNP \ -DDBG_PRINT_CACHE_SNP \
-DDBG_PRINT_CACHE_MSRQ \ -DDBG_PRINT_CACHE_MSHR \
-DDBG_PRINT_CACHE_TAG \ -DDBG_PRINT_CACHE_TAG \
-DDBG_PRINT_CACHE_DATA \ -DDBG_PRINT_CACHE_DATA \
-DDBG_PRINT_DRAM \ -DDBG_PRINT_DRAM \