AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: Use program->num_waves as maximum in scheduler.

Browse Source 
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>
This commit is contained in:
Timur Kristóf
2020-12-10 18:54:43 +01:00
committed by Marge Bot
parent b548512813
commit 731f8fc9dd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_scheduler.cpp
+2 -2
View File
@@ -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))};