From: Rhys Perry <pendingchaos02@gmail.com>
Date: Fri, 22 Nov 2019 19:38:51 +0000 (+0000)
Subject: aco: fix waitcnts for barriers at block ends
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=517728477cd5b682ea4c2474e73fdb71b449e6f5;p=mesa.git

aco: fix waitcnts for barriers at block ends

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

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);
 }