diff options
| author | Timur Kristóf <timur.kristof@gmail.com> | 2020-12-10 18:54:43 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-12-11 09:41:40 -0800 |
| commit | 5e65a36a7f80b98eb9958e93aad393008527cad9 (patch) | |
| tree | 7ecfced4986647f85990bd79d76413daf3780335 | |
| parent | ac1145f704a7042dfced7e9aa268937d73dc2271 (diff) | |
aco: Use program->num_waves as maximum in scheduler.
The scheduler doesn't take SGPR use into account, which can be
a limiting factor on older GPUs. This patch fixes a CTS test crash
on GFX6.
CC: mesa-stable
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8040>
(cherry picked from commit 731f8fc9dd5018e9ee55982207b70130ab72d22b)
| -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))}; |