From 7d9487439d9a864b3f1079e378c0ea0f72323d71 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Thu, 12 Jun 2025 10:06:45 +0100 Subject: [PATCH] ac/llvm: convert to integer after reductions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These return floating point types for floating point ops. Signed-off-by: Rhys Perry Backport-to: 25.1 Reviewed-by: Georg Lehmann Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 2ff53fd97cc93597d844ec287c7c85e44718941d) --- .pick_status.json | 2 +- src/amd/llvm/ac_nir_to_llvm.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 5ea024c29f1..0568231e1a5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1544,7 +1544,7 @@ "description": "ac/llvm: convert to integer after reductions", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c index e9365c53796..4bd0b31aa7e 100644 --- a/src/amd/llvm/ac_nir_to_llvm.c +++ b/src/amd/llvm/ac_nir_to_llvm.c @@ -2932,14 +2932,17 @@ static bool visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins case nir_intrinsic_reduce: result = ac_build_reduce(&ctx->ac, get_src(ctx, instr->src[0]), instr->const_index[0], instr->const_index[1]); + result = ac_to_integer(&ctx->ac, result); break; case nir_intrinsic_inclusive_scan: result = ac_build_inclusive_scan(&ctx->ac, get_src(ctx, instr->src[0]), instr->const_index[0]); + result = ac_to_integer(&ctx->ac, result); break; case nir_intrinsic_exclusive_scan: result = ac_build_exclusive_scan(&ctx->ac, get_src(ctx, instr->src[0]), instr->const_index[0]); + result = ac_to_integer(&ctx->ac, result); break; case nir_intrinsic_quad_broadcast: { unsigned lane = nir_src_as_uint(instr->src[1]);