commit 4257b87367017755832068b5409025f975b4cc57
author Daniel Schürmann <daniel@schuermann.dev> Mon Dec 28 19:15:17 2020 +0000
committer Dylan Baker <dylan.c.baker@intel.com> Tue Jan 26 09:20:59 2021 -0800
tree 1ff643645d087ee0a03127d34d546ed8ba1428ae
parent 773a46157ed5c3b8419c0815754ce5256e9c4e4a

aco/optimizer: don't propagate subdword temps of different size

It could happen that due to inconsistent copy-propagation

  v1 = p_parallelcopy v2b

instructions were left after optimization on GFX8.

Cc: 20.3
Cc: 21.0

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8260>
(cherry picked from commit 856fd4750daf23ac3f8f40278cf685f36661c19f)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index fe4bfc7..ecd3cf8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2497,7 +2497,7 @@
         "description": "aco/optimizer: don't propagate subdword temps of different size",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },

src/amd/compiler/aco_optimizer.cpp

diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp
index 91ec841..33310f2 100644
--- a/src/amd/compiler/aco_optimizer.cpp
+++ b/src/amd/compiler/aco_optimizer.cpp
@@ -858,7 +858,8 @@
          if (info.is_temp() && info.temp.type() == RegType::sgpr) {
             instr->operands[i].setTemp(info.temp);
             info = ctx.info[info.temp.id()];
-         } else if (info.is_temp() && info.temp.type() == RegType::vgpr) {
+         } else if (info.is_temp() && info.temp.type() == RegType::vgpr &&
+                    info.temp.bytes() == instr->operands[i].bytes()) {
             /* propagate vgpr if it can take it */
             switch (instr->opcode) {
             case aco_opcode::p_create_vector: