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

fixed shared memory write bug

Browse Source
This commit is contained in:
Blaise Tine
2021-05-23 10:57:58 -07:00
parent d3f0a77ae5
commit 244f4b0964
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/rtl/VX_lsu_unit.v
View File

@@ -306,7 +306,7 @@ module VX_lsu_unit #(
$write("%t: D$%0d Rsp: valid=%b, wid=%0d, PC=%0h, tag=%0h, rd=%0d, data=", $write("%t: D$%0d Rsp: valid=%b, wid=%0d, PC=%0h, tag=%0h, rd=%0d, data=",
$time, CORE_ID, dcache_rsp_if.valid, rsp_wid, rsp_pc, dcache_rsp_if.tag, rsp_rd); $time, CORE_ID, dcache_rsp_if.valid, rsp_wid, rsp_pc, dcache_rsp_if.tag, rsp_rd);
`PRINT_ARRAY1D(dcache_rsp_if.data, `NUM_THREADS); `PRINT_ARRAY1D(dcache_rsp_if.data, `NUM_THREADS);
$write("is_dup=%b\n", rsp_is_dup); $write(", is_dup=%b\n", rsp_is_dup);
end end
if (mbuf_full) begin if (mbuf_full) begin
$write("%t: *** D$%0d queue-full:", $time, CORE_ID); $write("%t: *** D$%0d queue-full:", $time, CORE_ID);

26
hw/rtl/cache/VX_shared_mem.v vendored
View File

@@ -156,9 +156,14 @@ module VX_shared_mem #(
`UNUSED_PIN (size) `UNUSED_PIN (size)
); );
wire [NUM_BANKS-1:0][`WORD_WIDTH-1:0] per_bank_core_rsp_data; wire [NUM_BANKS-1:0][`WORD_WIDTH-1:0] per_bank_core_rsp_data;
for (genvar i = 0; i < NUM_BANKS; i++) begin for (genvar i = 0; i < NUM_BANKS; i++) begin
wire wren = per_bank_core_req_rw[i]
&& per_bank_core_req_valid[i]
&& creq_pop;
VX_sp_ram #( VX_sp_ram #(
.DATAW (`WORD_WIDTH), .DATAW (`WORD_WIDTH),
.SIZE (`LINES_PER_BANK), .SIZE (`LINES_PER_BANK),
@@ -167,7 +172,7 @@ module VX_shared_mem #(
) data ( ) data (
.clk (clk), .clk (clk),
.addr (per_bank_core_req_addr[i]), .addr (per_bank_core_req_addr[i]),
.wren (per_bank_core_req_valid[i] && per_bank_core_req_rw[i]), .wren (wren),
.byteen (per_bank_core_req_byteen[i]), .byteen (per_bank_core_req_byteen[i]),
.rden (1'b1), .rden (1'b1),
.din (per_bank_core_req_data[i]), .din (per_bank_core_req_data[i]),
@@ -228,10 +233,19 @@ module VX_shared_mem #(
$display("%t: cache%0d pipeline-stall", $time, CACHE_ID); $display("%t: cache%0d pipeline-stall", $time, CACHE_ID);
end end
if (creq_pop) begin if (creq_pop) begin
if (core_rsp_rw) if (core_rsp_rw) begin
$display("%t: cache%0d core-wr-req: tmask=%0b, addr=%0h, tag=%0h, byteen=%b, data=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, per_bank_core_req_valid, per_bank_core_req_addr, per_bank_core_req_tag, per_bank_core_req_byteen, per_bank_core_req_data, debug_wid_st0, debug_pc_st0); $write("%t: cache%0d core-wr-req: tmask=%0b, addr=", $time, CACHE_ID, per_bank_core_req_valid);
else end else begin
$display("%t: cache%0d core-rd-req: tmask=%0b, addr=%0h, tag=%0h, byteen=%b, data=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, per_bank_core_req_valid, per_bank_core_req_addr, per_bank_core_req_tag, per_bank_core_req_byteen, per_bank_core_rsp_data, debug_wid_st0, debug_pc_st0); $write("%t: cache%0d core-rd-req: tmask=%0b, addr=", $time, CACHE_ID, per_bank_core_req_valid);
end
`PRINT_ARRAY1D(per_bank_core_req_addr, `NUM_THREADS);
$write(", tag=%0h, byteen=%b, data=", per_bank_core_req_tag, per_bank_core_req_byteen);
if (core_rsp_rw) begin
`PRINT_ARRAY1D(per_bank_core_req_data, `NUM_THREADS);
end else begin
`PRINT_ARRAY1D(per_bank_core_rsp_data, `NUM_THREADS);
end
$write(", wid=%0d, PC=%0h\n", debug_wid_st0, debug_pc_st0);
end end
end end
`endif `endif