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

Change smem bundles into flattened 1-D arrays

Browse Source
This commit is contained in:
Hansung Kim
2024-01-04 00:52:47 -08:00
parent e6f6d4ea06
commit fd425f1cdf
1 changed files with 92 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

229
hw/rtl/VX_core_wrapper.sv
View File

@@ -57,65 +57,21 @@ module Vortex import VX_gpu_pkg::*; #(
// smem ------------------------------------------------
input smem_0_a_ready,
input smem_0_d_valid,
input [2:0] smem_0_d_bits_opcode,
input [3:0] smem_0_d_bits_size,
input [DCACHE_NOSM_TAG_WIDTH-1:0] smem_0_d_bits_source,
input [31:0] smem_0_d_bits_data,
output smem_0_a_valid,
output [2:0] smem_0_a_bits_opcode,
output [3:0] smem_0_a_bits_size,
output [DCACHE_NOSM_TAG_WIDTH-1:0] smem_0_a_bits_source,
output [31:0] smem_0_a_bits_address,
output [3:0] smem_0_a_bits_mask,
output [31:0] smem_0_a_bits_data,
output smem_0_d_ready,
input [NUM_THREADS - 1:0] smem_d_valid,
input [(NUM_THREADS * 3) - 1:0] smem_d_bits_opcode,
input [(NUM_THREADS * 4) - 1:0] smem_d_bits_size,
input [(NUM_THREADS * DCACHE_NOSM_TAG_WIDTH) - 1:0] smem_d_bits_source,
input [(NUM_THREADS * 32) - 1:0] smem_d_bits_data,
output [NUM_THREADS - 1:0] smem_d_ready,
input smem_1_a_ready,
input smem_1_d_valid,
input [2:0] smem_1_d_bits_opcode,
input [3:0] smem_1_d_bits_size,
input [DCACHE_NOSM_TAG_WIDTH-1:0] smem_1_d_bits_source,
input [31:0] smem_1_d_bits_data,
output smem_1_a_valid,
output [2:0] smem_1_a_bits_opcode,
output [3:0] smem_1_a_bits_size,
output [DCACHE_NOSM_TAG_WIDTH-1:0] smem_1_a_bits_source,
output [31:0] smem_1_a_bits_address,
output [3:0] smem_1_a_bits_mask,
output [31:0] smem_1_a_bits_data,
output smem_1_d_ready,
input smem_2_a_ready,
input smem_2_d_valid,
input [2:0] smem_2_d_bits_opcode,
input [3:0] smem_2_d_bits_size,
input [DCACHE_NOSM_TAG_WIDTH-1:0] smem_2_d_bits_source,
input [31:0] smem_2_d_bits_data,
output smem_2_a_valid,
output [2:0] smem_2_a_bits_opcode,
output [3:0] smem_2_a_bits_size,
output [DCACHE_NOSM_TAG_WIDTH-1:0] smem_2_a_bits_source,
output [31:0] smem_2_a_bits_address,
output [3:0] smem_2_a_bits_mask,
output [31:0] smem_2_a_bits_data,
output smem_2_d_ready,
input smem_3_a_ready,
input smem_3_d_valid,
input [2:0] smem_3_d_bits_opcode,
input [3:0] smem_3_d_bits_size,
input [DCACHE_NOSM_TAG_WIDTH-1:0] smem_3_d_bits_source,
input [31:0] smem_3_d_bits_data,
output smem_3_a_valid,
output [2:0] smem_3_a_bits_opcode,
output [3:0] smem_3_a_bits_size,
output [DCACHE_NOSM_TAG_WIDTH-1:0] smem_3_a_bits_source,
output [31:0] smem_3_a_bits_address,
output [3:0] smem_3_a_bits_mask,
output [31:0] smem_3_a_bits_data,
output smem_3_d_ready,
input [NUM_THREADS - 1:0] smem_a_ready,
output [NUM_THREADS - 1:0] smem_a_valid,
output [(NUM_THREADS * 3) - 1:0] smem_a_bits_opcode,
output [(NUM_THREADS * 4) - 1:0] smem_a_bits_size,
output [(NUM_THREADS * DCACHE_NOSM_TAG_WIDTH) - 1:0] smem_a_bits_source,
output [(NUM_THREADS * 32) - 1:0] smem_a_bits_address,
output [(NUM_THREADS * 4) - 1:0] smem_a_bits_mask,
output [(NUM_THREADS * 32) - 1:0] smem_a_bits_data,
// input fpu_fcsr_flags_valid,
// input [4:0] fpu_fcsr_flags_bits,
@@ -337,96 +293,95 @@ module Vortex import VX_gpu_pkg::*; #(
// FIXME: giant @copypaste from dmem
// for (genvar i = 0; i < 4; i++) begin
// Vortex core does not accept write acks; filter them out here
assign smem_bus_if[0].rsp_valid =
(smem_0_d_valid && (smem_0_d_bits_opcode !== 3'd0 /*AccessAck*/));
assign smem_bus_if[1].rsp_valid =
(smem_1_d_valid && (smem_1_d_bits_opcode !== 3'd0 /*AccessAck*/));
assign smem_bus_if[2].rsp_valid =
(smem_2_d_valid && (smem_2_d_bits_opcode !== 3'd0 /*AccessAck*/));
assign smem_bus_if[3].rsp_valid =
(smem_3_d_valid && (smem_3_d_bits_opcode !== 3'd0 /*AccessAck*/));
// Vortex core does not accept write acks; filter them out here
assign smem_bus_if[0].rsp_valid =
(smem_d_valid[0] && (smem_d_bits_opcode[0 * 3 +: 3] !== 3'd0 /*AccessAck*/));
assign smem_bus_if[1].rsp_valid =
(smem_d_valid[1] && (smem_d_bits_opcode[1 * 3 +: 3] !== 3'd0 /*AccessAck*/));
assign smem_bus_if[2].rsp_valid =
(smem_d_valid[2] && (smem_d_bits_opcode[2 * 3 +: 3] !== 3'd0 /*AccessAck*/));
assign smem_bus_if[3].rsp_valid =
(smem_d_valid[3] && (smem_d_bits_opcode[3 * 3 +: 3] !== 3'd0 /*AccessAck*/));
assign smem_bus_if[0].rsp_data.data = smem_0_d_bits_data;
assign smem_bus_if[1].rsp_data.data = smem_1_d_bits_data;
assign smem_bus_if[2].rsp_data.data = smem_2_d_bits_data;
assign smem_bus_if[3].rsp_data.data = smem_3_d_bits_data;
assign smem_bus_if[0].rsp_data.data = smem_d_bits_data[0 * 32 +: 32];
assign smem_bus_if[1].rsp_data.data = smem_d_bits_data[1 * 32 +: 32];
assign smem_bus_if[2].rsp_data.data = smem_d_bits_data[2 * 32 +: 32];
assign smem_bus_if[3].rsp_data.data = smem_d_bits_data[3 * 32 +: 32];
assign smem_bus_if[0].rsp_data.tag = smem_0_d_bits_source;
assign smem_bus_if[1].rsp_data.tag = smem_1_d_bits_source;
assign smem_bus_if[2].rsp_data.tag = smem_2_d_bits_source;
assign smem_bus_if[3].rsp_data.tag = smem_3_d_bits_source;
assign smem_bus_if[0].rsp_data.tag = smem_d_bits_source[0 * DCACHE_NOSM_TAG_WIDTH +: DCACHE_NOSM_TAG_WIDTH];
assign smem_bus_if[1].rsp_data.tag = smem_d_bits_source[1 * DCACHE_NOSM_TAG_WIDTH +: DCACHE_NOSM_TAG_WIDTH];
assign smem_bus_if[2].rsp_data.tag = smem_d_bits_source[2 * DCACHE_NOSM_TAG_WIDTH +: DCACHE_NOSM_TAG_WIDTH];
assign smem_bus_if[3].rsp_data.tag = smem_d_bits_source[3 * DCACHE_NOSM_TAG_WIDTH +: DCACHE_NOSM_TAG_WIDTH];
// When there's a write ACK coming back, ready bit should always be 1 to
// accept them because core does not accept them on their own
assign smem_0_d_ready = smem_bus_if[0].rsp_ready ||
(smem_0_d_valid && (smem_0_d_bits_opcode == 3'd0 /*AccessAck*/));
assign smem_1_d_ready = smem_bus_if[1].rsp_ready ||
(smem_1_d_valid && (smem_1_d_bits_opcode == 3'd0 /*AccessAck*/));
assign smem_2_d_ready = smem_bus_if[2].rsp_ready ||
(smem_2_d_valid && (smem_2_d_bits_opcode == 3'd0 /*AccessAck*/));
assign smem_3_d_ready = smem_bus_if[3].rsp_ready ||
(smem_3_d_valid && (smem_3_d_bits_opcode == 3'd0 /*AccessAck*/));
// When there's a write ACK coming back, ready bit should always be 1 to
// accept them because core does not accept them on their own
assign smem_d_ready[0] = smem_bus_if[0].rsp_ready ||
(smem_d_valid[0] && (smem_d_bits_opcode[0 * 3 +: 3] == 3'd0 /*AccessAck*/));
assign smem_d_ready[1] = smem_bus_if[1].rsp_ready ||
(smem_d_valid[1] && (smem_d_bits_opcode[1 * 3 +: 3] == 3'd0 /*AccessAck*/));
assign smem_d_ready[2] = smem_bus_if[2].rsp_ready ||
(smem_d_valid[2] && (smem_d_bits_opcode[2 * 3 +: 3] == 3'd0 /*AccessAck*/));
assign smem_d_ready[3] = smem_bus_if[3].rsp_ready ||
(smem_d_valid[3] && (smem_d_bits_opcode[3 * 3 +: 3] == 3'd0 /*AccessAck*/));
assign smem_0_a_valid = smem_bus_if[0].req_valid;
assign smem_1_a_valid = smem_bus_if[1].req_valid;
assign smem_2_a_valid = smem_bus_if[2].req_valid;
assign smem_3_a_valid = smem_bus_if[3].req_valid;
assign smem_a_valid[0] = smem_bus_if[0].req_valid;
assign smem_a_valid[1] = smem_bus_if[1].req_valid;
assign smem_a_valid[2] = smem_bus_if[2].req_valid;
assign smem_a_valid[3] = smem_bus_if[3].req_valid;
assign smem_0_a_bits_address = {smem_bus_if[0].req_data.addr, 2'b0};
assign smem_1_a_bits_address = {smem_bus_if[1].req_data.addr, 2'b0};
assign smem_2_a_bits_address = {smem_bus_if[2].req_data.addr, 2'b0};
assign smem_3_a_bits_address = {smem_bus_if[3].req_data.addr, 2'b0};
assign smem_a_bits_address[0 * 32 +: 32] = {smem_bus_if[0].req_data.addr, 2'b0};
assign smem_a_bits_address[1 * 32 +: 32] = {smem_bus_if[1].req_data.addr, 2'b0};
assign smem_a_bits_address[2 * 32 +: 32] = {smem_bus_if[2].req_data.addr, 2'b0};
assign smem_a_bits_address[3 * 32 +: 32] = {smem_bus_if[3].req_data.addr, 2'b0};
assign smem_0_a_bits_data = smem_bus_if[0].req_data.data;
assign smem_1_a_bits_data = smem_bus_if[1].req_data.data;
assign smem_2_a_bits_data = smem_bus_if[2].req_data.data;
assign smem_3_a_bits_data = smem_bus_if[3].req_data.data;
assign smem_a_bits_data[0 * 32 +: 32] = smem_bus_if[0].req_data.data;
assign smem_a_bits_data[1 * 32 +: 32] = smem_bus_if[1].req_data.data;
assign smem_a_bits_data[2 * 32 +: 32] = smem_bus_if[2].req_data.data;
assign smem_a_bits_data[3 * 32 +: 32] = smem_bus_if[3].req_data.data;
assign smem_0_a_bits_source = smem_bus_if[0].req_data.tag;
assign smem_1_a_bits_source = smem_bus_if[1].req_data.tag;
assign smem_2_a_bits_source = smem_bus_if[2].req_data.tag;
assign smem_3_a_bits_source = smem_bus_if[3].req_data.tag;
assign smem_a_bits_source[0 * DCACHE_NOSM_TAG_WIDTH +: DCACHE_NOSM_TAG_WIDTH] = smem_bus_if[0].req_data.tag;
assign smem_a_bits_source[1 * DCACHE_NOSM_TAG_WIDTH +: DCACHE_NOSM_TAG_WIDTH] = smem_bus_if[1].req_data.tag;
assign smem_a_bits_source[2 * DCACHE_NOSM_TAG_WIDTH +: DCACHE_NOSM_TAG_WIDTH] = smem_bus_if[2].req_data.tag;
assign smem_a_bits_source[3 * DCACHE_NOSM_TAG_WIDTH +: DCACHE_NOSM_TAG_WIDTH] = smem_bus_if[3].req_data.tag;
// Translate Vortex rw/byteen to TileLink opcode
assign smem_0_a_bits_opcode =
smem_bus_if[0].req_data.rw ?
(&smem_bus_if[0].req_data.byteen ? 3'd0 /*PutFull*/ : 3'd1 /*PutPartial*/)
: 3'd4 /*Get*/;
assign smem_1_a_bits_opcode =
smem_bus_if[1].req_data.rw ?
(&smem_bus_if[1].req_data.byteen ? 3'd0 /*PutFull*/ : 3'd1 /*PutPartial*/)
: 3'd4 /*Get*/;
assign smem_2_a_bits_opcode =
smem_bus_if[2].req_data.rw ?
(&smem_bus_if[2].req_data.byteen ? 3'd0 /*PutFull*/ : 3'd1 /*PutPartial*/)
: 3'd4 /*Get*/;
assign smem_3_a_bits_opcode =
smem_bus_if[3].req_data.rw ?
(&smem_bus_if[3].req_data.byteen ? 3'd0 /*PutFull*/ : 3'd1 /*PutPartial*/)
: 3'd4 /*Get*/;
// Translate Vortex rw/byteen to TileLink opcode
assign smem_a_bits_opcode[0 * 3 +: 3] =
smem_bus_if[0].req_data.rw ?
(&smem_bus_if[0].req_data.byteen ? 3'd0 /*PutFull*/ : 3'd1 /*PutPartial*/)
: 3'd4 /*Get*/;
assign smem_a_bits_opcode[1 * 3 +: 3] =
smem_bus_if[1].req_data.rw ?
(&smem_bus_if[1].req_data.byteen ? 3'd0 /*PutFull*/ : 3'd1 /*PutPartial*/)
: 3'd4 /*Get*/;
assign smem_a_bits_opcode[2 * 3 +: 3] =
smem_bus_if[2].req_data.rw ?
(&smem_bus_if[2].req_data.byteen ? 3'd0 /*PutFull*/ : 3'd1 /*PutPartial*/)
: 3'd4 /*Get*/;
assign smem_a_bits_opcode[3 * 3 +: 3] =
smem_bus_if[3].req_data.rw ?
(&smem_bus_if[3].req_data.byteen ? 3'd0 /*PutFull*/ : 3'd1 /*PutPartial*/)
: 3'd4 /*Get*/;
// Vortex cache requests are single-fixed-size
// NOTE: MAKE SURE TO CHANGE CONSTANT WIDTH FOR SIZE!
assign smem_0_a_bits_size = 4'd2;
assign smem_1_a_bits_size = 4'd2;
assign smem_2_a_bits_size = 4'd2;
assign smem_3_a_bits_size = 4'd2;
/* $countones(dcache_req_if.byteen[0]) === 'd4 ? 2'd2 :
($countones(dcache_req_if.byteen[0]) === 'd2 ? 2'd1 : 2'd0); */
// Vortex cache requests are single-fixed-size
// NOTE: MAKE SURE TO CHANGE CONSTANT WIDTH FOR SIZE!
assign smem_a_bits_size[0 * 4 +: 4] = 4'd2;
assign smem_a_bits_size[1 * 4 +: 4] = 4'd2;
assign smem_a_bits_size[2 * 4 +: 4] = 4'd2;
assign smem_a_bits_size[3 * 4 +: 4] = 4'd2;
/* $countones(dcache_req_if.byteen[0]) === 'd4 ? 2'd2 :
($countones(dcache_req_if.byteen[0]) === 'd2 ? 2'd1 : 2'd0); */
// byteen can be directly used as TL mask
assign smem_0_a_bits_mask = smem_bus_if[0].req_data.byteen;
assign smem_1_a_bits_mask = smem_bus_if[1].req_data.byteen;
assign smem_2_a_bits_mask = smem_bus_if[2].req_data.byteen;
assign smem_3_a_bits_mask = smem_bus_if[3].req_data.byteen;
// byteen can be directly used as TL mask
assign smem_a_bits_mask[0 * 4 +: 4] = smem_bus_if[0].req_data.byteen;
assign smem_a_bits_mask[1 * 4 +: 4] = smem_bus_if[1].req_data.byteen;
assign smem_a_bits_mask[2 * 4 +: 4] = smem_bus_if[2].req_data.byteen;
assign smem_a_bits_mask[3 * 4 +: 4] = smem_bus_if[3].req_data.byteen;
assign smem_bus_if[0].req_ready = smem_a_ready[0];
assign smem_bus_if[1].req_ready = smem_a_ready[1];
assign smem_bus_if[2].req_ready = smem_a_ready[2];
assign smem_bus_if[3].req_ready = smem_a_ready[3];
assign smem_bus_if[0].req_ready = smem_0_a_ready;
assign smem_bus_if[1].req_ready = smem_1_a_ready;
assign smem_bus_if[2].req_ready = smem_2_a_ready;
assign smem_bus_if[3].req_ready = smem_3_a_ready;
// end
/* fpu */
// assign {fpu_hartid, fpu_time, fpu_inst, fpu_fromint_data, fpu_fcsr_rm, fpu_dmem_resp_val, fpu_dmem_resp_type,