From d3a48c272fe83c1b8757565aff94d6c85e2492e0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
Date: Thu, 26 Sep 2019 17:50:48 +0200
Subject: [PATCH] aco: Support GFX10 EXP in aco_assembler.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
---
 src/amd/compiler/aco_assembler.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index 39bf9eca21c..9070d88e1c6 100644
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -415,7 +415,13 @@ void emit_instruction(asm_context& ctx, std::vector<uint32_t>& out, Instruction*
    }
    case Format::EXP: {
       Export_instruction* exp = static_cast<Export_instruction*>(instr);
-      uint32_t encoding = (0b110001 << 26);
+      uint32_t encoding;
+      if (ctx.chip_class <= GFX9) {
+         encoding = (0b110001 << 26);
+      } else if (ctx.chip_class >= GFX10) {
+         encoding = (0b111110 << 26);
+      }
+
       encoding |= exp->valid_mask ? 0b1 << 12 : 0;
       encoding |= exp->done ? 0b1 << 11 : 0;
       encoding |= exp->compressed ? 0b1 << 10 : 0;
-- 
2.30.2