From 4bd75f552ce16a6edeab59650f0e258f2b2f3dcd Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 12 May 2025 12:38:17 -0400 Subject: [PATCH] gallivm: Use `llvm.roundeven` in lp_build_round() `lp_build_round` intends to implement round with ties-to-even behavior, as can be seen by its test's use of `nearbyint` to generate reference values and by it use in implementing `nir_op_fround_even`. Fixes: 0d3b2853600 ("gallivm: use llvm intrinsics for 16-bit round/trunc/roundeven") Part-of: (cherry picked from commit eea3ed6a3704dbd90913906c22b585eefb22a1cc) --- .pick_status.json | 2 +- src/gallium/auxiliary/gallivm/lp_bld_arit.c | 2 +- src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 23b526c1f6a..7b0641cdd3f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -284,7 +284,7 @@ "description": "gallivm: Use `llvm.roundeven` in lp_build_round()", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0d3b2853600cf6934a3a09deaf435944d18d833a", "notes": null diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c index 68757fc252d..59ebf429a57 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c @@ -2120,7 +2120,7 @@ lp_build_round(struct lp_build_context *bld, if (type.width == 16) { char intrinsic[64]; - lp_format_intrinsic(intrinsic, 64, "llvm.round", bld->vec_type); + lp_format_intrinsic(intrinsic, 64, "llvm.roundeven", bld->vec_type); return lp_build_intrinsic_unary(builder, intrinsic, bld->vec_type, a); } diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c index 79e46c0fbca..e9f61805fbd 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c @@ -3343,13 +3343,7 @@ do_alu_action(struct lp_build_nir_soa_context *bld, result = lp_build_rcp(float_bld, src[0]); break; case nir_op_fround_even: - if (src_bit_size[0] == 16) { - char intrinsic[64]; - lp_format_intrinsic(intrinsic, 64, "llvm.roundeven", float_bld->vec_type); - result = lp_build_intrinsic_unary(builder, intrinsic, float_bld->vec_type, src[0]); - } else { - result = lp_build_round(float_bld, src[0]); - } + result = lp_build_round(float_bld, src[0]); break; case nir_op_frsq: result = lp_build_rsqrt(float_bld, src[0]);