commit 6db5fbf9f274cf433525628ed7a979f7a05cbd96
author Rhys Perry <pendingchaos02@gmail.com> Thu Oct 15 22:09:45 2020 +0100
committer Marge Bot <eric+marge@anholt.net> Tue Oct 27 15:24:38 2020 +0000
tree c38ad44b8128bac02ecbe43144c797f59ea9a67e
parent 74e2e9b682afe9f0e49e28facb2ecc387a8b4a74

aco: allow literals on sub-dword p_parallelcopy

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7216>

src/amd/compiler/aco_validate.cpp

diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp
index ef3b4c7..87a48d8 100644
--- a/src/amd/compiler/aco_validate.cpp
+++ b/src/amd/compiler/aco_validate.cpp
@@ -332,7 +332,7 @@
                   if (!instr->definitions[i].regClass().is_subdword())
                      continue;
                   Operand op = instr->operands[i];
-                  check(!op.isLiteral(), "Sub-dword copies cannot take literals", instr.get());
+                  check(program->chip_class >= GFX9 || !op.isLiteral(), "Sub-dword copies cannot take literals", instr.get());
                   if (op.isConstant() || (op.hasRegClass() && op.regClass().type() == RegType::sgpr))
                      check(program->chip_class >= GFX9, "Sub-dword pseudo instructions can only take constants or SGPRs on GFX9+", instr.get());
                }