Mesa (main): aco: cleanup force-waitcnt output

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jun 24 13:08:15 UTC 2022


Module: Mesa
Branch: main
Commit: 33641b2a26a4fa74d3e71f6a69d206955764a461
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33641b2a26a4fa74d3e71f6a69d206955764a461

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Thu Jun 23 16:30:17 2022 +0100

aco: cleanup force-waitcnt output

If we don't reset ctx.vm_cnt/gpr_map/etc, this will spam a lot of
s_waitcnt instructions.

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17207>

---

 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 197d9d2e021..ad41b5315d8 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -352,7 +352,7 @@ kill(wait_imm& imm, Instruction* instr, wait_ctx& ctx, memory_sync_info sync_inf
       /* Force emitting waitcnt states right after the instruction if there is
        * something to wait for.
        */
-      return force_waitcnt(ctx, imm);
+      force_waitcnt(ctx, imm);
    }
 
    if (ctx.exp_cnt || ctx.vm_cnt || ctx.lgkm_cnt)



More information about the mesa-commit mailing list