From 65579d625ebb2e11884c32a153730059ea792669 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sat, 31 Aug 2019 11:40:32 -0700 Subject: [PATCH 1/3] nir/algebraic: Strip all modifiers from late DPH optimization --- src/compiler/nir/nir_opt_algebraic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index a94829d9bfb..93d33351ab6 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -1537,9 +1537,9 @@ late_optimizations = [ # fadd(ffma(v1.z, v2.z, ffma(v1.y, v2.y, fmul(v1.x, v2.x))), v1.w) # # Reassociate the last addition into the first multiplication. - (('~fadd', ('ffma(is_used_once)', a, b, ('ffma', c, d, ('fmul', 'e(is_not_const_and_not_fsign)', 'f(is_not_const_and_not_fsign)'))), 'g(is_not_const)'), + (('~fadd', ('ffma', a, b, ('ffma', c, d, ('fmul', e, 'f'))), 'g'), ('ffma', a, b, ('ffma', c, d, ('ffma', e, 'f', 'g'))), '!options->intel_vec4'), - (('~fadd', ('ffma(is_used_once)', a, b, ('fmul', 'e(is_not_const_and_not_fsign)', 'f(is_not_const_and_not_fsign)') ), 'g(is_not_const)'), + (('~fadd', ('ffma', a, b, ('fmul', e, 'f') ), 'g'), ('ffma', a, b, ('ffma', e, 'f', 'g') ), '!options->intel_vec4'), ] -- 2.21.0