2015-09-30 Michael Collison <michael.collison@linaro.org>

	    Andrew Pinski <andrew.pinski@caviumnetworks.com>

	* match.pd ((x < y) && (x < z) -> x < min (y,z),
	(x > y) and (x > z) -> x > max (y,z))
	* testsuite/gcc.dg/tree-ssa/minmax-loopend.c: New test.

Co-Authored-By: Andrew Pinski <andrew.pinski@caviumnetworks.com>
From-SVN: r228854

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fbe7fabcb1573494dfe84d3026343d82ffc1a14c..17e690e3324047916806aecf0611f36354ca4622 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-16  Michael Collison  <michael.collison@linaro.org>
+           Andrew Pinski <andrew.pinski@caviumnetworks.com>
+
+       * match.pd ((x < y) && (x < z) -> x < min (y,z),
+       (x > y) and (x > z) -> x > max (y,z))
+
 2015-10-15  Gregor Richards  <gregor.richards@uwaterloo.ca>
            Szabolcs Nagy  <szabolcs.nagy@arm.com>
 

diff --git a/gcc/match.pd b/gcc/match.pd
index e0ecbe2e776587a3e08cb85e222987525b7ac647..f3813d87b5d5766cae10418a7517f3cfa5c7b9e8 100644 (file)
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -2431,3 +2431,13 @@ along with GCC; see the file COPYING3.  If not see
     (with { tree utype = unsigned_type_for (TREE_TYPE (@0)); }
      (convert (bit_and (op (convert:utype @0) (convert:utype @1))
               (convert:utype @4))))))))
+
+/* Transform (@0 < @1 and @0 < @2) to use min, 
+   (@0 > @1 and @0 > @2) to use max */
+(for op (lt le gt ge)
+     ext (min min max max)
+ (simplify
+  (bit_and (op:s @0 @1) (op:s @0 @2))
+  (if (INTEGRAL_TYPE_P (TREE_TYPE (@0)))
+   (op @0 (ext @1 @2)))))
+

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 181e5e482e01174a8e1a899f1cfaa668a165c310..fa4fb7da29aa57f1825fd409a4d7f6bb9fd4692e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-16  Michael Collison  <michael.collison@linaro.org>
+           Andrew Pinski <andrew.pinski@caviumnetworks.com>
+
+       * testsuite/gcc.dg/tree-ssa/minmax-loopend.c: New test.
+
 2015-10-15  Marek Polacek  <polacek@redhat.com>
 
        * gcc.dg/tree-ssa/reassoc-42.c: New test.

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-loopend.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-loopend.c
new file mode 100644 (file)
index 0000000..2e4300c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-loopend.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+int min_test(long a, long b, long c) {
+  int cmp1 = a < b;
+  int cmp2 = a < c;
+  return cmp1 & cmp2;
+}
+
+int max_test (long a, long b, long c) {
+  int cmp1 = a > b;
+  int cmp2 = a > c;
+  return cmp1 & cmp2;
+}
+
+/* { dg-final { scan-tree-dump-times "MIN_EXPR" 1 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "MAX_EXPR" 1 "optimized" } } */