Module: Mesa Branch: staging/23.1 Commit: b239c60eabf3aa974019050c934224cc360769f1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b239c60eabf3aa974019050c934224cc360769f1
Author: Eric Engestrom <[email protected]> Date: Wed Oct 4 09:52:16 2023 +0100 Revert "nir/lower_int64: fix find_lsb(0)" This reverts commit 12849ec35bbc675aa4227b4d1504a7d3bfab7935. --- .pick_status.json | 2 +- src/compiler/nir/nir_lower_int64.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7a816c0aa97..0d589bfc849 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1975,7 +1975,7 @@ "description": "nir/lower_int64: fix find_lsb(0)", "nominated": true, "nomination_type": 1, - "resolution": 1, + "resolution": 0, "main_sha": null, "because_sha": "9293d8e64bc72ac15c075b67f711fa2d986bcafb" }, diff --git a/src/compiler/nir/nir_lower_int64.c b/src/compiler/nir/nir_lower_int64.c index 87b9ef6eced..c3e541e2228 100644 --- a/src/compiler/nir/nir_lower_int64.c +++ b/src/compiler/nir/nir_lower_int64.c @@ -711,11 +711,8 @@ lower_find_lsb64(nir_builder *b, nir_ssa_def *x) /* Use umin so that -1 (no bits found) becomes larger (0xFFFFFFFF) * than any actual bit position, so we return a found bit instead. - * This is similar to the ufind_msb lowering. If you need this lowering - * without uadd_sat, add code like in lower_ufind_msb64. */ - assert(!b->shader->options->lower_uadd_sat); - return nir_umin(b, lo_lsb, nir_uadd_sat(b, hi_lsb, nir_imm_int(b, 32))); + return nir_umin(b, lo_lsb, nir_iadd(b, hi_lsb, nir_imm_int(b, 32))); } static nir_ssa_def *
