added support for write-through cache, removed cache snooping support
This commit is contained in:
249
hw/rtl/cache/VX_bank.v
vendored
249
hw/rtl/cache/VX_bank.v
vendored
@@ -21,33 +21,26 @@ module VX_bank #(
|
||||
parameter MSHR_SIZE = 1,
|
||||
// DRAM Response Queue Size
|
||||
parameter DRSQ_SIZE = 1,
|
||||
// Snoop Request Queue Size
|
||||
parameter SREQ_SIZE = 1,
|
||||
|
||||
// Core Response Queue Size
|
||||
parameter CRSQ_SIZE = 1,
|
||||
// DRAM Request Queue Size
|
||||
parameter DREQ_SIZE = 1,
|
||||
// Snoop Response Size
|
||||
parameter SRSQ_SIZE = 1,
|
||||
|
||||
// Enable cache writeable
|
||||
parameter WRITE_ENABLE = 0,
|
||||
|
||||
// Enable dram update
|
||||
parameter DRAM_ENABLE = 0,
|
||||
|
||||
// Enable cache flush
|
||||
parameter FLUSH_ENABLE = 0,
|
||||
parameter DRAM_ENABLE = 1,
|
||||
|
||||
// Enable cache writeable
|
||||
parameter WRITE_ENABLE = 1,
|
||||
|
||||
// Enable write-through
|
||||
parameter WRITE_THROUGH = 1,
|
||||
|
||||
// core request tag size
|
||||
parameter CORE_TAG_WIDTH = 1,
|
||||
|
||||
// size of tag id in core request tag
|
||||
parameter CORE_TAG_ID_BITS = 0,
|
||||
|
||||
// Snooping request tag width
|
||||
parameter SNP_TAG_WIDTH = 1
|
||||
parameter CORE_TAG_ID_BITS = 0
|
||||
) (
|
||||
`SCOPE_IO_VX_bank
|
||||
|
||||
@@ -85,18 +78,6 @@ module VX_bank #(
|
||||
input wire [`BANK_LINE_WIDTH-1:0] dram_rsp_data,
|
||||
output wire dram_rsp_ready,
|
||||
|
||||
// Snoop Request
|
||||
input wire snp_req_valid,
|
||||
input wire [`LINE_ADDR_WIDTH-1:0] snp_req_addr,
|
||||
input wire snp_req_inv,
|
||||
input wire [SNP_TAG_WIDTH-1:0] snp_req_tag,
|
||||
output wire snp_req_ready,
|
||||
|
||||
// Snoop Response
|
||||
output wire snp_rsp_valid,
|
||||
output wire [SNP_TAG_WIDTH-1:0] snp_rsp_tag,
|
||||
input wire snp_rsp_ready,
|
||||
|
||||
`ifdef PERF_ENABLE
|
||||
output wire perf_read_misses,
|
||||
output wire perf_write_misses,
|
||||
@@ -107,8 +88,6 @@ module VX_bank #(
|
||||
// Misses
|
||||
output wire misses
|
||||
);
|
||||
`STATIC_ASSERT (!FLUSH_ENABLE || DRAM_ENABLE, ("invalid parameter"))
|
||||
|
||||
`ifdef DBG_CACHE_REQ_INFO
|
||||
/* verilator lint_off UNUSED */
|
||||
wire [31:0] debug_pc_st0;
|
||||
@@ -133,48 +112,6 @@ module VX_bank #(
|
||||
/* verilator lint_on UNUSED */
|
||||
`endif
|
||||
|
||||
wire sreq_pop;
|
||||
wire sreq_empty;
|
||||
|
||||
wire [`LINE_ADDR_WIDTH-1:0] sreq_addr_st0;
|
||||
wire sreq_inv_st0;
|
||||
wire [SNP_TAG_WIDTH-1:0] sreq_tag_st0;
|
||||
|
||||
if (FLUSH_ENABLE) begin
|
||||
|
||||
wire sreq_full;
|
||||
assign snp_req_ready = !sreq_full;
|
||||
wire sreq_push = snp_req_valid && snp_req_ready;
|
||||
|
||||
VX_generic_queue #(
|
||||
.DATAW (`LINE_ADDR_WIDTH + 1 + SNP_TAG_WIDTH),
|
||||
.SIZE (SREQ_SIZE),
|
||||
.BUFFERED (1),
|
||||
.FASTRAM (1)
|
||||
) snp_req_queue (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.push (sreq_push),
|
||||
.pop (sreq_pop),
|
||||
.data_in ({snp_req_addr, snp_req_inv, snp_req_tag}),
|
||||
.data_out({sreq_addr_st0, sreq_inv_st0, sreq_tag_st0}),
|
||||
.empty (sreq_empty),
|
||||
.full (sreq_full),
|
||||
`UNUSED_PIN (size)
|
||||
);
|
||||
|
||||
end else begin
|
||||
`UNUSED_VAR (snp_req_valid)
|
||||
`UNUSED_VAR (snp_req_addr)
|
||||
`UNUSED_VAR (snp_req_inv)
|
||||
`UNUSED_VAR (snp_req_tag)
|
||||
assign sreq_empty = 1;
|
||||
assign sreq_addr_st0 = 0;
|
||||
assign sreq_inv_st0 = 0;
|
||||
assign sreq_tag_st0 = 0;
|
||||
assign snp_req_ready = 0;
|
||||
end
|
||||
|
||||
wire drsq_pop;
|
||||
wire drsq_empty;
|
||||
|
||||
@@ -258,19 +195,15 @@ module VX_bank #(
|
||||
wire [`REQ_TAG_WIDTH-1:0] mshr_tag_st0;
|
||||
wire mshr_rw_st0;
|
||||
wire [WORD_SIZE-1:0] mshr_byteen_st0;
|
||||
wire mshr_is_snp_st0;
|
||||
wire mshr_snp_inv_st0;
|
||||
wire mshr_pending_hazard_unqual_st0;
|
||||
|
||||
wire is_fill_st0;
|
||||
wire is_mshr_st0;
|
||||
wire is_snp_st0;
|
||||
wire valid_st0;
|
||||
wire [`LINE_ADDR_WIDTH-1:0] addr_st0;
|
||||
wire [`UP(`WORD_SELECT_WIDTH)-1:0] wsel_st0;
|
||||
wire [`WORD_WIDTH-1:0] writeword_st0;
|
||||
wire [`BANK_LINE_WIDTH-1:0] writedata_st0;
|
||||
wire snp_inv_st0;
|
||||
wire [`REQ_TAG_WIDTH-1:0] tag_st0;
|
||||
wire mem_rw_st0;
|
||||
wire [WORD_SIZE-1:0] byteen_st0;
|
||||
@@ -278,13 +211,11 @@ module VX_bank #(
|
||||
|
||||
wire is_fill_st1;
|
||||
wire is_mshr_st1;
|
||||
wire is_snp_st1;
|
||||
wire valid_st1;
|
||||
wire [`LINE_ADDR_WIDTH-1:0] addr_st1;
|
||||
wire [`UP(`WORD_SELECT_WIDTH)-1:0] wsel_st1;
|
||||
wire [`WORD_WIDTH-1:0] writeword_st1;
|
||||
wire [`BANK_LINE_WIDTH-1:0] writedata_st1;
|
||||
wire snp_inv_st1;
|
||||
wire [`TAG_SELECT_BITS-1:0] readtag_st1;
|
||||
wire miss_st1;
|
||||
wire force_miss_st1;
|
||||
@@ -305,8 +236,6 @@ module VX_bank #(
|
||||
wire [BANK_LINE_SIZE-1:0] dirtyb_st2;
|
||||
wire [`TAG_SELECT_BITS-1:0] readtag_st2;
|
||||
wire is_fill_st2;
|
||||
wire is_snp_st2;
|
||||
wire snp_inv_st2;
|
||||
wire is_mshr_st2;
|
||||
wire miss_st2;
|
||||
wire force_miss_st2;
|
||||
@@ -331,26 +260,25 @@ module VX_bank #(
|
||||
|
||||
wire mshr_push_stall;
|
||||
wire crsq_push_stall;
|
||||
wire dreq_push_stall;
|
||||
wire srsq_push_stall;
|
||||
wire dreq_push_stall;
|
||||
wire pipeline_stall;
|
||||
|
||||
wire is_mshr_miss_st2 = valid_st2 && is_mshr_st2 && (miss_st2 || force_miss_st2);
|
||||
wire is_mshr_miss_st3 = valid_st3 && is_mshr_st3 && (miss_st3 || force_miss_st3);
|
||||
|
||||
wire creq_commit = valid_st2 && core_req_hit_st2 && !pipeline_stall;
|
||||
wire creq_commit = valid_st2
|
||||
&& (core_req_hit_st2 || (WRITE_THROUGH && mem_rw_st2))
|
||||
&& !pipeline_stall;
|
||||
|
||||
// determine which queue to pop next in piority order
|
||||
wire mshr_pop_unqual = mshr_valid_st0;
|
||||
wire drsq_pop_unqual = !mshr_pop_unqual && !drsq_empty;
|
||||
wire creq_pop_unqual = !mshr_pop_unqual && !drsq_pop_unqual && !creq_empty && !mshr_going_full;
|
||||
wire sreq_pop_unqual = !mshr_pop_unqual && !drsq_pop_unqual && !creq_pop_unqual && !sreq_empty && !mshr_going_full;
|
||||
|
||||
assign mshr_pop = mshr_pop_unqual && !pipeline_stall
|
||||
&& !(is_mshr_miss_st2 || is_mshr_miss_st3); // stop if previous request was a miss
|
||||
assign drsq_pop = drsq_pop_unqual && !pipeline_stall;
|
||||
assign creq_pop = creq_pop_unqual && !pipeline_stall;
|
||||
assign sreq_pop = sreq_pop_unqual && !pipeline_stall;
|
||||
|
||||
// MSHR pending size
|
||||
assign mshr_pending_size_n = mshr_pending_size +
|
||||
@@ -368,12 +296,11 @@ module VX_bank #(
|
||||
assign is_mshr_st0 = mshr_pop_unqual;
|
||||
assign is_fill_st0 = drsq_pop_unqual;
|
||||
|
||||
assign valid_st0 = drsq_pop || mshr_pop || creq_pop || sreq_pop;
|
||||
assign valid_st0 = drsq_pop || mshr_pop || creq_pop;
|
||||
|
||||
assign addr_st0 = mshr_pop_unqual ? mshr_addr_st0 :
|
||||
drsq_pop_unqual ? drsq_addr_st0 :
|
||||
creq_pop_unqual ? creq_addr_st0[`LINE_SELECT_ADDR_RNG] :
|
||||
sreq_pop_unqual ? sreq_addr_st0 :
|
||||
0;
|
||||
|
||||
if (`WORD_SELECT_WIDTH != 0) begin
|
||||
@@ -389,32 +316,20 @@ module VX_bank #(
|
||||
|
||||
assign tag_st0 = mshr_pop_unqual ? `REQ_TAG_WIDTH'(mshr_tag_st0) :
|
||||
creq_pop_unqual ? `REQ_TAG_WIDTH'(creq_tag_st0) :
|
||||
sreq_pop_unqual ? `REQ_TAG_WIDTH'(sreq_tag_st0) :
|
||||
0;
|
||||
|
||||
assign mem_rw_st0 = mshr_pop_unqual ? mshr_rw_st0 :
|
||||
creq_pop_unqual ? creq_rw_st0 :
|
||||
sreq_pop_unqual ? 1'b0 :
|
||||
0;
|
||||
|
||||
assign byteen_st0 = mshr_pop_unqual ? mshr_byteen_st0 :
|
||||
creq_pop_unqual ? creq_byteen_st0 :
|
||||
sreq_pop_unqual ? WORD_SIZE'(0) :
|
||||
0;
|
||||
|
||||
assign req_tid_st0 = mshr_pop_unqual ? mshr_tid_st0 :
|
||||
creq_pop_unqual ? creq_tid_st0 :
|
||||
sreq_pop_unqual ? `REQS_BITS'(0) :
|
||||
0;
|
||||
|
||||
assign is_snp_st0 = mshr_pop_unqual ? mshr_is_snp_st0 :
|
||||
sreq_pop_unqual ? 1 :
|
||||
0;
|
||||
|
||||
assign snp_inv_st0 = mshr_pop_unqual ? mshr_snp_inv_st0 :
|
||||
sreq_pop_unqual ? sreq_inv_st0 :
|
||||
0;
|
||||
|
||||
assign writeword_st0 = mshr_pop_unqual ? mshr_writeword_st0 :
|
||||
creq_pop_unqual ? creq_writeword_st0 :
|
||||
0;
|
||||
@@ -436,15 +351,15 @@ if (DRAM_ENABLE) begin
|
||||
|| (valid_st3 && (miss_st3 || force_miss_st3) && (addr_st3 == addr_st0));
|
||||
|
||||
VX_generic_register #(
|
||||
.N(1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_WIDTH) + `WORD_WIDTH + 1 + `BANK_LINE_WIDTH + 1 + WORD_SIZE + `REQS_BITS + `REQ_TAG_WIDTH),
|
||||
.N(1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_WIDTH) + `WORD_WIDTH + 1 + `BANK_LINE_WIDTH + 1 + WORD_SIZE + `REQS_BITS + `REQ_TAG_WIDTH),
|
||||
.R(1)
|
||||
) pipe_reg0 (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.stall (pipeline_stall),
|
||||
.flush (1'b0),
|
||||
.data_in ({valid_st0, is_mshr_st0, is_snp_st0, snp_inv_st0, mshr_pending_hazard_st0, addr_st0, wsel_st0, writeword_st0, is_fill_st0, writedata_st0, mem_rw_st0, byteen_st0, req_tid_st0, tag_st0}),
|
||||
.data_out ({valid_st1, is_mshr_st1, is_snp_st1, snp_inv_st1, mshr_pending_hazard_st1, addr_st1, wsel_st1, writeword_st1, is_fill_st1, writedata_st1, mem_rw_st1, byteen_st1, req_tid_st1, tag_st1})
|
||||
.data_in ({valid_st0, is_mshr_st0, mshr_pending_hazard_st0, addr_st0, wsel_st0, writeword_st0, is_fill_st0, writedata_st0, mem_rw_st0, byteen_st0, req_tid_st0, tag_st0}),
|
||||
.data_out ({valid_st1, is_mshr_st1, mshr_pending_hazard_st1, addr_st1, wsel_st1, writeword_st1, is_fill_st1, writedata_st1, mem_rw_st1, byteen_st1, req_tid_st1, tag_st1})
|
||||
);
|
||||
|
||||
`ifdef DBG_CACHE_REQ_INFO
|
||||
@@ -471,8 +386,7 @@ if (DRAM_ENABLE) begin
|
||||
.BANK_LINE_SIZE (BANK_LINE_SIZE),
|
||||
.NUM_BANKS (NUM_BANKS),
|
||||
.WORD_SIZE (WORD_SIZE),
|
||||
.WRITE_ENABLE (WRITE_ENABLE),
|
||||
.FLUSH_ENABLE (FLUSH_ENABLE)
|
||||
.WRITE_ENABLE (WRITE_ENABLE)
|
||||
) tag_access (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
@@ -491,8 +405,6 @@ if (DRAM_ENABLE) begin
|
||||
.addr_in (addr_st1),
|
||||
.is_write_in (mem_rw_st1),
|
||||
.is_fill_in (is_fill_st1),
|
||||
.is_snp_in (is_snp_st1),
|
||||
.snp_inv_in (snp_inv_st1),
|
||||
.force_miss_in (force_miss_st1),
|
||||
|
||||
// Outputs
|
||||
@@ -504,20 +416,20 @@ if (DRAM_ENABLE) begin
|
||||
|
||||
assign misses = miss_st1;
|
||||
|
||||
wire core_req_hit_st1 = !is_fill_st1 && !is_snp_st1 && !miss_st1 && !force_miss_st1;
|
||||
wire core_req_hit_st1 = !is_fill_st1 && !miss_st1 && !force_miss_st1;
|
||||
|
||||
wire incoming_fill_st1 = !drsq_empty && (addr_st1 == drsq_addr_st0);
|
||||
|
||||
VX_generic_register #(
|
||||
.N(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_WIDTH) + `WORD_WIDTH + `TAG_SELECT_BITS + 1 + `BANK_LINE_WIDTH + 1 + WORD_SIZE + `REQS_BITS + `REQ_TAG_WIDTH),
|
||||
.N(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_WIDTH) + `WORD_WIDTH + `TAG_SELECT_BITS + 1 + `BANK_LINE_WIDTH + 1 + WORD_SIZE + `REQS_BITS + `REQ_TAG_WIDTH),
|
||||
.R(1)
|
||||
) pipe_reg1 (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.stall (pipeline_stall),
|
||||
.flush (1'b0),
|
||||
.data_in ({valid_st1, incoming_fill_st1, core_req_hit_st1, is_mshr_st1, writeen_st1, force_miss_st1, dirty_st1, is_snp_st1, snp_inv_st1, is_fill_st1, addr_st1, wsel_st1, writeword_st1, readtag_st1, miss_st1, writedata_st1, mem_rw_st1, byteen_st1, req_tid_st1, tag_st1}),
|
||||
.data_out ({valid_st2, incoming_fill_st2, core_req_hit_st2, is_mshr_st2, writeen_st2, force_miss_st2, dirty_st2, is_snp_st2, snp_inv_st2, is_fill_st2, addr_st2, wsel_st2, writeword_st2, readtag_st2, miss_st2, writedata_st2, mem_rw_st2, byteen_st2, req_tid_st2, tag_st2})
|
||||
.data_in ({valid_st1, incoming_fill_st1, core_req_hit_st1, is_mshr_st1, writeen_st1, force_miss_st1, dirty_st1, is_fill_st1, addr_st1, wsel_st1, writeword_st1, readtag_st1, miss_st1, writedata_st1, mem_rw_st1, byteen_st1, req_tid_st1, tag_st1}),
|
||||
.data_out ({valid_st2, incoming_fill_st2, core_req_hit_st2, is_mshr_st2, writeen_st2, force_miss_st2, dirty_st2, is_fill_st2, addr_st2, wsel_st2, writeword_st2, readtag_st2, miss_st2, writedata_st2, mem_rw_st2, byteen_st2, req_tid_st2, tag_st2})
|
||||
);
|
||||
|
||||
end else begin
|
||||
@@ -528,12 +440,10 @@ end else begin
|
||||
|
||||
assign is_fill_st1 = is_fill_st0;
|
||||
assign is_mshr_st1 = is_mshr_st0;
|
||||
assign is_snp_st1 = is_snp_st0;
|
||||
assign valid_st1 = valid_st0;
|
||||
assign wsel_st1 = wsel_st0;
|
||||
assign writeword_st1= writeword_st0;
|
||||
assign writedata_st1= writedata_st0;
|
||||
assign snp_inv_st1 = snp_inv_st0;
|
||||
assign addr_st1 = creq_addr_st0[`LINE_SELECT_ADDR_RNG];
|
||||
assign dirty_st1 = 0;
|
||||
assign readtag_st1 = 0;
|
||||
@@ -547,12 +457,10 @@ end else begin
|
||||
|
||||
assign is_fill_st2 = is_fill_st1;
|
||||
assign is_mshr_st2 = is_mshr_st1;
|
||||
assign is_snp_st2 = is_snp_st1;
|
||||
assign valid_st2 = valid_st1;
|
||||
assign wsel_st2 = wsel_st1;
|
||||
assign writeword_st2= writeword_st1;
|
||||
assign writedata_st2= writedata_st1;
|
||||
assign snp_inv_st2 = snp_inv_st1;
|
||||
assign addr_st2 = addr_st1;
|
||||
assign dirty_st2 = dirty_st1;
|
||||
assign readtag_st2 = readtag_st1;
|
||||
@@ -586,7 +494,8 @@ end
|
||||
.BANK_LINE_SIZE (BANK_LINE_SIZE),
|
||||
.NUM_BANKS (NUM_BANKS),
|
||||
.WORD_SIZE (WORD_SIZE),
|
||||
.WRITE_ENABLE (WRITE_ENABLE)
|
||||
.WRITE_ENABLE (WRITE_ENABLE),
|
||||
.WRITE_THROUGH (WRITE_THROUGH)
|
||||
) data_access (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
@@ -597,7 +506,6 @@ end
|
||||
.debug_wid (debug_wid_st2),
|
||||
.debug_tagid (debug_tagid_st2),
|
||||
`endif
|
||||
|
||||
.stall (pipeline_stall),
|
||||
|
||||
// Inputs
|
||||
@@ -621,45 +529,41 @@ end
|
||||
wire [`WORD_WIDTH-1:0] readword_st3;
|
||||
wire [`BANK_LINE_WIDTH-1:0] readdata_st3;
|
||||
wire [BANK_LINE_SIZE-1:0] dirtyb_st3;
|
||||
wire [`TAG_SELECT_BITS-1:0] readtag_st3;
|
||||
wire is_snp_st3;
|
||||
wire snp_inv_st3;
|
||||
wire [`TAG_SELECT_BITS-1:0] readtag_st3;
|
||||
wire do_writeback_st3;
|
||||
wire incoming_fill_st3;
|
||||
wire mshr_push_st3;
|
||||
wire crsq_push_st3;
|
||||
wire dreq_push_st3;
|
||||
wire srsq_push_st3;
|
||||
|
||||
wire incoming_fill_qual_st2 = (!drsq_empty && (addr_st2 == drsq_addr_st0)) || incoming_fill_st2;
|
||||
|
||||
wire do_fill_req_st2 = miss_st2
|
||||
&& !(WRITE_THROUGH && mem_rw_st2)
|
||||
&& (!force_miss_st2
|
||||
|| (is_mshr_st2 && addr_st2 != addr_st3))
|
||||
&& !incoming_fill_qual_st2;
|
||||
|
||||
wire do_writeback_st2 = dirty_st2
|
||||
&& (is_fill_st2
|
||||
|| (!force_miss_st2 && is_snp_st2));
|
||||
|
||||
wire mshr_push_st2 = miss_st2 || force_miss_st2;
|
||||
|
||||
wire crsq_push_st2 = core_req_hit_st2 && !mem_rw_st2;
|
||||
wire do_writeback_st2 = (WRITE_THROUGH && mem_rw_st2)
|
||||
|| (!WRITE_THROUGH && dirty_st2 && is_fill_st2);
|
||||
|
||||
wire dreq_push_st2 = do_fill_req_st2 || do_writeback_st2;
|
||||
|
||||
wire srsq_push_st2 = is_snp_st2 && !force_miss_st2;
|
||||
wire mshr_push_st2 = (miss_st2 || force_miss_st2)
|
||||
&& !(WRITE_THROUGH && mem_rw_st2);
|
||||
|
||||
wire crsq_push_st2 = core_req_hit_st2 && !mem_rw_st2;
|
||||
|
||||
VX_generic_register #(
|
||||
.N(1 + 1+ 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_WIDTH) + `WORD_WIDTH + `TAG_SELECT_BITS + 1 + 1 + BANK_LINE_SIZE + 1 + WORD_SIZE + `WORD_WIDTH + `BANK_LINE_WIDTH + `REQS_BITS + `REQ_TAG_WIDTH),
|
||||
.N(1 + 1+ 1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_WIDTH) + `WORD_WIDTH + `TAG_SELECT_BITS + BANK_LINE_SIZE + 1 + WORD_SIZE + `WORD_WIDTH + `BANK_LINE_WIDTH + `REQS_BITS + `REQ_TAG_WIDTH),
|
||||
.R(1)
|
||||
) pipe_reg2 (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.stall (pipeline_stall),
|
||||
.flush (1'b0),
|
||||
.data_in ({valid_st2, mshr_push_st2, crsq_push_st2, dreq_push_st2, srsq_push_st2, do_writeback_st2, incoming_fill_qual_st2, force_miss_st2, is_mshr_st2, is_snp_st2, snp_inv_st2, addr_st2, wsel_st2, writeword_st2, readtag_st2, miss_st2, dirtyb_st2, mem_rw_st2, byteen_st2, readword_st2, readdata_st2, req_tid_st2, tag_st2}),
|
||||
.data_out ({valid_st3, mshr_push_st3, crsq_push_st3, dreq_push_st3, srsq_push_st3, do_writeback_st3, incoming_fill_st3, force_miss_st3, is_mshr_st3, is_snp_st3, snp_inv_st3, addr_st3, wsel_st3, writeword_st3, readtag_st3, miss_st3, dirtyb_st3, mem_rw_st3, byteen_st3, readword_st3, readdata_st3, req_tid_st3, tag_st3})
|
||||
.data_in ({valid_st2, mshr_push_st2, crsq_push_st2, dreq_push_st2, do_writeback_st2, incoming_fill_qual_st2, force_miss_st2, is_mshr_st2, addr_st2, wsel_st2, writeword_st2, readtag_st2, miss_st2, dirtyb_st2, mem_rw_st2, byteen_st2, readword_st2, readdata_st2, req_tid_st2, tag_st2}),
|
||||
.data_out ({valid_st3, mshr_push_st3, crsq_push_st3, dreq_push_st3, do_writeback_st3, incoming_fill_st3, force_miss_st3, is_mshr_st3, addr_st3, wsel_st3, writeword_st3, readtag_st3, miss_st3, dirtyb_st3, mem_rw_st3, byteen_st3, readword_st3, readdata_st3, req_tid_st3, tag_st3})
|
||||
);
|
||||
|
||||
`ifdef DBG_CACHE_REQ_INFO
|
||||
@@ -677,8 +581,7 @@ end
|
||||
|
||||
wire mshr_push = mshr_push_unqual
|
||||
&& !crsq_push_stall
|
||||
&& !dreq_push_stall
|
||||
&& !srsq_push_stall;
|
||||
&& !dreq_push_stall;
|
||||
|
||||
wire mshr_full;
|
||||
always @(posedge clk) begin
|
||||
@@ -707,8 +610,7 @@ end
|
||||
.WORD_SIZE (WORD_SIZE),
|
||||
.NUM_REQS (NUM_REQS),
|
||||
.MSHR_SIZE (MSHR_SIZE),
|
||||
.CORE_TAG_WIDTH (CORE_TAG_WIDTH),
|
||||
.SNP_TAG_WIDTH (SNP_TAG_WIDTH)
|
||||
.CORE_TAG_WIDTH (CORE_TAG_WIDTH)
|
||||
) miss_resrv (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
@@ -727,7 +629,7 @@ end
|
||||
// enqueue
|
||||
.enqueue_st3 (mshr_push),
|
||||
.enqueue_addr_st3 (addr_st3),
|
||||
.enqueue_data_st3 ({writeword_st3, req_tid_st3, tag_st3, mem_rw_st3, byteen_st3, wsel_st3, is_snp_st3, snp_inv_st3}),
|
||||
.enqueue_data_st3 ({writeword_st3, req_tid_st3, tag_st3, mem_rw_st3, byteen_st3, wsel_st3}),
|
||||
.enqueue_is_mshr_st3(is_mshr_st3),
|
||||
.enqueue_ready_st3 (mshr_init_ready_state_st3),
|
||||
.enqueue_full (mshr_full),
|
||||
@@ -741,7 +643,7 @@ end
|
||||
.schedule_st0 (mshr_pop),
|
||||
.dequeue_valid_st0 (mshr_valid_st0),
|
||||
.dequeue_addr_st0 (mshr_addr_st0),
|
||||
.dequeue_data_st0 ({mshr_writeword_st0, mshr_tid_st0, mshr_tag_st0, mshr_rw_st0, mshr_byteen_st0, mshr_wsel_st0, mshr_is_snp_st0, mshr_snp_inv_st0}),
|
||||
.dequeue_data_st0 ({mshr_writeword_st0, mshr_tid_st0, mshr_tag_st0, mshr_rw_st0, mshr_byteen_st0, mshr_wsel_st0}),
|
||||
.dequeue_st3 (mshr_dequeue_st3)
|
||||
);
|
||||
end else begin
|
||||
@@ -749,10 +651,8 @@ end
|
||||
`UNUSED_VAR (mshr_push)
|
||||
`UNUSED_VAR (wsel_st3)
|
||||
`UNUSED_VAR (writeword_st3)
|
||||
`UNUSED_VAR (snp_inv_st3)
|
||||
`UNUSED_VAR (mem_rw_st3)
|
||||
`UNUSED_VAR (byteen_st3)
|
||||
`UNUSED_VAR (is_snp_st3)
|
||||
`UNUSED_VAR (incoming_fill_st3)
|
||||
assign mshr_pending_hazard_unqual_st0 = 0;
|
||||
assign mshr_full = 0;
|
||||
@@ -764,8 +664,6 @@ end
|
||||
assign mshr_tag_st0 = 0;
|
||||
assign mshr_rw_st0 = 0;
|
||||
assign mshr_byteen_st0 = 0;
|
||||
assign mshr_is_snp_st0 = 0;
|
||||
assign mshr_snp_inv_st0 = 0;
|
||||
end
|
||||
|
||||
// Enqueue core response
|
||||
@@ -778,8 +676,7 @@ end
|
||||
wire crsq_push = crsq_push_unqual
|
||||
&& !crsq_full
|
||||
&& !mshr_push_stall
|
||||
&& !dreq_push_stall
|
||||
&& !srsq_push_stall;
|
||||
&& !dreq_push_stall;
|
||||
|
||||
wire crsq_pop = core_rsp_valid && core_rsp_ready;
|
||||
|
||||
@@ -817,15 +714,14 @@ end
|
||||
&& (do_writeback_st3 || !incoming_fill_qual_st3)
|
||||
&& !dreq_full
|
||||
&& !mshr_push_stall
|
||||
&& !crsq_push_stall
|
||||
&& !srsq_push_stall;
|
||||
&& !crsq_push_stall;
|
||||
|
||||
wire dreq_pop = dram_req_valid && dram_req_ready;
|
||||
|
||||
wire writeback = WRITE_ENABLE && do_writeback_st3;
|
||||
|
||||
wire [`LINE_ADDR_WIDTH-1:0] dreq_addr = writeback ? {readtag_st3, addr_st3[`LINE_SELECT_BITS-1:0]} :
|
||||
addr_st3;
|
||||
wire [`LINE_ADDR_WIDTH-1:0] dreq_addr = (WRITE_THROUGH || !writeback) ? addr_st3 :
|
||||
{readtag_st3, addr_st3[`LINE_SELECT_BITS-1:0]};
|
||||
|
||||
wire [BANK_LINE_SIZE-1:0] dreq_byteen = writeback ? dirtyb_st3 : {BANK_LINE_SIZE{1'b1}};
|
||||
|
||||
@@ -864,67 +760,18 @@ end
|
||||
assign dram_req_data = 0;
|
||||
end
|
||||
|
||||
assign dram_req_valid = !dreq_empty;
|
||||
|
||||
// Enqueue snoop response
|
||||
|
||||
wire srsq_empty, srsq_full;
|
||||
|
||||
wire srsq_push_unqual = valid_st3 && srsq_push_st3;
|
||||
assign srsq_push_stall = srsq_push_unqual && srsq_full;
|
||||
|
||||
wire srsq_push = srsq_push_unqual
|
||||
&& !srsq_full
|
||||
&& !mshr_push_stall
|
||||
&& !crsq_push_stall
|
||||
&& !dreq_push_stall;
|
||||
|
||||
wire srsq_pop = snp_rsp_valid && snp_rsp_ready;
|
||||
|
||||
wire [SNP_TAG_WIDTH-1:0] srsq_tag_st3 = SNP_TAG_WIDTH'(tag_st3);
|
||||
|
||||
if (FLUSH_ENABLE) begin
|
||||
VX_generic_queue #(
|
||||
.DATAW (SNP_TAG_WIDTH),
|
||||
.SIZE (SRSQ_SIZE),
|
||||
.BUFFERED (1),
|
||||
.FASTRAM (1)
|
||||
) snp_rsp_queue (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.push (srsq_push),
|
||||
.pop (srsq_pop),
|
||||
.data_in (srsq_tag_st3),
|
||||
.data_out(snp_rsp_tag),
|
||||
.empty (srsq_empty),
|
||||
.full (srsq_full),
|
||||
`UNUSED_PIN (size)
|
||||
);
|
||||
end else begin
|
||||
`UNUSED_VAR (srsq_push)
|
||||
`UNUSED_VAR (srsq_pop)
|
||||
`UNUSED_VAR (srsq_tag_st3)
|
||||
`UNUSED_VAR (snp_rsp_ready)
|
||||
assign srsq_empty = 1;
|
||||
assign srsq_full = 0;
|
||||
assign snp_rsp_tag = 0;
|
||||
end
|
||||
|
||||
assign snp_rsp_valid = !srsq_empty
|
||||
&& dreq_empty; // ensure all writebacks are sent
|
||||
assign dram_req_valid = !dreq_empty;
|
||||
|
||||
// bank pipeline stall
|
||||
assign pipeline_stall = mshr_push_stall
|
||||
|| crsq_push_stall
|
||||
|| dreq_push_stall
|
||||
|| srsq_push_stall;
|
||||
|| dreq_push_stall;
|
||||
|
||||
`SCOPE_ASSIGN (valid_st0, valid_st0);
|
||||
`SCOPE_ASSIGN (valid_st1, valid_st1);
|
||||
`SCOPE_ASSIGN (valid_st2, valid_st2);
|
||||
`SCOPE_ASSIGN (valid_st3, valid_st3);
|
||||
`SCOPE_ASSIGN (is_fill_st0, is_fill_st0);
|
||||
`SCOPE_ASSIGN (is_snp_st0, is_snp_st0);
|
||||
`SCOPE_ASSIGN (is_mshr_st0, is_mshr_st0);
|
||||
`SCOPE_ASSIGN (miss_st1, miss_st1);
|
||||
`SCOPE_ASSIGN (dirty_st1, dirty_st1);
|
||||
@@ -951,7 +798,7 @@ end
|
||||
assert(!is_mshr_st3);
|
||||
end
|
||||
if (pipeline_stall) begin
|
||||
$display("%t: cache%0d:%0d pipeline-stall: msrq=%b, cwbq=%b, dwbq=%b, snpq=%b", $time, CACHE_ID, BANK_ID, mshr_push_stall, crsq_push_stall, dreq_push_stall, srsq_push_stall);
|
||||
$display("%t: cache%0d:%0d pipeline-stall: msrq=%b, cwbq=%b, dwbq=%b", $time, CACHE_ID, BANK_ID, mshr_push_stall, crsq_push_stall, dreq_push_stall);
|
||||
end
|
||||
if (drsq_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), drsq_filldata_st0);
|
||||
@@ -962,9 +809,6 @@ end
|
||||
else
|
||||
$display("%t: cache%0d:%0d core-rd-req: addr=%0h, tag=%0h, tid=%0d, byteen=%b, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), creq_tag_st0, creq_tid_st0, creq_byteen_st0, debug_wid_st0, debug_pc_st0);
|
||||
end
|
||||
if (sreq_pop) begin
|
||||
$display("%t: cache%0d:%0d snp-req: addr=%0h, tag=%0h, invalidate=%0d", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), sreq_tag_st0, sreq_inv_st0);
|
||||
end
|
||||
if (crsq_push) begin
|
||||
$display("%t: cache%0d:%0d core-rsp: addr=%0h, tag=%0h, tid=%0d, data=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st3, BANK_ID), crsq_tag_st3, crsq_tid_st3, crsq_data_st3, debug_wid_st3, debug_pc_st3);
|
||||
end
|
||||
@@ -974,9 +818,6 @@ end
|
||||
else
|
||||
$display("%t: cache%0d:%0d fill-req: addr=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(dreq_addr, BANK_ID), debug_wid_st3, debug_pc_st3);
|
||||
end
|
||||
if (srsq_push) begin
|
||||
$display("%t: cache%0d:%0d snp-rsp: addr=%0h, tag=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st3, BANK_ID), srsq_tag_st3);
|
||||
end
|
||||
end
|
||||
`endif
|
||||
|
||||
|
||||
119
hw/rtl/cache/VX_cache.v
vendored
119
hw/rtl/cache/VX_cache.v
vendored
@@ -19,25 +19,21 @@ module VX_cache #(
|
||||
// Miss Reserv Queue Knob
|
||||
parameter MSHR_SIZE = 8,
|
||||
// DRAM Response Queue Size
|
||||
parameter DRSQ_SIZE = 4,
|
||||
// Snoop Request Queue Size
|
||||
parameter SREQ_SIZE = 4,
|
||||
parameter DRSQ_SIZE = 4,
|
||||
|
||||
// Core Response Queue Size
|
||||
parameter CRSQ_SIZE = 4,
|
||||
// DRAM Request Queue Size
|
||||
parameter DREQ_SIZE = 4,
|
||||
// Snoop Response Size
|
||||
parameter SRSQ_SIZE = 4,
|
||||
|
||||
// Enable cache writeable
|
||||
parameter WRITE_ENABLE = 1,
|
||||
|
||||
// Enable dram update
|
||||
parameter DRAM_ENABLE = 1,
|
||||
|
||||
// Enable cache flush
|
||||
parameter FLUSH_ENABLE = 1,
|
||||
// Enable cache writeable
|
||||
parameter WRITE_ENABLE = 1,
|
||||
|
||||
// Enable write-through
|
||||
parameter WRITE_THROUGH = 1,
|
||||
|
||||
// core request tag size
|
||||
parameter CORE_TAG_WIDTH = $clog2(MSHR_SIZE),
|
||||
@@ -46,10 +42,7 @@ module VX_cache #(
|
||||
parameter CORE_TAG_ID_BITS = 0,
|
||||
|
||||
// dram request tag size
|
||||
parameter DRAM_TAG_WIDTH = (32 - $clog2(BANK_LINE_SIZE)),
|
||||
|
||||
// Snooping request tag width
|
||||
parameter SNP_TAG_WIDTH = 1
|
||||
parameter DRAM_TAG_WIDTH = (32 - $clog2(BANK_LINE_SIZE))
|
||||
) (
|
||||
`SCOPE_IO_VX_cache
|
||||
|
||||
@@ -89,19 +82,7 @@ module VX_cache #(
|
||||
input wire dram_rsp_valid,
|
||||
input wire [`BANK_LINE_WIDTH-1:0] dram_rsp_data,
|
||||
input wire [DRAM_TAG_WIDTH-1:0] dram_rsp_tag,
|
||||
output wire dram_rsp_ready,
|
||||
|
||||
// Snoop request
|
||||
input wire snp_req_valid,
|
||||
input wire [`DRAM_ADDR_WIDTH-1:0] snp_req_addr,
|
||||
input wire snp_req_inv,
|
||||
input wire [SNP_TAG_WIDTH-1:0] snp_req_tag,
|
||||
output wire snp_req_ready,
|
||||
|
||||
// Snoop response
|
||||
output wire snp_rsp_valid,
|
||||
output wire [SNP_TAG_WIDTH-1:0] snp_rsp_tag,
|
||||
input wire snp_rsp_ready,
|
||||
output wire dram_rsp_ready,
|
||||
|
||||
output wire [NUM_BANKS-1:0] miss_vec
|
||||
);
|
||||
@@ -127,12 +108,6 @@ module VX_cache #(
|
||||
|
||||
wire [NUM_BANKS-1:0] per_bank_dram_rsp_ready;
|
||||
|
||||
wire [NUM_BANKS-1:0] per_bank_snp_req_ready;
|
||||
|
||||
wire [NUM_BANKS-1:0] per_bank_snp_rsp_valid;
|
||||
wire [NUM_BANKS-1:0][SNP_TAG_WIDTH-1:0] per_bank_snp_rsp_tag;
|
||||
wire [NUM_BANKS-1:0] per_bank_snp_rsp_ready;
|
||||
|
||||
wire [NUM_BANKS-1:0] per_bank_miss;
|
||||
assign miss_vec = per_bank_miss;
|
||||
|
||||
@@ -141,13 +116,7 @@ module VX_cache #(
|
||||
wire [NUM_BANKS-1:0] perf_write_miss_per_bank;
|
||||
wire [NUM_BANKS-1:0] perf_mshr_stall_per_bank;
|
||||
wire [NUM_BANKS-1:0] perf_pipe_stall_per_bank;
|
||||
`endif
|
||||
|
||||
if (NUM_BANKS == 1) begin
|
||||
assign snp_req_ready = per_bank_snp_req_ready;
|
||||
end else begin
|
||||
assign snp_req_ready = per_bank_snp_req_ready[`DRAM_ADDR_BANK(snp_req_addr)];
|
||||
end
|
||||
`endif
|
||||
|
||||
VX_cache_core_req_bank_sel #(
|
||||
.BANK_LINE_SIZE (BANK_LINE_SIZE),
|
||||
@@ -205,16 +174,6 @@ module VX_cache #(
|
||||
wire [`LINE_ADDR_WIDTH-1:0] curr_bank_dram_rsp_addr;
|
||||
wire curr_bank_dram_rsp_ready;
|
||||
|
||||
wire curr_bank_snp_req_valid;
|
||||
wire [`LINE_ADDR_WIDTH-1:0] curr_bank_snp_req_addr;
|
||||
wire curr_bank_snp_req_inv;
|
||||
wire [SNP_TAG_WIDTH-1:0] curr_bank_snp_req_tag;
|
||||
wire curr_bank_snp_req_ready;
|
||||
|
||||
wire curr_bank_snp_rsp_valid;
|
||||
wire [SNP_TAG_WIDTH-1:0] curr_bank_snp_rsp_tag;
|
||||
wire curr_bank_snp_rsp_ready;
|
||||
|
||||
wire curr_bank_miss;
|
||||
|
||||
// Core Req
|
||||
@@ -257,23 +216,6 @@ module VX_cache #(
|
||||
assign curr_bank_dram_rsp_data = dram_rsp_data;
|
||||
assign per_bank_dram_rsp_ready[i] = curr_bank_dram_rsp_ready;
|
||||
|
||||
// Snoop request
|
||||
if (NUM_BANKS == 1) begin
|
||||
assign curr_bank_snp_req_valid = snp_req_valid;
|
||||
assign curr_bank_snp_req_addr = snp_req_addr;
|
||||
end else begin
|
||||
assign curr_bank_snp_req_valid = snp_req_valid && (`DRAM_ADDR_BANK(snp_req_addr) == i);
|
||||
assign curr_bank_snp_req_addr = `DRAM_TO_LINE_ADDR(snp_req_addr);
|
||||
end
|
||||
assign curr_bank_snp_req_inv = snp_req_inv;
|
||||
assign curr_bank_snp_req_tag = snp_req_tag;
|
||||
assign per_bank_snp_req_ready[i] = curr_bank_snp_req_ready;
|
||||
|
||||
// Snoop response
|
||||
assign per_bank_snp_rsp_valid[i] = curr_bank_snp_rsp_valid;
|
||||
assign per_bank_snp_rsp_tag[i] = curr_bank_snp_rsp_tag;
|
||||
assign curr_bank_snp_rsp_ready = per_bank_snp_rsp_ready[i];
|
||||
|
||||
//Misses
|
||||
assign per_bank_miss[i] = curr_bank_miss;
|
||||
|
||||
@@ -288,16 +230,13 @@ module VX_cache #(
|
||||
.CREQ_SIZE (CREQ_SIZE),
|
||||
.MSHR_SIZE (MSHR_SIZE),
|
||||
.DRSQ_SIZE (DRSQ_SIZE),
|
||||
.SREQ_SIZE (SREQ_SIZE),
|
||||
.CRSQ_SIZE (CRSQ_SIZE),
|
||||
.DREQ_SIZE (DREQ_SIZE),
|
||||
.SRSQ_SIZE (SRSQ_SIZE),
|
||||
.DRAM_ENABLE (DRAM_ENABLE),
|
||||
.FLUSH_ENABLE (FLUSH_ENABLE),
|
||||
.WRITE_ENABLE (WRITE_ENABLE),
|
||||
.WRITE_THROUGH (WRITE_THROUGH),
|
||||
.CORE_TAG_WIDTH (CORE_TAG_WIDTH),
|
||||
.CORE_TAG_ID_BITS (CORE_TAG_ID_BITS),
|
||||
.SNP_TAG_WIDTH (SNP_TAG_WIDTH)
|
||||
.CORE_TAG_ID_BITS (CORE_TAG_ID_BITS)
|
||||
) bank (
|
||||
`SCOPE_BIND_VX_cache_bank(i)
|
||||
|
||||
@@ -342,18 +281,6 @@ module VX_cache #(
|
||||
.perf_pipe_stalls (perf_pipe_stall_per_bank[i]),
|
||||
`endif
|
||||
|
||||
// Snoop request
|
||||
.snp_req_valid (curr_bank_snp_req_valid),
|
||||
.snp_req_addr (curr_bank_snp_req_addr),
|
||||
.snp_req_inv (curr_bank_snp_req_inv),
|
||||
.snp_req_tag (curr_bank_snp_req_tag),
|
||||
.snp_req_ready (curr_bank_snp_req_ready),
|
||||
|
||||
// Snoop response
|
||||
.snp_rsp_valid (curr_bank_snp_rsp_valid),
|
||||
.snp_rsp_tag (curr_bank_snp_rsp_tag),
|
||||
.snp_rsp_ready (curr_bank_snp_rsp_ready),
|
||||
|
||||
//Misses
|
||||
.misses (curr_bank_miss)
|
||||
);
|
||||
@@ -414,30 +341,6 @@ module VX_cache #(
|
||||
`UNUSED_VAR (dram_req_ready)
|
||||
end
|
||||
|
||||
if (FLUSH_ENABLE) begin
|
||||
VX_stream_arbiter #(
|
||||
.NUM_REQS (NUM_BANKS),
|
||||
.DATAW (SNP_TAG_WIDTH),
|
||||
.BUFFERED (1)
|
||||
) snp_rsp_arb (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.valid_in (per_bank_snp_rsp_valid),
|
||||
.data_in (per_bank_snp_rsp_tag),
|
||||
.ready_in (per_bank_snp_rsp_ready),
|
||||
.valid_out (snp_rsp_valid),
|
||||
.data_out (snp_rsp_tag),
|
||||
.ready_out (snp_rsp_ready)
|
||||
);
|
||||
end else begin
|
||||
`UNUSED_VAR (per_bank_snp_rsp_valid)
|
||||
`UNUSED_VAR (per_bank_snp_rsp_tag)
|
||||
assign per_bank_snp_rsp_ready = 0;
|
||||
assign snp_rsp_valid = 0;
|
||||
assign snp_rsp_tag = 0;
|
||||
`UNUSED_VAR (snp_rsp_ready)
|
||||
end
|
||||
|
||||
`ifdef PERF_ENABLE
|
||||
// per cycle: core_reads, core_writes
|
||||
reg [($clog2(NUM_REQS+1)-1):0] perf_core_reads_per_cycle, perf_core_writes_per_cycle;
|
||||
|
||||
6
hw/rtl/cache/VX_cache_config.vh
vendored
6
hw/rtl/cache/VX_cache_config.vh
vendored
@@ -7,15 +7,15 @@
|
||||
`include "VX_define.vh"
|
||||
`endif
|
||||
|
||||
`define REQ_TAG_WIDTH `MAX(CORE_TAG_WIDTH, SNP_TAG_WIDTH)
|
||||
`define REQ_TAG_WIDTH CORE_TAG_WIDTH
|
||||
|
||||
`define REQS_BITS `LOG2UP(NUM_REQS)
|
||||
|
||||
// tag rw byteen tid
|
||||
`define REQ_INST_META_WIDTH (`REQ_TAG_WIDTH + 1 + WORD_SIZE + `REQS_BITS)
|
||||
|
||||
// data metadata word_sel is_snp snp_inv
|
||||
`define MSHR_DATA_WIDTH (`WORD_WIDTH + `REQ_INST_META_WIDTH + `UP(`WORD_SELECT_WIDTH) + 1 + 1)
|
||||
// data metadata word_sel
|
||||
`define MSHR_DATA_WIDTH (`WORD_WIDTH + `REQ_INST_META_WIDTH + `UP(`WORD_SELECT_WIDTH))
|
||||
|
||||
`define BANK_BITS `LOG2UP(NUM_BANKS)
|
||||
|
||||
|
||||
41
hw/rtl/cache/VX_data_access.v
vendored
41
hw/rtl/cache/VX_data_access.v
vendored
@@ -14,7 +14,10 @@ module VX_data_access #(
|
||||
parameter WORD_SIZE = 1,
|
||||
|
||||
// Enable cache writeable
|
||||
parameter WRITE_ENABLE = 0,
|
||||
parameter WRITE_ENABLE = 1,
|
||||
|
||||
// Enable write-through
|
||||
parameter WRITE_THROUGH = 1,
|
||||
|
||||
// size of tag id in core request tag
|
||||
parameter CORE_TAG_ID_BITS = 0
|
||||
@@ -54,9 +57,9 @@ module VX_data_access #(
|
||||
wire [BANK_LINE_SIZE-1:0] read_dirtyb_out;
|
||||
wire [`BANK_LINE_WIDTH-1:0] read_data;
|
||||
|
||||
wire [`BANK_LINE_WORDS-1:0][WORD_SIZE-1:0] byte_enable;
|
||||
wire [`BANK_LINE_WORDS-1:0][WORD_SIZE-1:0] byte_enable;
|
||||
wire [`BANK_LINE_WIDTH-1:0] write_data;
|
||||
wire write_enable;
|
||||
wire [`BANK_LINE_WIDTH-1:0] write_data;
|
||||
|
||||
wire [`LINE_SELECT_BITS-1:0] addrline = addr_in[`LINE_SELECT_BITS-1:0];
|
||||
|
||||
@@ -92,18 +95,32 @@ module VX_data_access #(
|
||||
end
|
||||
end
|
||||
|
||||
for (genvar i = 0; i < `BANK_LINE_WORDS; i++) begin
|
||||
wire word_sel = (`WORD_SELECT_WIDTH == 0) || (wordsel_in == `UP(`WORD_SELECT_WIDTH)'(i));
|
||||
|
||||
assign byte_enable[i] = is_fill_in ? {WORD_SIZE{1'b1}} :
|
||||
word_sel ? byteen_in : {WORD_SIZE{1'b0}};
|
||||
wire [`BANK_LINE_WORDS-1:0][WORD_SIZE-1:0] byte_enable_w;
|
||||
wire [`BANK_LINE_WIDTH-1:0] write_data_w;
|
||||
|
||||
assign write_data[i * `WORD_WIDTH +: `WORD_WIDTH] = is_fill_in ? writedata_in[i * `WORD_WIDTH +: `WORD_WIDTH] : writeword_in;
|
||||
end
|
||||
if (`WORD_SELECT_WIDTH != 0) begin
|
||||
for (genvar i = 0; i < `BANK_LINE_WORDS; i++) begin
|
||||
assign byte_enable_w[i] = (wordsel_in == `WORD_SELECT_WIDTH'(i)) ? byteen_in : {WORD_SIZE{1'b0}};
|
||||
assign write_data_w[i * `WORD_WIDTH +: `WORD_WIDTH] = writeword_in;
|
||||
end
|
||||
end else begin
|
||||
assign byte_enable_w = byteen_in;
|
||||
assign write_data_w = writeword_in;
|
||||
end
|
||||
|
||||
assign byte_enable = is_fill_in ? {BANK_LINE_SIZE{1'b1}} : byte_enable_w;
|
||||
assign write_data = is_fill_in ? writedata_in : write_data_w;
|
||||
|
||||
assign write_enable = valid_in && writeen_in && !stall;
|
||||
assign dirtyb_out = read_dirtyb_out;
|
||||
assign readdata_out = read_data;
|
||||
|
||||
if (WRITE_THROUGH) begin
|
||||
`UNUSED_VAR (read_dirtyb_out)
|
||||
assign dirtyb_out = byte_enable_w;
|
||||
assign readdata_out = write_data_w;
|
||||
end else begin
|
||||
assign dirtyb_out = read_dirtyb_out;
|
||||
assign readdata_out = read_data;
|
||||
end
|
||||
|
||||
`ifdef DBG_PRINT_CACHE_DATA
|
||||
always @(posedge clk) begin
|
||||
|
||||
2
hw/rtl/cache/VX_miss_resrv.v
vendored
2
hw/rtl/cache/VX_miss_resrv.v
vendored
@@ -16,8 +16,6 @@ module VX_miss_resrv #(
|
||||
parameter MSHR_SIZE = 1,
|
||||
// core request tag size
|
||||
parameter CORE_TAG_WIDTH = 1,
|
||||
// Snooping request tag width
|
||||
parameter SNP_TAG_WIDTH = 1,
|
||||
// size of tag id in core request tag
|
||||
parameter CORE_TAG_ID_BITS = 0
|
||||
) (
|
||||
|
||||
249
hw/rtl/cache/VX_snp_forwarder.v
vendored
249
hw/rtl/cache/VX_snp_forwarder.v
vendored
@@ -1,249 +0,0 @@
|
||||
`include "VX_cache_config.vh"
|
||||
|
||||
module VX_snp_forwarder #(
|
||||
parameter CACHE_ID = 0,
|
||||
parameter SRC_ADDR_WIDTH = 1,
|
||||
parameter DST_ADDR_WIDTH = 1,
|
||||
parameter NUM_REQS = 1,
|
||||
parameter SREQ_SIZE = 1,
|
||||
parameter TAG_IN_WIDTH = 1,
|
||||
parameter TAG_OUT_WIDTH = `LOG2UP(SREQ_SIZE),
|
||||
parameter BUFFERED = 0
|
||||
) (
|
||||
input wire clk,
|
||||
input wire reset,
|
||||
|
||||
// Snoop request
|
||||
input wire snp_req_valid,
|
||||
input wire [SRC_ADDR_WIDTH-1:0] snp_req_addr,
|
||||
input wire snp_req_inv,
|
||||
input wire [TAG_IN_WIDTH-1:0] snp_req_tag,
|
||||
output wire snp_req_ready,
|
||||
|
||||
// Snoop response
|
||||
output wire snp_rsp_valid,
|
||||
output wire [SRC_ADDR_WIDTH-1:0] snp_rsp_addr,
|
||||
output wire snp_rsp_inv,
|
||||
output wire [TAG_IN_WIDTH-1:0] snp_rsp_tag,
|
||||
input wire snp_rsp_ready,
|
||||
|
||||
// Snoop Forwarding out
|
||||
output wire [NUM_REQS-1:0] snp_fwdout_valid,
|
||||
output wire [NUM_REQS-1:0][DST_ADDR_WIDTH-1:0] snp_fwdout_addr,
|
||||
output wire [NUM_REQS-1:0] snp_fwdout_inv,
|
||||
output wire [NUM_REQS-1:0][TAG_OUT_WIDTH-1:0] snp_fwdout_tag,
|
||||
input wire [NUM_REQS-1:0] snp_fwdout_ready,
|
||||
|
||||
// Snoop forwarding in
|
||||
input wire [NUM_REQS-1:0] snp_fwdin_valid,
|
||||
input wire [NUM_REQS-1:0][TAG_OUT_WIDTH-1:0] snp_fwdin_tag,
|
||||
output wire [NUM_REQS-1:0] snp_fwdin_ready
|
||||
);
|
||||
localparam ADDR_DIFF = DST_ADDR_WIDTH - SRC_ADDR_WIDTH;
|
||||
localparam NUM_REQUESTS_QUAL = NUM_REQS * (1 << ADDR_DIFF);
|
||||
localparam REQ_QUAL_BITS = `LOG2UP(NUM_REQUESTS_QUAL);
|
||||
|
||||
if (NUM_REQS > 1) begin
|
||||
|
||||
reg [REQ_QUAL_BITS:0] pending_cntrs [SREQ_SIZE-1:0];
|
||||
|
||||
wire [TAG_IN_WIDTH-1:0] snp_rsp_tag_unqual;
|
||||
wire [SRC_ADDR_WIDTH-1:0] snp_rsp_addr_unqual;
|
||||
wire snp_rsp_inv_unqual;
|
||||
wire snp_rsp_ready_unqual;
|
||||
|
||||
wire [TAG_OUT_WIDTH-1:0] sfq_write_addr, sfq_read_addr;
|
||||
wire sfq_full;
|
||||
|
||||
wire [TAG_OUT_WIDTH-1:0] fwdin_tag;
|
||||
wire fwdin_valid;
|
||||
|
||||
wire fwdin_ready = snp_rsp_ready_unqual || (1 != pending_cntrs[sfq_read_addr]);
|
||||
wire fwdin_fire = fwdin_valid && fwdin_ready;
|
||||
|
||||
wire snp_rsp_valid_unqual = fwdin_valid && (1 == pending_cntrs[sfq_read_addr]);
|
||||
|
||||
assign sfq_read_addr = fwdin_tag;
|
||||
|
||||
wire sfq_acquire = snp_req_valid && snp_req_ready;
|
||||
wire sfq_release = snp_rsp_valid_unqual && snp_rsp_ready_unqual;
|
||||
|
||||
VX_index_buffer #(
|
||||
.DATAW (SRC_ADDR_WIDTH + 1 + TAG_IN_WIDTH),
|
||||
.SIZE (SREQ_SIZE),
|
||||
.FASTRAM (1)
|
||||
) req_metadata_buf (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.write_addr (sfq_write_addr),
|
||||
.acquire_slot (sfq_acquire),
|
||||
.read_addr (sfq_read_addr),
|
||||
.write_data ({snp_req_tag, snp_req_addr, snp_req_inv}),
|
||||
.read_data ({snp_rsp_tag_unqual, snp_rsp_addr_unqual, snp_rsp_inv_unqual}),
|
||||
.release_addr (sfq_read_addr),
|
||||
.release_slot (sfq_release),
|
||||
.full (sfq_full)
|
||||
);
|
||||
|
||||
wire fwdout_valid;
|
||||
wire [TAG_OUT_WIDTH-1:0] fwdout_tag;
|
||||
wire [DST_ADDR_WIDTH-1:0] fwdout_addr;
|
||||
wire fwdout_inv;
|
||||
wire fwdout_ready;
|
||||
wire dispatch_hold;
|
||||
|
||||
if (ADDR_DIFF != 0) begin
|
||||
reg [TAG_OUT_WIDTH-1:0] fwdout_tag_r;
|
||||
reg [DST_ADDR_WIDTH-1:0] fwdout_addr_r;
|
||||
reg fwdout_inv_r;
|
||||
reg dispatch_hold_r;
|
||||
|
||||
always @(posedge clk) begin
|
||||
if (reset) begin
|
||||
dispatch_hold_r <= 0;
|
||||
end else begin
|
||||
if (snp_req_valid && snp_req_ready) begin
|
||||
dispatch_hold_r <= 1;
|
||||
end
|
||||
|
||||
if (dispatch_hold_r
|
||||
&& fwdout_ready
|
||||
&& (fwdout_addr[ADDR_DIFF-1:0] == ((1 << ADDR_DIFF)-1))) begin
|
||||
dispatch_hold_r <= 0;
|
||||
end
|
||||
end
|
||||
|
||||
if (fwdout_valid && fwdout_ready) begin
|
||||
fwdout_addr_r <= fwdout_addr + DST_ADDR_WIDTH'(1'b1);
|
||||
end
|
||||
|
||||
if (snp_req_valid && snp_req_ready) begin
|
||||
fwdout_inv_r <= snp_req_inv;
|
||||
fwdout_tag_r <= sfq_write_addr;
|
||||
end
|
||||
end
|
||||
assign fwdout_valid = dispatch_hold_r || (snp_req_valid && !sfq_full);
|
||||
assign fwdout_tag = dispatch_hold_r ? fwdout_tag_r : sfq_write_addr;
|
||||
assign fwdout_addr = dispatch_hold_r ? fwdout_addr_r : {snp_req_addr, ADDR_DIFF'(0)};
|
||||
assign fwdout_inv = dispatch_hold_r ? fwdout_inv_r : snp_req_inv;
|
||||
assign dispatch_hold = dispatch_hold_r;
|
||||
end else begin
|
||||
assign fwdout_valid = snp_req_valid && !sfq_full;
|
||||
assign fwdout_tag = sfq_write_addr;
|
||||
assign fwdout_addr = snp_req_addr;
|
||||
assign fwdout_inv = snp_req_inv;
|
||||
assign dispatch_hold = 1'b0;
|
||||
end
|
||||
|
||||
always @(posedge clk) begin
|
||||
if (sfq_acquire) begin
|
||||
pending_cntrs[sfq_write_addr] <= NUM_REQUESTS_QUAL;
|
||||
end
|
||||
if (fwdin_fire) begin
|
||||
pending_cntrs[sfq_read_addr] <= pending_cntrs[sfq_read_addr] - 1;
|
||||
end
|
||||
end
|
||||
|
||||
reg [NUM_REQS-1:0] snp_fwdout_ready_other;
|
||||
wire [NUM_REQS-1:0] fwdout_ready_unqual;
|
||||
|
||||
for (genvar i = 0; i < NUM_REQS; i++) begin
|
||||
VX_skid_buffer #(
|
||||
.DATAW (DST_ADDR_WIDTH + 1 + TAG_OUT_WIDTH),
|
||||
.PASSTHRU (!BUFFERED)
|
||||
) fwdout_buffer (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.valid_in (fwdout_valid && snp_fwdout_ready_other[i]),
|
||||
.data_in ({fwdout_addr, fwdout_inv, fwdout_tag}),
|
||||
.ready_in (fwdout_ready_unqual[i]),
|
||||
.valid_out (snp_fwdout_valid[i]),
|
||||
.data_out ({snp_fwdout_addr[i], snp_fwdout_inv[i], snp_fwdout_tag[i]}),
|
||||
.ready_out (snp_fwdout_ready[i])
|
||||
);
|
||||
end
|
||||
|
||||
always @(*) begin
|
||||
snp_fwdout_ready_other = {NUM_REQS{1'b1}};
|
||||
for (integer i = 0; i < NUM_REQS; i++) begin
|
||||
for (integer j = 0; j < NUM_REQS; j++) begin
|
||||
if (i != j)
|
||||
snp_fwdout_ready_other[i] &= fwdout_ready_unqual[j];
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
assign fwdout_ready = (& fwdout_ready_unqual);
|
||||
|
||||
assign snp_req_ready = fwdout_ready && !sfq_full && !dispatch_hold;
|
||||
|
||||
VX_stream_arbiter #(
|
||||
.NUM_REQS (NUM_REQS),
|
||||
.DATAW (TAG_OUT_WIDTH)
|
||||
) snp_fwdin_arb (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.valid_in (snp_fwdin_valid),
|
||||
.data_in (snp_fwdin_tag),
|
||||
.ready_in (snp_fwdin_ready),
|
||||
.valid_out (fwdin_valid),
|
||||
.data_out (fwdin_tag),
|
||||
.ready_out (fwdin_ready)
|
||||
);
|
||||
|
||||
VX_skid_buffer #(
|
||||
.DATAW (TAG_IN_WIDTH + SRC_ADDR_WIDTH + 1),
|
||||
.PASSTHRU (!BUFFERED)
|
||||
) rsp_buffer (
|
||||
.clk (clk),
|
||||
.reset (reset),
|
||||
.valid_in (snp_rsp_valid_unqual),
|
||||
.data_in ({snp_rsp_tag_unqual, snp_rsp_addr_unqual, snp_rsp_inv_unqual}),
|
||||
.ready_in (snp_rsp_ready_unqual),
|
||||
.valid_out (snp_rsp_valid),
|
||||
.data_out ({snp_rsp_tag, snp_rsp_addr, snp_rsp_inv}),
|
||||
.ready_out (snp_rsp_ready)
|
||||
);
|
||||
|
||||
`ifdef DBG_PRINT_CACHE_SNP
|
||||
always @(posedge clk) begin
|
||||
if (fwdin_valid && fwdin_ready) begin
|
||||
$display("%t: cache%0d snp-fwd-in: tag=%0h", $time, CACHE_ID, fwdin_tag);
|
||||
end
|
||||
end
|
||||
`endif
|
||||
|
||||
end else begin
|
||||
|
||||
`UNUSED_VAR (clk)
|
||||
`UNUSED_VAR (reset)
|
||||
|
||||
assign snp_fwdout_valid = snp_req_valid;
|
||||
assign snp_fwdout_addr = snp_req_addr;
|
||||
assign snp_fwdout_inv = snp_req_inv;
|
||||
assign snp_fwdout_tag = snp_req_tag;
|
||||
assign snp_req_ready = snp_fwdout_ready;
|
||||
|
||||
assign snp_rsp_valid = snp_fwdin_valid;
|
||||
assign snp_rsp_addr = snp_req_addr;
|
||||
assign snp_rsp_inv = snp_req_inv;
|
||||
assign snp_rsp_tag = snp_fwdin_tag;
|
||||
assign snp_fwdin_ready = snp_rsp_ready;
|
||||
|
||||
end
|
||||
|
||||
`ifdef DBG_PRINT_CACHE_SNP
|
||||
always @(posedge clk) begin
|
||||
if (snp_req_valid && snp_req_ready) begin
|
||||
$display("%t: cache%0d snp-fwd-req: addr=%0h, invalidate=%0d, tag=%0h", $time, CACHE_ID, `TO_FULL_ADDR(snp_req_addr), snp_req_inv, snp_req_tag);
|
||||
end
|
||||
if (snp_fwdout_valid[0] && snp_fwdout_ready[0]) begin
|
||||
$display("%t: cache%0d snp-fwd-out: addr=%0h, invalidate=%0d, tag=%0h", $time, CACHE_ID, `TO_FULL_ADDR(snp_fwdout_addr[0]), snp_fwdout_inv[0], snp_fwdout_tag[0]);
|
||||
end
|
||||
if (snp_rsp_valid && snp_rsp_ready) begin
|
||||
$display("%t: cache%0d snp-fwd-rsp: addr=%0h, invalidate=%0d, tag=%0h", $time, CACHE_ID, snp_rsp_addr, snp_rsp_inv, snp_rsp_tag);
|
||||
end
|
||||
end
|
||||
`endif
|
||||
|
||||
endmodule
|
||||
15
hw/rtl/cache/VX_tag_access.v
vendored
15
hw/rtl/cache/VX_tag_access.v
vendored
@@ -16,9 +16,6 @@ module VX_tag_access #(
|
||||
// Enable cache writeable
|
||||
parameter WRITE_ENABLE = 0,
|
||||
|
||||
// Enable cache flush
|
||||
parameter FLUSH_ENABLE = 1,
|
||||
|
||||
// size of tag id in core request tag
|
||||
parameter CORE_TAG_ID_BITS = 0
|
||||
) (
|
||||
@@ -41,8 +38,6 @@ module VX_tag_access #(
|
||||
input wire[`LINE_ADDR_WIDTH-1:0] addr_in,
|
||||
input wire is_write_in,
|
||||
input wire is_fill_in,
|
||||
input wire is_snp_in,
|
||||
input wire snp_inv_in,
|
||||
input wire force_miss_in,
|
||||
|
||||
// Outputs
|
||||
@@ -90,7 +85,6 @@ module VX_tag_access #(
|
||||
assign do_write = WRITE_ENABLE
|
||||
&& valid_in
|
||||
&& tags_match
|
||||
&& !is_snp_in
|
||||
&& !is_fill_in
|
||||
&& is_write_in
|
||||
&& !force_miss_in
|
||||
@@ -100,17 +94,10 @@ module VX_tag_access #(
|
||||
&& is_fill_in
|
||||
&& !stall;
|
||||
|
||||
assign do_invalidate = FLUSH_ENABLE
|
||||
&& valid_in
|
||||
&& tags_match
|
||||
&& is_snp_in
|
||||
&& (read_dirty || snp_inv_in)
|
||||
&& !force_miss_in
|
||||
&& !stall;
|
||||
assign do_invalidate = 0;
|
||||
|
||||
assign miss_out = valid_in
|
||||
&& !tags_match
|
||||
&& !is_snp_in
|
||||
&& !is_fill_in;
|
||||
|
||||
assign dirty_out = WRITE_ENABLE
|
||||
|
||||
Reference in New Issue
Block a user