Mesa (master): aco: fix waitcnts for barriers at block ends

[GitLab Mirror]

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

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Fri Nov 22 19:38:51 2019 +0000

aco: fix waitcnts for barriers at block ends

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Fixes: d1b9deee ('aco: improve waitcnt insertion around loops')
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>

---

 src/amd/compiler/aco_insert_waitcnt.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp
index 725e8914071..f3521013640 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -729,6 +729,9 @@ void handle_block(Program *program, Block& block, wait_ctx& ctx)
       }
    }
 
+   if (!queued_imm.empty())
+      emit_waitcnt(ctx, new_instructions, queued_imm);
+
    block.instructions.swap(new_instructions);
 }