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

optimize critical path inside cache bank

Browse Source
This commit is contained in:
Blaise Tine
2021-09-07 23:44:51 -07:00
parent 0d91f8771e
commit 134cbcfc5a
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,7 +225,7 @@ module VX_bank #(
mshr_enable ? mshr_tid : creq_tid, mshr_enable ? mshr_tid : creq_tid,
mshr_enable ? mshr_pmask : creq_pmask, mshr_enable ? mshr_pmask : creq_pmask,
mshr_enable ? mshr_tag : creq_tag, mshr_enable ? mshr_tag : creq_tag,
mshr_enable ? mshr_dequeue_id : (mem_rsp_valid ? mem_rsp_id : mshr_alloc_id) mshr_enable ? mshr_dequeue_id : mem_rsp_id
}), }),
.data_out ({valid_st0, is_flush_st0, is_fill_st0, is_mshr_st0, write_st0, addr_st0, wdata_st0, wsel_st0, byteen_st0, req_tid_st0, pmask_st0, tag_st0, mshr_id_st0}) .data_out ({valid_st0, is_flush_st0, is_fill_st0, is_mshr_st0, write_st0, addr_st0, wdata_st0, wsel_st0, byteen_st0, req_tid_st0, pmask_st0, tag_st0, mshr_id_st0})
); );
@@ -274,6 +274,8 @@ module VX_bank #(
wire read_st0 = !is_fill_st0 && !write_st0; wire read_st0 = !is_fill_st0 && !write_st0;
wire [MSHR_ADDR_WIDTH-1:0] mshr_id_qual_st0 = (!is_fill_st0 && !is_mshr_st0) ? mshr_alloc_id : mshr_id_st0;
VX_pipe_register #( VX_pipe_register #(
.DATAW (1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `CACHE_LINE_WIDTH + NUM_PORTS * (WORD_SELECT_BITS + WORD_SIZE + `REQS_BITS + 1 + CORE_TAG_WIDTH) + MSHR_ADDR_WIDTH + 1), .DATAW (1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `CACHE_LINE_WIDTH + NUM_PORTS * (WORD_SELECT_BITS + WORD_SIZE + `REQS_BITS + 1 + CORE_TAG_WIDTH) + MSHR_ADDR_WIDTH + 1),
.RESETW (1) .RESETW (1)
@@ -281,8 +283,8 @@ module VX_bank #(
.clk (clk), .clk (clk),
.reset (reset), .reset (reset),
.enable (!crsq_stall), .enable (!crsq_stall),
.data_in ({valid_st0, is_fill_st0, is_mshr_st0, miss_st0, write_st0, addr_st0, wdata_st0, wsel_st0, byteen_st0, req_tid_st0, pmask_st0, tag_st0, mshr_id_st0, mshr_pending_st0}), .data_in ({valid_st0, is_fill_st0, is_mshr_st0, miss_st0, write_st0, addr_st0, wdata_st0, wsel_st0, byteen_st0, req_tid_st0, pmask_st0, tag_st0, mshr_id_qual_st0, mshr_pending_st0}),
.data_out ({valid_st1, is_fill_st1, is_mshr_st1, miss_st1, write_st1, addr_st1, wdata_st1, wsel_st1, byteen_st1, req_tid_st1, pmask_st1, tag_st1, mshr_id_st1, mshr_pending_st1}) .data_out ({valid_st1, is_fill_st1, is_mshr_st1, miss_st1, write_st1, addr_st1, wdata_st1, wsel_st1, byteen_st1, req_tid_st1, pmask_st1, tag_st1, mshr_id_st1, mshr_pending_st1})
); );
`ifdef DBG_CACHE_REQ_INFO `ifdef DBG_CACHE_REQ_INFO
@@ -370,12 +372,22 @@ module VX_bank #(
.fill_data (wdata_st1) .fill_data (wdata_st1)
); );
wire mshr_allocate = creq_fire && ~creq_rw; wire mshr_allocate = valid_st0 && read_st0 && !is_mshr_st0 && !crsq_stall;
wire mshr_replay = do_fill_st0 && ~crsq_stall; wire mshr_replay = do_fill_st0 && ~crsq_stall;
wire mshr_lookup = valid_st0 && read_st0 && !is_mshr_st0 && !crsq_stall; wire mshr_lookup = mshr_allocate;
wire mshr_release = valid_st1 && read_st1 && !is_mshr_st1 && !miss_st1 && !crsq_stall; wire mshr_release = valid_st1 && read_st1 && !is_mshr_st1 && !miss_st1 && !crsq_stall;
wire mshr_not_full; VX_pending_size #(
.SIZE (MSHR_SIZE)
) mshr_pending_size (
.clk (clk),
.reset (reset),
.incr (creq_fire && ~creq_rw),
.decr (mshr_fire || mshr_release),
.full (mshr_alm_full),
`UNUSED_PIN (size),
`UNUSED_PIN (empty)
);
VX_miss_resrv #( VX_miss_resrv #(
.BANK_ID (BANK_ID), .BANK_ID (BANK_ID),
@@ -402,15 +414,15 @@ module VX_bank #(
// allocate // allocate
.allocate_valid (mshr_allocate), .allocate_valid (mshr_allocate),
.allocate_addr (creq_addr), .allocate_addr (addr_st0),
.allocate_data ({creq_wsel, creq_tag, creq_tid, creq_pmask}), .allocate_data ({wsel_st0, tag_st0, req_tid_st0, pmask_st0}),
.allocate_id (mshr_alloc_id), .allocate_id (mshr_alloc_id),
.allocate_ready (mshr_not_full), `UNUSED_PIN (allocate_ready),
// lookup // lookup
.lookup_valid (mshr_lookup), .lookup_valid (mshr_lookup),
.lookup_replay (mshr_replay), .lookup_replay (mshr_replay),
.lookup_id (mshr_id_st0), .lookup_id (mshr_alloc_id),
.lookup_addr (addr_st0), .lookup_addr (addr_st0),
.lookup_match (mshr_pending_st0), .lookup_match (mshr_pending_st0),
@@ -430,8 +442,6 @@ module VX_bank #(
.release_id (mshr_id_st1) .release_id (mshr_id_st1)
); );
assign mshr_alm_full = ~mshr_not_full;
// Enqueue core response // Enqueue core response
wire [NUM_PORTS-1:0] crsq_pmask; wire [NUM_PORTS-1:0] crsq_pmask;

3
hw/rtl/cache/VX_miss_resrv.v vendored
View File

@@ -165,6 +165,9 @@ module VX_miss_resrv #(
assert(!release_valid || valid_table[release_id]); assert(!release_valid || valid_table[release_id]);
end end
`RUNTIME_ASSERT((!allocate_fire || ~valid_table[allocate_id]), ("%t: *** cache%0d:%0d in-use allocation: addr=%0h, id=%0d", $time, CACHE_ID, BANK_ID,
`LINE_TO_BYTE_ADDR(allocate_addr, BANK_ID), allocate_id))
`RUNTIME_ASSERT((!fill_valid || valid_table[fill_id]), ("%t: *** cache%0d:%0d invalid fill: addr=%0h, id=%0d", $time, CACHE_ID, BANK_ID, `RUNTIME_ASSERT((!fill_valid || valid_table[fill_id]), ("%t: *** cache%0d:%0d invalid fill: addr=%0h, id=%0d", $time, CACHE_ID, BANK_ID,
`LINE_TO_BYTE_ADDR(addr_table[fill_id], BANK_ID), fill_id)) `LINE_TO_BYTE_ADDR(addr_table[fill_id], BANK_ID), fill_id))