diff options
| -rw-r--r-- | src/compiler/nir/nir_opt_algebraic.py | 4 | ||||
| -rw-r--r-- | src/compiler/nir/nir_search_helpers.h | 22 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index a557f7bf37d..d7ad1f2fbf3 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -522,6 +522,10 @@ late_optimizations = [ (('b2f(is_used_more_than_once)', ('inot', a)), ('bcsel', a, 0.0, 1.0)), (('fneg(is_used_more_than_once)', ('b2f', ('inot', a))), ('bcsel', a, -0.0, -1.0)), + + # we do these late so that we don't get in the way of creating ffmas + (('fmin', ('fadd(is_used_once)', '#c', a), ('fadd(is_used_once)', '#c', b)), ('fadd', c, ('fmin', a, b))), + (('fmax', ('fadd(is_used_once)', '#c', a), ('fadd(is_used_once)', '#c', b)), ('fadd', c, ('fmax', a, b))), ] print nir_algebraic.AlgebraicPass("nir_opt_algebraic", optimizations).render() diff --git a/src/compiler/nir/nir_search_helpers.h b/src/compiler/nir/nir_search_helpers.h index e925a2ba024..ddaff52311a 100644 --- a/src/compiler/nir/nir_search_helpers.h +++ b/src/compiler/nir/nir_search_helpers.h @@ -131,6 +131,28 @@ is_used_more_than_once(nir_alu_instr *instr) } static inline bool +is_used_once(nir_alu_instr *instr) +{ + bool zero_if_use = list_empty(&instr->dest.dest.ssa.if_uses); + bool zero_use = list_empty(&instr->dest.dest.ssa.uses); + + if (zero_if_use && zero_use) + return false; + + if (!zero_if_use && list_is_singular(&instr->dest.dest.ssa.uses)) + return false; + + if (!zero_use && list_is_singular(&instr->dest.dest.ssa.if_uses)) + return false; + + if (!list_is_singular(&instr->dest.dest.ssa.if_uses) && + !list_is_singular(&instr->dest.dest.ssa.uses)) + return false; + + return true; +} + +static inline bool is_not_used_by_if(nir_alu_instr *instr) { return list_empty(&instr->dest.dest.ssa.if_uses); |