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

merge fixes

Browse Source
This commit is contained in:
Blaise Tine
2021-10-17 18:33:02 -07:00
parent bf72800676
commit 0d62129d32
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/blackbox.sh
View File

@@ -12,7 +12,7 @@ VORTEX_HOME=$SCRIPT_DIR/..
DRIVER=vlsim DRIVER=vlsim
APP=sgemm APP=sgemm
CLUSTERS=1 CLUSTERS=1
CORES=2 CORES=1
WARPS=4 WARPS=4
THREADS=4 THREADS=4
L2=0 L2=0

3
hw/rtl/VX_decode.sv
View File

@@ -380,7 +380,8 @@ module VX_decode #(
3'h5: begin 3'h5: begin
op_type = `INST_OP_BITS'(`INST_GPU_TEX); op_type = `INST_OP_BITS'(`INST_GPU_TEX);
op_mod = `INST_MOD_BITS'(func2); op_mod = `INST_MOD_BITS'(func2);
use_rd = 1; use_rd = 1;
`USED_IREG (rd);
`USED_IREG (rs1); `USED_IREG (rs1);
`USED_IREG (rs2); `USED_IREG (rs2);
`USED_IREG (rs3); `USED_IREG (rs3);

4
hw/rtl/VX_warp_sched.sv
View File

@@ -71,8 +71,8 @@ module VX_warp_sched #(
// activate first warp // activate first warp
warp_pcs[0] <= `STARTUP_ADDR; warp_pcs[0] <= `STARTUP_ADDR;
active_warps[0] <= '1; active_warps[0] <= 1;
thread_masks[0] <= '1; thread_masks[0] <= 1;
end else begin end else begin
if (warp_ctl_if.valid && warp_ctl_if.wspawn.valid) begin if (warp_ctl_if.valid && warp_ctl_if.wspawn.valid) begin
use_wspawn <= warp_ctl_if.wspawn.wmask & (~`NUM_WARPS'(1)); use_wspawn <= warp_ctl_if.wspawn.wmask & (~`NUM_WARPS'(1));