From 8b656ca7ea26bb53e6058c10c0016e080c39930c Mon Sep 17 00:00:00 2001
From: Marc Glisse <marc.glisse@inria.fr>
Date: Thu, 18 May 2017 13:05:55 +0200
Subject: [PATCH] Move X==15-X to match.pd
2017-05-18 Marc Glisse <marc.glisse@inria.fr>
* fold-const.c (fold_binary_loc): Move transformation...
* match.pd (C - X CMP X): ... here.
From-SVN: r248193
---
gcc/ChangeLog | 5 +++++
gcc/fold-const.c | 24 ------------------------
gcc/match.pd | 7 +++++++
3 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9978bca0164..ee04a8606804 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-18 Marc Glisse <marc.glisse@inria.fr>
+
+ * fold-const.c (fold_binary_loc): Move transformation...
+ * match.pd (C - X CMP X): ... here.
+
2017-05-18 Sheldon Lobo <sheldon.lobo@oracle.com>
* config/sparc/sparc.c (sparc_option_override): Set function
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index f6d5af43b33a..19aa72258497 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -10532,30 +10532,6 @@ fold_binary_loc (location_t loc,
TREE_OPERAND (arg1, 0), arg0);
}
- /* Transform comparisons of the form C - X CMP X if C % 2 == 1. */
- if (TREE_CODE (arg0) == MINUS_EXPR
- && TREE_CODE (TREE_OPERAND (arg0, 0)) == INTEGER_CST
- && operand_equal_p (tree_strip_nop_conversions (TREE_OPERAND (arg0,
- 1)),
- arg1, 0)
- && wi::extract_uhwi (TREE_OPERAND (arg0, 0), 0, 1) == 1)
- return omit_two_operands_loc (loc, type,
- code == NE_EXPR
- ? boolean_true_node : boolean_false_node,
- TREE_OPERAND (arg0, 1), arg1);
-
- /* Transform comparisons of the form X CMP C - X if C % 2 == 1. */
- if (TREE_CODE (arg1) == MINUS_EXPR
- && TREE_CODE (TREE_OPERAND (arg1, 0)) == INTEGER_CST
- && operand_equal_p (tree_strip_nop_conversions (TREE_OPERAND (arg1,
- 1)),
- arg0, 0)
- && wi::extract_uhwi (TREE_OPERAND (arg1, 0), 0, 1) == 1)
- return omit_two_operands_loc (loc, type,
- code == NE_EXPR
- ? boolean_true_node : boolean_false_node,
- TREE_OPERAND (arg1, 1), arg0);
-
/* If this is an EQ or NE comparison with zero and ARG0 is
(1 << foo) & bar, convert it to (bar >> foo) & 1. Both require
two operations, but the latter can be done in one less insn
diff --git a/gcc/match.pd b/gcc/match.pd
index 80a17ba3d23a..ba501498cdd7 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -1090,6 +1090,13 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
|| TYPE_OVERFLOW_WRAPS (TREE_TYPE (@0))))
(op @1 @0))))
+/* X == C - X can never be true if C is odd. */
+(for cmp (eq ne)
+ (simplify
+ (cmp:c (convert? @0) (convert1? (minus INTEGER_CST@1 (convert2? @0))))
+ (if (TREE_INT_CST_LOW (@1) & 1)
+ { constant_boolean_node (cmp == NE_EXPR, type); })))
+
/* ((X inner_op C0) outer_op C1)
With X being a tree where value_range has reasoned certain bits to always be
zero throughout its computed value range,
--
GitLab