From dc3bbd351a081a90b57a8772ade8d693048f6403 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timur=20Krist=C3=B3f?= Date: Tue, 4 Jul 2023 14:28:45 +0200 Subject: [PATCH] aco: Fix subgroup_id intrinsic on GFX10.3+. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change this to match how it works in the LLVM backend. Cc: mesa-stable Signed-off-by: Timur Kristóf Reviewed-by: Rhys Perry Part-of: --- src/amd/compiler/aco_instruction_selection.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 84a7ee0..b349f15 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -8235,9 +8235,10 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr) } case nir_intrinsic_load_subgroup_id: { if (ctx->stage.hw == AC_HW_COMPUTE_SHADER) { + const unsigned bfe_const = + ctx->program->gfx_level >= GFX10_3 ? (0x14u | 0x5u << 16) : (0x6u | (0x6u << 16)); bld.sop2(aco_opcode::s_bfe_u32, Definition(get_ssa_temp(ctx, &instr->dest.ssa)), - bld.def(s1, scc), get_arg(ctx, ctx->args->tg_size), - Operand::c32(0x6u | (0x6u << 16))); + bld.def(s1, scc), get_arg(ctx, ctx->args->tg_size), Operand::c32(bfe_const)); } else if (ctx->stage.hw == AC_HW_NEXT_GEN_GEOMETRY_SHADER) { /* Get the id of the current wave within the threadgroup (workgroup) */ bld.sop2(aco_opcode::s_bfe_u32, Definition(get_ssa_temp(ctx, &instr->dest.ssa)), -- 2.7.4