commit 29cb3cba9ffde348aaf33576e5cbe974f024685c
author Rhys Perry <pendingchaos02@gmail.com> Mon Sep 07 20:20:50 2020 +0100
committer Marge Bot <eric+marge@anholt.net> Wed Sep 09 15:00:45 2020 +0000
tree f765ef55fdb9f5c5c3007a1ff7595cb83b0efe44
parent 36e58a14cc3dd057b2535e43ae87f25663113e52

aco: workaround disassembler bug of v_writelane_b32 with literal

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6662>

src/amd/compiler/aco_print_asm.cpp

diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp
index ce12aac..b9a6226 100644
--- a/src/amd/compiler/aco_print_asm.cpp
+++ b/src/amd/compiler/aco_print_asm.cpp
@@ -153,6 +153,13 @@
                                        (exec_size - pos) * sizeof(uint32_t), pos * 4,
                                        outline, sizeof(outline));
 
+      if (program->chip_class >= GFX10 && l == 8 &&
+          ((binary[pos] & 0xffff0000) == 0xd7610000) &&
+          ((binary[pos + 1] & 0x1ff) == 0xff)) {
+         /* v_writelane with literal uses 3 dwords but llvm consumes only 2 */
+         l += 4;
+      }
+
       size_t new_pos;
       if (!l &&
           ((program->chip_class >= GFX9 && (binary[pos] & 0xffff8000) == 0xd1348000) || /* v_add_u32_e64 + clamp */