Mesa (main): aco/assembler: Fix s_bitreplicate_b64_b32 on GFX9.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jul 8 10:34:24 UTC 2022


Module: Mesa
Branch: main
Commit: 4f5e25ea8d09b1058a85d08ecee132b733f60e86
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f5e25ea8d09b1058a85d08ecee132b733f60e86

Author: Georg Lehmann <dadschoorse at gmail.com>
Date:   Thu Jul  7 22:10:09 2022 +0200

aco/assembler: Fix s_bitreplicate_b64_b32 on GFX9.

This seems to be a relic from before aco added per generation opcodes.

Signed-off-by: Georg Lehmann <dadschoorse at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17405>

---

 src/amd/compiler/aco_assembler.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index 789ea65341f..4bccd57e4b5 100644
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -149,10 +149,6 @@ emit_instruction(asm_context& ctx, std::vector<uint32_t>& out, Instruction* inst
    }
    case Format::SOP1: {
       uint32_t encoding = (0b101111101 << 23);
-      if (opcode >= 55 && ctx.gfx_level <= GFX9) {
-         assert(ctx.gfx_level == GFX9 && opcode < 60);
-         opcode = opcode - 4;
-      }
       encoding |= !instr->definitions.empty() ? instr->definitions[0].physReg() << 16 : 0;
       encoding |= opcode << 8;
       encoding |= !instr->operands.empty() ? instr->operands[0].physReg() : 0;



More information about the mesa-commit mailing list