Mesa (main): nir/unsigned_upper_bound: don't follow 64-bit f2u32()

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d95a0b52e45f8c16e72bdcad99ad02ccca1756c3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d95a0b52e45f8c16e72bdcad99ad02ccca1756c3

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Fri Jan 14 13:41:55 2022 +0000

nir/unsigned_upper_bound: don't follow 64-bit f2u32()

Fixes Doom Eternal crash.

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Fixes: 72ac3f60261 ("nir: add nir_unsigned_upper_bound and nir_addition_might_overflow")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14555>

---

 src/compiler/nir/nir_range_analysis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_range_analysis.c b/src/compiler/nir/nir_range_analysis.c
index a50e43651bb..8cdefb8fe3d 100644
--- a/src/compiler/nir/nir_range_analysis.c
+++ b/src/compiler/nir/nir_range_analysis.c
@@ -1465,7 +1465,6 @@ nir_unsigned_upper_bound(nir_shader *shader, struct hash_table *range_ht,
       case nir_op_b32csel:
       case nir_op_ubfe:
       case nir_op_bfm:
-      case nir_op_f2u32:
       case nir_op_fmul:
       case nir_op_extract_u8:
       case nir_op_extract_i8:
@@ -1476,6 +1475,7 @@ nir_unsigned_upper_bound(nir_shader *shader, struct hash_table *range_ht,
       case nir_op_u2u8:
       case nir_op_u2u16:
       case nir_op_u2u32:
+      case nir_op_f2u32:
          if (nir_ssa_scalar_chase_alu_src(scalar, 0).def->bit_size > 32) {
             /* If src is >32 bits, return max */
             return max;