summaryrefslogtreecommitdiff
path: root/src/amd/compiler/aco_insert_waitcnt.cpp
diff options
context:
space:
mode:
authorRhys Perry <pendingchaos02@gmail.com>2021-01-28 11:07:26 +0000
committerRhys Perry <pendingchaos02@gmail.com>2021-02-15 13:35:14 +0000
commitf520f4c299c2c976c14eeea8bd0691e709d5e6db (patch)
tree2176bd6e26457f297d9ddfa1a522af568735cdb3 /src/amd/compiler/aco_insert_waitcnt.cpp
parent592d64611c6bde8bbdba4dd48f424c3b5aa75ea9 (diff)
downloadmesa-f520f4c299c2c976c14eeea8bd0691e709d5e6db.tar.gz
aco: add Program::wgp_mode
Instead of assuming WGP mode on GFX10+ in different places, add a member to Program that can be used instead. Signed-off-by: Rhys Perry <pendingchaos02@gmail.com> Reviewed-by: Daniel Schürmann <daniel@schuermann.dev> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8761>
Diffstat (limited to 'src/amd/compiler/aco_insert_waitcnt.cpp')
-rw-r--r--src/amd/compiler/aco_insert_waitcnt.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp
index 30155e3ee7b..43c95ebb3eb 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -461,8 +461,8 @@ wait_imm perform_barrier(wait_ctx& ctx, memory_sync_info sync, unsigned semantic
if (bar_scope_lds <= subgroup_scope)
events &= ~event_lds;
- /* in non-WGP, the L1/L0 cache keeps all memory operations in-order for the same workgroup */
- if (ctx.chip_class < GFX10 && sync.scope <= scope_workgroup)
+ /* in non-WGP, the L1 (L0 on GFX10+) cache keeps all memory operations in-order for the same workgroup */
+ if (!ctx.program->wgp_mode && sync.scope <= scope_workgroup)
events &= ~(event_vmem | event_vmem_store | event_smem);
if (events)