From b03e07158331b2d37dab8a1183931ac55cb39758 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Mon, 21 Apr 2025 15:57:05 +0100 Subject: [PATCH] aco/gfx11: create waitcnt for workgroup vmem barriers It seems this is necessary on GFX11. Similar to 576a2e798ca46ac894c7794350943afbb91cd84c Signed-off-by: Rhys Perry Reviewed-by: Georg Lehmann Backport-to: 25.0 Backport-to: 25.1 Part-of: --- src/amd/compiler/aco_insert_waitcnt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp index afc515e098b..6916a0579e7 100644 --- a/src/amd/compiler/aco_insert_waitcnt.cpp +++ b/src/amd/compiler/aco_insert_waitcnt.cpp @@ -319,9 +319,9 @@ perform_barrier(wait_ctx& ctx, wait_imm& imm, memory_sync_info sync, unsigned se if (bar_scope_lds <= subgroup_scope) events &= ~event_lds; - /* Until GFX12, in non-WGP, the L1 (L0 on GFX10+) cache keeps all memory operations + /* Until GFX11, in non-WGP, the L1 (L0 on GFX10+) cache keeps all memory operations * in-order for the same workgroup */ - if (ctx.gfx_level < GFX12 && !ctx.program->wgp_mode && sync.scope <= scope_workgroup) + if (ctx.gfx_level < GFX11 && !ctx.program->wgp_mode && sync.scope <= scope_workgroup) events &= ~(event_vmem | event_vmem_store | event_smem); if (events)