Mesa (master): aco: fix typo in insert_waitcnt's kill()

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu May 21 13:15:49 UTC 2020


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

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Wed May 20 18:15:36 2020 +0100

aco: fix typo in insert_waitcnt's kill()

No shader-db changes

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3004
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5126>

---

 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 074112fc12d..d2d1c76c6c9 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -555,7 +555,7 @@ wait_imm kill(Instruction* instr, wait_ctx& ctx)
             ctx.wait_and_remove_from_entry(it->first, it->second, counter_vm);
          if (imm.lgkm != wait_imm::unset_counter && imm.lgkm <= it->second.imm.lgkm)
             ctx.wait_and_remove_from_entry(it->first, it->second, counter_lgkm);
-         if (imm.lgkm != wait_imm::unset_counter && imm.vs <= it->second.imm.vs)
+         if (imm.vs != wait_imm::unset_counter && imm.vs <= it->second.imm.vs)
             ctx.wait_and_remove_from_entry(it->first, it->second, counter_vs);
          if (!it->second.counters)
             it = ctx.gpr_map.erase(it);



More information about the mesa-commit mailing list