From bfb307aea922218cb72ffc9d977e88dfcadb2daf Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 31 Oct 2019 14:00:52 +0100 Subject: [PATCH] ac/llvm: fix the local invocation index for wave32 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes dEQP-VK.compute.builtin_var.local_invocation_index with RADV_PERFTEST=cswave32. My initial fix was to lower it but Rhys suggested the shift-right and it's much better like this. Signed-off-by: Samuel Pitoiset Reviewed-by: Marek Olšák Reviewed-by: Bas Nieuwenhuizen --- src/amd/llvm/ac_nir_to_llvm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c index 02a640603f3..8fae7bb5b77 100644 --- a/src/amd/llvm/ac_nir_to_llvm.c +++ b/src/amd/llvm/ac_nir_to_llvm.c @@ -2905,6 +2905,10 @@ visit_load_local_invocation_index(struct ac_nir_context *ctx) result = LLVMBuildAnd(ctx->ac.builder, ctx->abi->tg_size, LLVMConstInt(ctx->ac.i32, 0xfc0, false), ""); + if (ctx->ac.wave_size == 32) + result = LLVMBuildLShr(ctx->ac.builder, result, + LLVMConstInt(ctx->ac.i32, 1, false), ""); + return LLVMBuildAdd(ctx->ac.builder, result, thread_id, ""); } -- 2.30.2