diff options
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/compiler/aco_scheduler.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index a551e08e696..01a4c4348b7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -49,7 +49,7 @@ "description": "aco: Use program->num_waves as maximum in scheduler.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/amd/compiler/aco_scheduler.cpp b/src/amd/compiler/aco_scheduler.cpp index 1ad01cb37cc..1c6060a48f4 100644 --- a/src/amd/compiler/aco_scheduler.cpp +++ b/src/amd/compiler/aco_scheduler.cpp @@ -910,9 +910,9 @@ void schedule_program(Program *program, live& live_vars) else ctx.num_waves = 7; ctx.num_waves = std::max<uint16_t>(ctx.num_waves, program->min_waves); - ctx.num_waves = std::min<uint16_t>(ctx.num_waves, program->max_waves); + ctx.num_waves = std::min<uint16_t>(ctx.num_waves, program->num_waves); - assert(ctx.num_waves > 0 && ctx.num_waves <= program->num_waves); + assert(ctx.num_waves > 0); ctx.mv.max_registers = { int16_t(get_addr_vgpr_from_waves(program, ctx.num_waves) - 2), int16_t(get_addr_sgpr_from_waves(program, ctx.num_waves))}; |