Mesa (staging/19.3): aco: workaround Tonga/Iceland hardware bug
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Nov 11 19:45:56 UTC 2019
Module: Mesa
Branch: staging/19.3
Commit: 0aef18324a3a1d4768954cbe11c6ae43e5dadc12
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0aef18324a3a1d4768954cbe11c6ae43e5dadc12
Author: Daniel Schürmann <daniel at schuermann.dev>
Date: Wed Nov 6 18:25:15 2019 +0100
aco: workaround Tonga/Iceland hardware bug
The workaround got accidentally moved to the wrong place
Fixes: 08d510010b7586387e363460b98e6a45bbe97164 aco: increase accuracy of SGPR limits
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
(cherry picked from commit a47e232ccd1df7a3f5dd1f92722772e8b81c90ed)
---
src/amd/compiler/aco_instruction_selection_setup.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index 3ab8ebb19eb..b3789019862 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -1263,14 +1263,14 @@ setup_isel_context(Program* program,
} else if (program->chip_class >= GFX8) {
program->physical_sgprs = 800;
program->sgpr_alloc_granule = 15;
- program->sgpr_limit = 102;
- } else {
- program->physical_sgprs = 512;
- program->sgpr_alloc_granule = 7;
if (options->family == CHIP_TONGA || options->family == CHIP_ICELAND)
program->sgpr_limit = 94; /* workaround hardware bug */
else
- program->sgpr_limit = 104;
+ program->sgpr_limit = 102;
+ } else {
+ program->physical_sgprs = 512;
+ program->sgpr_alloc_granule = 7;
+ program->sgpr_limit = 104;
}
/* TODO: we don't have to allocate VCC if we don't need it */
program->needs_vcc = true;
More information about the mesa-commit
mailing list