merge fixes

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

View file

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

View file

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

View file

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