diff --git a/src/compiler/nir/nir_range_analysis.c b/src/compiler/nir/nir_range_analysis.c index 94859979276..089b8949609 100644 --- a/src/compiler/nir/nir_range_analysis.c +++ b/src/compiler/nir/nir_range_analysis.c @@ -1850,9 +1850,17 @@ get_alu_uub(struct analysis_state *state, struct uub_query q, uint32_t *result, case nir_op_umax: *result = src[0] > src[1] ? src[0] : src[1]; break; - case nir_op_iand: - *result = bitmask(util_last_bit64(src[0])) & bitmask(util_last_bit64(src[1])); + case nir_op_iand: { + nir_scalar src0_scalar = nir_scalar_chase_alu_src(q.scalar, 0); + nir_scalar src1_scalar = nir_scalar_chase_alu_src(q.scalar, 1); + if (nir_scalar_is_const(src0_scalar)) + *result = bitmask(util_last_bit64(src[1])) & nir_scalar_as_uint(src0_scalar); + else if (nir_scalar_is_const(src1_scalar)) + *result = bitmask(util_last_bit64(src[0])) & nir_scalar_as_uint(src1_scalar); + else + *result = bitmask(util_last_bit64(src[0])) & bitmask(util_last_bit64(src[1])); break; + } case nir_op_ior: case nir_op_ixor: *result = bitmask(util_last_bit64(src[0])) | bitmask(util_last_bit64(src[1]));