commit 33641b2a26a4fa74d3e71f6a69d206955764a461
author Rhys Perry <pendingchaos02@gmail.com> Thu Jun 23 16:30:17 2022 +0100
committer Marge Bot <emma+marge@anholt.net> Fri Jun 24 12:44:55 2022 +0000
tree c3e2f9385eadf03169e3f7ba43aacdbf0ef703a8
parent 9116b9f00db78f7129d47000f41e4295137c85fd

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@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17207>

src/amd/compiler/aco_insert_waitcnt.cpp

diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp
index 197d9d2..ad41b53 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -352,7 +352,7 @@
       /* 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)