commit 9c6e0fb47615d380f3d1202a6718d2781af79197
author Rhys Perry <pendingchaos02@gmail.com> Tue Nov 24 20:40:56 2020 +0000
committer Dylan Baker <dylan.c.baker@intel.com> Tue Dec 01 09:12:32 2020 -0800
tree 5d78114ddcfab403c576666b9b5362f5883b1091
parent 7770f9a27df3ef3cd764e2ef3e42a81bca157ab8

aco: fix v_mul_hi_u32_u24 format

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Fixes: 57c152af9ce ("aco: select v_mul_{hi}_u32_u24 for 24-bit multiplications")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3874
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7759>
(cherry picked from commit cf0b54cdc16c9e7197954259e87ae194d65fb0ec)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 4d366a7..28d6e2c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2425,7 +2425,7 @@
         "description": "aco: fix v_mul_hi_u32_u24 format",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "57c152af9ce2e34c1a8724574c6a2c5d19c0c845"
     },

src/amd/compiler/aco_instruction_selection.cpp

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index ab4aba0..d678d0d 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -1745,7 +1745,7 @@
 
          Temp tmp = dst.regClass() == s1 ? bld.tmp(v1) : dst;
          if (src0_ub <= 0xffffff && src1_ub <= 0xffffff) {
-            emit_vop3a_instruction(ctx, instr, aco_opcode::v_mul_hi_u32_u24, tmp);
+            emit_vop2_instruction(ctx, instr, aco_opcode::v_mul_hi_u32_u24, tmp, true);
          } else {
             emit_vop3a_instruction(ctx, instr, aco_opcode::v_mul_hi_u32, tmp);
          }