Mesa (master): aco: fix emitting SMEM instructions with no operands on GFX6-GFX7

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 68abc0731715b2ec3048d0944250b96a5302b4bc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=68abc0731715b2ec3048d0944250b96a5302b4bc

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Jan 15 13:08:17 2020 +0100

aco: fix emitting SMEM instructions with no operands on GFX6-GFX7

Like s_memtime.

Fixes dEQP-VK.glsl.shader_clock.* on GFX6.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3407>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3407>

---

 src/amd/compiler/aco_assembler.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index 69b8a9b33c6..a9dd6b441e2 100644
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -154,15 +154,17 @@ void emit_instruction(asm_context& ctx, std::vector<uint32_t>& out, Instruction*
          encoding |= opcode << 22;
          encoding |= instr->definitions.size() ? instr->definitions[0].physReg() << 15 : 0;
          encoding |= instr->operands.size() ? (instr->operands[0].physReg() >> 1) << 9 : 0;
-         if (!instr->operands[1].isConstant() || instr->operands[1].constantValue() >= 1024) {
-            encoding |= instr->operands[1].physReg().reg;
-         } else {
-            encoding |= instr->operands[1].constantValue() >> 2;
-            encoding |= 1 << 8;
+         if (instr->operands.size() >= 2) {
+            if (!instr->operands[1].isConstant() || instr->operands[1].constantValue() >= 1024) {
+               encoding |= instr->operands[1].physReg().reg;
+            } else {
+               encoding |= instr->operands[1].constantValue() >> 2;
+               encoding |= 1 << 8;
+            }
          }
          out.push_back(encoding);
          /* SMRD instructions can take a literal on GFX6 & GFX7 */
-         if (instr->operands[1].isConstant() && instr->operands[1].constantValue() >= 1024)
+         if (instr->operands.size() >= 2 && instr->operands[1].isConstant() && instr->operands[1].constantValue() >= 1024)
             out.push_back(instr->operands[1].constantValue() >> 2);
          return;
       }