diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/nir/nir_opt_algebraic.py | 13 | ||||
| -rw-r--r-- | src/compiler/nir/nir_search_helpers.h | 28 |
2 files changed, 41 insertions, 0 deletions
diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index 0a7369cd44d..e22e5bcb548 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -1597,6 +1597,19 @@ late_optimizations = [ (('fne', ('fneg', a), -1.0), ('fne', 1.0, a)), (('feq', -1.0, ('fneg', a)), ('feq', a, 1.0)), + # Replace signed range [0, constant b] checks with unsigned comparisons. + # This is limited to constant values because we have to ensure that "b" is + # not negative. + (('iand', ('ige', 'a@32', 0), ('ilt', a, '#b(is_ult_80000000)')), ('ult', a, b)), + (('iand', ('ige', 'a@32', 0), ('ige', '#b(is_ult_80000000)', a)), ('uge', b, a)), + (('iand', ('ilt', -1, 'a@32'), ('ilt', a, '#b(is_ult_80000000)')), ('ult', a, b)), + (('iand', ('ilt', -1, 'a@32'), ('ige', '#b(is_ult_80000000)', a)), ('uge', b, a)), + + (('ior', ('ilt', 'a@32', 0), ('ige', a, '#b(is_ult_80000000)')), ('uge', a, b)), + (('ior', ('ilt', 'a@32', 0), ('ilt', '#b(is_ult_80000000)', a)), ('ult', b, a)), + (('ior', ('ige', -1, 'a@32'), ('ige', a, '#b(is_ult_80000000)')), ('uge', a, b)), + (('ior', ('ige', -1, 'a@32'), ('ilt', '#b(is_ult_80000000)', a)), ('ult', b, a)), + (('ior', a, a), a), (('iand', a, a), a), diff --git a/src/compiler/nir/nir_search_helpers.h b/src/compiler/nir/nir_search_helpers.h index 0c2f631ac39..c9ac742b3f9 100644 --- a/src/compiler/nir/nir_search_helpers.h +++ b/src/compiler/nir/nir_search_helpers.h @@ -146,6 +146,34 @@ is_gt_0_and_lt_1(UNUSED struct hash_table *ht, nir_alu_instr *instr, return true; } +/** + * (unsigned)x < 0x80000000u + */ +static inline bool +is_ult_80000000(UNUSED struct hash_table *ht, nir_alu_instr *instr, + unsigned src, unsigned num_components, + const uint8_t *swizzle) +{ + /* only constant srcs: */ + if (!nir_src_is_const(instr->src[src].src)) + return false; + + for (unsigned i = 0; i < num_components; i++) { + switch (nir_op_infos[instr->op].input_types[src]) { + case nir_type_int: + case nir_type_uint: { + if (nir_src_comp_as_uint(instr->src[src].src, swizzle[i]) >= 0x80000000u) + return false; + break; + } + default: + return false; + } + } + + return true; +} + static inline bool is_not_const_zero(UNUSED struct hash_table *ht, nir_alu_instr *instr, unsigned src, unsigned num_components, |