aco: don't split store data if it was already split into more elements

[mesa.git] / 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 1c152e5b73eacf0301e5cf02321f119bc80474f1..d4b0e0edbcf3e6acb2776e35846988bf8798bd7f 100644 (file)
--- a/src/amd/compiler/aco_print_asm.cpp
+++ b/src/amd/compiler/aco_print_asm.cpp
@@ -5,6 +5,9 @@
 #include "ac_llvm_util.h"
 
 #include <llvm/ADT/StringRef.h>
+#if LLVM_VERSION_MAJOR >= 11
+#include <llvm/MC/MCDisassembler/MCDisassembler.h>
+#endif
 
 namespace aco {
 
@@ -67,8 +70,16 @@ void print_asm_gfx6_gfx7(Program *program, std::vector<uint32_t>& binary,
 
    p = popen(command, "r");
    if (p) {
-      while (fgets(line, sizeof(line), p))
+      if (!fgets(line, sizeof(line), p)) {
+         out << "clrxdisasm not found\n";
+         pclose(p);
+         goto fail;
+      }
+
+      do {
          out << line;
+      } while (fgets(line, sizeof(line), p));
+
       pclose(p);
    }
 
@@ -92,7 +103,11 @@ void print_asm(Program *program, std::vector<uint32_t>& binary,
          referenced_blocks[succ] = true;
    }
 
+   #if LLVM_VERSION_MAJOR >= 11
+   std::vector<llvm::SymbolInfoTy> symbols;
+   #else
    std::vector<std::tuple<uint64_t, llvm::StringRef, uint8_t>> symbols;
+   #endif
    std::vector<std::array<char,16>> block_names;
    block_names.reserve(program->blocks.size());
    for (Block& block : program->blocks) {
@@ -127,7 +142,7 @@ void print_asm(Program *program, std::vector<uint32_t>& binary,
 
       /* mask out src2 on v_writelane_b32 */
       if (((program->chip_class == GFX8 || program->chip_class == GFX9) && (binary[pos] & 0xffff8000) == 0xd28a0000) ||
-          (program->chip_class == GFX10 && (binary[pos] & 0xffff8000) == 0xd7610000)) {
+          (program->chip_class >= GFX10 && (binary[pos] & 0xffff8000) == 0xd7610000)) {
          binary[pos+1] = binary[pos+1] & 0xF803FFFF;
       }
 
@@ -145,7 +160,7 @@ void print_asm(Program *program, std::vector<uint32_t>& binary,
          bool has_literal = program->chip_class >= GFX10 &&
                             (((binary[pos+1] & 0x1ff) == 0xff) || (((binary[pos+1] >> 9) & 0x1ff) == 0xff));
          new_pos = pos + 2 + has_literal;
-      } else if (program->chip_class == GFX10 && l == 4 && ((binary[pos] & 0xfe0001ff) == 0x020000f9)) {
+      } else if (program->chip_class >= GFX10 && l == 4 && ((binary[pos] & 0xfe0001ff) == 0x020000f9)) {
          out << std::left << std::setw(align_width) << std::setfill(' ') << "\tv_cndmask_b32 + sdwa";
          new_pos = pos + 2;
       } else if (!l) {