Mesa (master): aco: fix inserting expcnt for MIMG on GFX6

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Jan 12 11:45:14 2021 +0100

aco: fix inserting expcnt for MIMG on GFX6

MIMG VDATA has moved to its own operand.

Fixes: 962c917cea9 ("aco: move MIMG VDATA to its own operand")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8435>

---

 src/amd/compiler/aco_insert_waitcnt.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp
index b378136a793..87a7e0926f4 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -831,10 +831,10 @@ void gen(Instruction* instr, wait_ctx& ctx)
          insert_wait_entry(ctx, instr->operands[3], event_vmem_gpr_lock);
       } else if (ctx.chip_class == GFX6 &&
                  instr->format == Format::MIMG &&
-                 instr->operands[1].regClass().type() == RegType::vgpr) {
+                 instr->operands.size() >= 4) {
          ctx.exp_cnt++;
          update_counters(ctx, event_vmem_gpr_lock);
-         insert_wait_entry(ctx, instr->operands[1], event_vmem_gpr_lock);
+         insert_wait_entry(ctx, instr->operands[3], event_vmem_gpr_lock);
       }
 
       break;