Mesa (master): aco: fix incorrect cast in parse_wait_instr()

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Nov 29 18:07:20 UTC 2019


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

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Wed Nov 27 17:11:58 2019 +0000

aco: fix incorrect cast in parse_wait_instr()

s_waitcnt is SOPP, not SOPK

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>

---

 src/amd/compiler/aco_insert_waitcnt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp
index f3521013640..7960902d690 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -359,7 +359,7 @@ wait_imm parse_wait_instr(wait_ctx& ctx, Instruction *instr)
       imm.vs = std::min<uint8_t>(imm.vs, static_cast<SOPK_instruction*>(instr)->imm);
       return imm;
    } else if (instr->opcode == aco_opcode::s_waitcnt) {
-      return wait_imm(ctx.chip_class, static_cast<SOPK_instruction*>(instr)->imm);
+      return wait_imm(ctx.chip_class, static_cast<SOPP_instruction*>(instr)->imm);
    }
    return wait_imm();
 }




More information about the mesa-commit mailing list