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

minor update

Browse Source
This commit is contained in:
Blaise Tine
2021-07-31 03:02:25 -07:00
parent 94ad34768b
commit ee46bc8a48
4 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
hw/rtl/VX_gpu_unit.v
View File

@@ -25,20 +25,24 @@ module VX_gpu_unit #(
`UNUSED_PARAM (CORE_ID) `UNUSED_PARAM (CORE_ID)
localparam WCTL_DATAW = `GPU_TMC_BITS + `GPU_WSPAWN_BITS + `GPU_SPLIT_BITS + `GPU_BARRIER_BITS;
localparam RSP_DATAW = `MAX(`NUM_THREADS * 32, WCTL_DATAW);
wire rsp_valid; wire rsp_valid;
wire [`NW_BITS-1:0] rsp_wid; wire [`NW_BITS-1:0] rsp_wid;
wire [`NUM_THREADS-1:0] rsp_tmask; wire [`NUM_THREADS-1:0] rsp_tmask;
wire [31:0] rsp_PC; wire [31:0] rsp_PC;
wire [`NR_BITS-1:0] rsp_rd; wire [`NR_BITS-1:0] rsp_rd;
wire rsp_wb; wire rsp_wb;
wire [`NUM_THREADS-1:0][31:0] rsp_data;
wire [RSP_DATAW-1:0] rsp_data, rsp_data_r;
gpu_tmc_t tmc; gpu_tmc_t tmc;
gpu_wspawn_t wspawn; gpu_wspawn_t wspawn;
gpu_barrier_t barrier; gpu_barrier_t barrier;
gpu_split_t split; gpu_split_t split;
wire [(`NUM_THREADS * 32)-1:0] warp_ctl_data; wire [WCTL_DATAW-1:0] warp_ctl_data;
wire is_warp_ctl; wire is_warp_ctl;
wire stall_in, stall_out; wire stall_in, stall_out;
@@ -92,9 +96,7 @@ module VX_gpu_unit #(
assign barrier.size_m1 = (`NW_BITS)'(gpu_req_if.rs2_data[0] - 1); assign barrier.size_m1 = (`NW_BITS)'(gpu_req_if.rs2_data[0] - 1);
// pack warp ctl result // pack warp ctl result
`IGNORE_WARNINGS_BEGIN assign warp_ctl_data = {tmc, wspawn, split, barrier};
assign warp_ctl_data = {tmc, wspawn, barrier, split};
`IGNORE_WARNINGS_END
// texture // texture
@@ -144,7 +146,7 @@ module VX_gpu_unit #(
assign rsp_PC = tex_rsp_if.valid ? tex_rsp_if.PC : gpu_req_if.PC; assign rsp_PC = tex_rsp_if.valid ? tex_rsp_if.PC : gpu_req_if.PC;
assign rsp_rd = tex_rsp_if.rd; assign rsp_rd = tex_rsp_if.rd;
assign rsp_wb = tex_rsp_if.valid && tex_rsp_if.wb; assign rsp_wb = tex_rsp_if.valid && tex_rsp_if.wb;
assign rsp_data = tex_rsp_if.valid ? tex_rsp_if.data : warp_ctl_data; assign rsp_data = tex_rsp_if.valid ? RSP_DATAW'(tex_rsp_if.data) : RSP_DATAW'(warp_ctl_data);
`else `else
@@ -163,7 +165,7 @@ module VX_gpu_unit #(
assign rsp_PC = gpu_req_if.PC; assign rsp_PC = gpu_req_if.PC;
assign rsp_rd = 0; assign rsp_rd = 0;
assign rsp_wb = 0; assign rsp_wb = 0;
assign rsp_data = warp_ctl_data; assign rsp_data = RSP_DATAW'(warp_ctl_data);
`endif `endif
@@ -173,23 +175,23 @@ module VX_gpu_unit #(
assign stall_out = ~gpu_commit_if.ready && gpu_commit_if.valid; assign stall_out = ~gpu_commit_if.ready && gpu_commit_if.valid;
VX_pipe_register #( VX_pipe_register #(
.DATAW (1 + `NW_BITS + `NUM_THREADS + 32 + `NR_BITS + 1 + (`NUM_THREADS * 32) + 1), .DATAW (1 + `NW_BITS + `NUM_THREADS + 32 + `NR_BITS + 1 + RSP_DATAW + 1),
.RESETW (1) .RESETW (1)
) pipe_reg ( ) pipe_reg (
.clk (clk), .clk (clk),
.reset (reset), .reset (reset),
.enable (!stall_out), .enable (!stall_out),
.data_in ({rsp_valid, rsp_wid, rsp_tmask, rsp_PC, rsp_rd, rsp_wb, rsp_data, is_warp_ctl}), .data_in ({rsp_valid, rsp_wid, rsp_tmask, rsp_PC, rsp_rd, rsp_wb, rsp_data, is_warp_ctl}),
.data_out ({gpu_commit_if.valid, gpu_commit_if.wid, gpu_commit_if.tmask, gpu_commit_if.PC, gpu_commit_if.rd, gpu_commit_if.wb, gpu_commit_if.data, is_warp_ctl_r}) .data_out ({gpu_commit_if.valid, gpu_commit_if.wid, gpu_commit_if.tmask, gpu_commit_if.PC, gpu_commit_if.rd, gpu_commit_if.wb, rsp_data_r, is_warp_ctl_r})
); );
assign gpu_commit_if.eop = 1'b1; assign gpu_commit_if.data = rsp_data_r[(`NUM_THREADS * 32)-1:0];
assign gpu_commit_if.eop = 1'b1;
// warp control reponse // warp control reponse
`IGNORE_WARNINGS_BEGIN assign {warp_ctl_if.tmc, warp_ctl_if.wspawn, warp_ctl_if.split, warp_ctl_if.barrier} = rsp_data_r[WCTL_DATAW-1:0];
assign {warp_ctl_if.tmc, warp_ctl_if.wspawn, warp_ctl_if.barrier, warp_ctl_if.split} = gpu_commit_if.data;
`IGNORE_WARNINGS_END
assign warp_ctl_if.valid = gpu_commit_if.valid && gpu_commit_if.ready && is_warp_ctl_r; assign warp_ctl_if.valid = gpu_commit_if.valid && gpu_commit_if.ready && is_warp_ctl_r;
assign warp_ctl_if.wid = gpu_commit_if.wid; assign warp_ctl_if.wid = gpu_commit_if.wid;

8
hw/rtl/VX_types.vh
View File

@@ -28,7 +28,7 @@ typedef struct packed {
logic [`NUM_THREADS-1:0] tmask; logic [`NUM_THREADS-1:0] tmask;
} gpu_tmc_t; } gpu_tmc_t;
`define GPU_TMC_SIZE (1+`NUM_THREADS) `define GPU_TMC_BITS (1+`NUM_THREADS)
typedef struct packed { typedef struct packed {
logic valid; logic valid;
@@ -36,7 +36,7 @@ typedef struct packed {
logic [31:0] pc; logic [31:0] pc;
} gpu_wspawn_t; } gpu_wspawn_t;
`define GPU_WSPAWN_SIZE (1+`NUM_WARPS+32) `define GPU_WSPAWN_BITS (1+`NUM_WARPS+32)
typedef struct packed { typedef struct packed {
logic valid; logic valid;
@@ -46,7 +46,7 @@ typedef struct packed {
logic [31:0] pc; logic [31:0] pc;
} gpu_split_t; } gpu_split_t;
`define GPU_SPLIT_SIZE (1+1+`NUM_THREADS+`NUM_THREADS+32) `define GPU_SPLIT_BITS (1+1+`NUM_THREADS+`NUM_THREADS+32)
typedef struct packed { typedef struct packed {
logic valid; logic valid;
@@ -54,6 +54,6 @@ typedef struct packed {
logic [`NW_BITS-1:0] size_m1; logic [`NW_BITS-1:0] size_m1;
} gpu_barrier_t; } gpu_barrier_t;
`define GPU_BARRIER_SIZE (1+`NB_BITS+`NW_BITS) `define GPU_BARRIER_BITS (1+`NB_BITS+`NW_BITS)
`endif `endif

14
hw/scripts/scope.json
View File

@@ -146,18 +146,12 @@
"wsched_warp_pc": "32" "wsched_warp_pc": "32"
}, },
"afu/vortex/cluster/core/pipeline/execute/gpu_unit": { "afu/vortex/cluster/core/pipeline/execute/gpu_unit": {
"?gpu_req_fire": 1,
"gpu_req_wid": "`NW_BITS",
"gpu_req_tmask": "`NUM_THREADS",
"gpu_req_op_type": "`GPU_BITS",
"gpu_req_rs1": "32",
"gpu_req_rs2": "32",
"?gpu_rsp_valid": 1, "?gpu_rsp_valid": 1,
"gpu_rsp_wid": "`NW_BITS", "gpu_rsp_wid": "`NW_BITS",
"gpu_rsp_tmc": "`GPU_TMC_SIZE", "gpu_rsp_tmc": "`GPU_TMC_BITS",
"gpu_rsp_wspawn": "`GPU_WSPAWN_SIZE", "gpu_rsp_wspawn": "`GPU_WSPAWN_BITS",
"gpu_rsp_split": "`GPU_SPLIT_SIZE", "gpu_rsp_split": "`GPU_SPLIT_BITS",
"gpu_rsp_barrier": "`GPU_BARRIER_SIZE" "gpu_rsp_barrier": "`GPU_BARRIER_BITS"
}, },
"afu/vortex/cluster/core/pipeline/execute/lsu_unit": { "afu/vortex/cluster/core/pipeline/execute/lsu_unit": {
"?dcache_req_fire":"`NUM_THREADS", "?dcache_req_fire":"`NUM_THREADS",

2
hw/scripts/scope.py
View File

@@ -240,7 +240,7 @@ def expand_text(text, params):
iter = 0 iter = 0
while True: while True:
if iter > 99: if iter > 65536:
raise Exception("Macro recursion!") raise Exception("Macro recursion!")
has_func = False has_func = False
while True: while True: