From: Daniel Schürmann <daniel@schuermann.dev>
Date: Fri, 21 Feb 2020 16:06:32 +0000 (+0100)
Subject: aco: don't propagate SGPRs into subdword PSEUDO instructions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c436743b0c43f73b205b8845453fdbaada63f0d8;p=mesa.git

aco: don't propagate SGPRs into subdword PSEUDO instructions

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-By: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4002>
---

diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp
index a6b68dd5448..f3819676df9 100644
--- a/src/amd/compiler/aco_optimizer.cpp
+++ b/src/amd/compiler/aco_optimizer.cpp
@@ -698,8 +698,12 @@ void label_instruction(opt_ctx &ctx, Block& block, aco_ptr<Instruction>& instr)
       /* SALU / PSEUDO: propagate inline constants */
       if (instr->isSALU() || instr->format == Format::PSEUDO) {
          if (info.is_temp() && info.temp.type() == RegType::sgpr) {
-            instr->operands[i].setTemp(info.temp);
-            info = ctx.info[info.temp.id()];
+            const bool is_subdword = std::any_of(instr->definitions.begin(), instr->definitions.end(),
+                                                 [] (const Definition& def) { return def.regClass().is_subdword();});
+            if (instr->isSALU() || !is_subdword) {
+               instr->operands[i].setTemp(info.temp);
+               info = ctx.info[info.temp.id()];
+            }
          } else if (info.is_temp() && info.temp.type() == RegType::vgpr) {
             /* propagate vgpr if it can take it */
             switch (instr->opcode) {