From 46494c3dc140d99391cf3b6f69c514489fab4784 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 15 May 2019 05:03:19 +0000 Subject: [PATCH] nir/algebraic: Remove problematic "optimization" This line is no longer relevant now that booleans are 1-bit, and in fact causes issues (infinite progress loop between algebraic optimizations and copy prop) with constant vector masks. No shader-db changes on Intel platforms (Jason). Signed-off-by: Alyssa Rosenzweig Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir_opt_algebraic.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index 1c7b3597c1f..89d07aa1261 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -621,9 +621,6 @@ optimizations = [ (('bcsel', True, b, c), b), (('bcsel', False, b, c), c), (('bcsel', a, ('b2f(is_used_once)', 'b@32'), ('b2f', 'c@32')), ('b2f', ('bcsel', a, b, c))), - # The result of this should be hit by constant propagation and, in the - # next round of opt_algebraic, get picked up by one of the above two. - (('bcsel', '#a', b, c), ('bcsel', ('ine', 'a', 0), b, c)), (('bcsel', a, b, b), b), (('fcsel', a, b, b), b), -- 2.30.2