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

Merge branch 'rtl' of github.com:hansungk/vortex-private into rtl

Browse Source
This commit is contained in:
Richard Yan
2024-10-24 16:51:22 -07:00
parent 155cbb0abc 40565de8cd
commit b64e53ff02
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hw/rtl/core/VX_scoreboard.sv
View File

@@ -248,6 +248,20 @@ module VX_scoreboard import VX_gpu_pkg::*; #(
.ready_out (scoreboard_if[i].ready) .ready_out (scoreboard_if[i].ready)
); );
// inflight_tensor overflow/underflow check
`RUNTIME_ASSERT(
!(writeback_fire && writeback_if[i].data.tensor) ||
inflight_tensor[writeback_if[i].data.wis] != INFLT_WIDTH'(0),
("%t: *** core%0d: wid=%0d, underflow at inflight_tensor!",
$time, CORE_ID, wis_to_wid(writeback_if[i].data.wis, i))
)
`RUNTIME_ASSERT(
!(ibuffer_if[i].valid && ibuffer_if[i].ready && hgmma_start) ||
inflight_tensor[ibuffer_if[i].data.wis] != INFLT_MAX,
("%t: *** core%0d: wid=%0d, overflow at inflight_tensor!",
$time, CORE_ID, wis_to_wid(ibuffer_if[i].data.wis, i))
)
always @(posedge clk) begin always @(posedge clk) begin
if (reset) begin if (reset) begin
inuse_regs <= '0; inuse_regs <= '0;
@@ -261,8 +275,8 @@ module VX_scoreboard import VX_gpu_pkg::*; #(
end end
`ifdef EXT_T_HOPPER `ifdef EXT_T_HOPPER
if (writeback_fire && writeback_if[i].data.tensor) begin if (writeback_fire && writeback_if[i].data.tensor) begin
inflight_tensor[ibuffer_if[i].data.wis] <= inflight_tensor[writeback_if[i].data.wis] <=
inflight_tensor[ibuffer_if[i].data.wis] - INFLT_WIDTH'(1); inflight_tensor[writeback_if[i].data.wis] - INFLT_WIDTH'(1);
end end
if (ibuffer_if[i].valid && ibuffer_if[i].ready && hgmma_start) begin if (ibuffer_if[i].valid && ibuffer_if[i].ready && hgmma_start) begin
inflight_tensor[ibuffer_if[i].data.wis] <= inflight_tensor[ibuffer_if[i].data.wis] <=
@@ -305,7 +319,9 @@ module VX_scoreboard import VX_gpu_pkg::*; #(
$time, CORE_ID, wis_to_wid(ibuffer_if[i].data.wis, i), ibuffer_if[i].data.PC, ibuffer_if[i].data.tmask, timeout_ctr, $time, CORE_ID, wis_to_wid(ibuffer_if[i].data.wis, i), ibuffer_if[i].data.PC, ibuffer_if[i].data.tmask, timeout_ctr,
operands_busy, ibuffer_if[i].data.uuid)); operands_busy, ibuffer_if[i].data.uuid));
`RUNTIME_ASSERT(~writeback_fire || inuse_regs[writeback_if[i].data.wis][writeback_if[i].data.rd] != 0, `RUNTIME_ASSERT((~writeback_fire ||
writeback_if[i].data.tensor /* dont check rd for tensor ghost writes */ ||
inuse_regs[writeback_if[i].data.wis][writeback_if[i].data.rd] != 0),
("%t: *** core%0d: invalid writeback register: wid=%0d, PC=0x%0h, tmask=%b, rd=%0d (#%0d)", ("%t: *** core%0d: invalid writeback register: wid=%0d, PC=0x%0h, tmask=%b, rd=%0d (#%0d)",
$time, CORE_ID, wis_to_wid(writeback_if[i].data.wis, i), writeback_if[i].data.PC, writeback_if[i].data.tmask, writeback_if[i].data.rd, writeback_if[i].data.uuid)); $time, CORE_ID, wis_to_wid(writeback_if[i].data.wis, i), writeback_if[i].data.PC, writeback_if[i].data.tmask, writeback_if[i].data.rd, writeback_if[i].data.uuid));
`endif `endif

4
hw/rtl/core/VX_tensor_hopper_core.sv
View File

@@ -89,7 +89,9 @@ module VX_tensor_hopper_core_block import VX_gpu_pkg::*; #(
wire hmma_wait = metadata_valid && wire hmma_wait = metadata_valid &&
(execute_if_data_op_type == `INST_TENSOR_HGMMA_WAIT); (execute_if_data_op_type == `INST_TENSOR_HGMMA_WAIT);
// skip HGMMA_WAIT for kickoff // skip HGMMA_WAIT for kickoff
wire initiate_valid = metadata_valid && !hmma_wait; // should be metadata_deq not metadata_valid, since initiate should be
// synced with metadata->commit path
wire initiate_valid = metadata_deq && !hmma_wait;
wire [`NW_WIDTH-1:0] initiate_wid = execute_if_data_wid; wire [`NW_WIDTH-1:0] initiate_wid = execute_if_data_wid;
// we're recycling execute_if.op_type as operands_if.op_type which might // we're recycling execute_if.op_type as operands_if.op_type which might