diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2021-01-12 11:45:14 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-01-12 11:32:12 +0000 |
| commit | c24d6916e62be2b8bb8d537eae23339b7b9709fd (patch) | |
| tree | ca43ed0f882e1fba0794cd7a9170ca8aaeb93968 | |
| parent | 06ea5f49fa9da273c47b6ee311c27deca70b3036 (diff) | |
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@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8435>
| -rw-r--r-- | src/amd/compiler/aco_insert_waitcnt.cpp | 4 |
1 files 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; |