From 20df6c58cba079e5aff1f62a1c4b9669b08ec0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Mon, 17 May 2021 14:00:58 +0200 Subject: [PATCH] radv/llvm: Emit s_barrier at the beginning of NGG non-GS shaders. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is to fix a hang that can potentially happen when not every wave had launched when a gs_alloc_req is executed. Cc: mesa-stable Signed-off-by: Timur Kristóf Reviewed-by: Rhys Perry Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit 25314996d058629ff9d669fe917741c29222b35b) --- .pick_status.json | 2 +- src/amd/vulkan/radv_nir_to_llvm.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 52d64124efc..6c2de7abbbc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2650,7 +2650,7 @@ "description": "radv/llvm: Emit s_barrier at the beginning of NGG non-GS shaders.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index 39abac0d207..3d326c4d6f8 100644 --- a/src/amd/vulkan/radv_nir_to_llvm.c +++ b/src/amd/vulkan/radv_nir_to_llvm.c @@ -3023,6 +3023,10 @@ ac_translate_nir_to_llvm(struct ac_llvm_compiler *ac_llvm, struct nir_shader *co LLVMSetInitializer(ctx.gs_ngg_scratch, LLVMGetUndef(asi32)); LLVMSetAlignment(ctx.gs_ngg_scratch, 4); } + + /* GFX10 hang workaround - there needs to be an s_barrier before gs_alloc_req always */ + if (ctx.ac.chip_class == GFX10 && shader_count == 1) + ac_build_s_barrier(&ctx.ac); } for (int shader_idx = 0; shader_idx < shader_count; ++shader_idx) {