re PR other/63387 (Optimize pairs of isnan() calls into a single isunordered())

2015-05-22  Marc Glisse  <marc.glisse@inria.fr>

	PR tree-optimization/63387
gcc/
	* match.pd ((X /[ex] A) * A -> X): Remove unnecessary condition.
	((x ord x) & (y ord y) -> (x ord y),
	(x ord x) & (x ord y) -> (x ord y)): New simplifications.
	* fold-const.c (tree_unary_nonnegative_warnv_p) <ABS_EXPR>: Handle
	vectors like scalars.
gcc/testsuite/
	* gcc.dg/pr63387-2.c: New testcase.

From-SVN: r223591

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index da465838256de7e50ec40b644e2b20f302403551..3d38d45d484e4c5ec8e9b1a969151cb1ac8caeb7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2015-05-22  Marc Glisse  <marc.glisse@inria.fr>
+
+       PR tree-optimization/63387
+       * match.pd ((X /[ex] A) * A -> X): Remove unnecessary condition.
+       ((x ord x) & (y ord y) -> (x ord y),
+       (x ord x) & (x ord y) -> (x ord y)): New simplifications.
+       * fold-const.c (tree_unary_nonnegative_warnv_p) <ABS_EXPR>: Handle
+       vectors like scalars.
+
 2015-05-22  Marc Glisse  <marc.glisse@inria.fr>
 
        * convert.c (convert_to_integer, convert_to_vector): Include the

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 1476ee0b1edecba7ca86a927518efd0ef2b11624..c38a63336d346f08e21a3934953fa50ea3e9701c 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -14688,7 +14688,7 @@ tree_unary_nonnegative_warnv_p (enum tree_code code, tree type, tree op0,
     case ABS_EXPR:
       /* We can't return 1 if flag_wrapv is set because
         ABS_EXPR<INT_MIN> = INT_MIN.  */
-      if (!INTEGRAL_TYPE_P (type))
+      if (!ANY_INTEGRAL_TYPE_P (type))
        return true;
       if (TYPE_OVERFLOW_UNDEFINED (type))
        {

diff --git a/gcc/match.pd b/gcc/match.pd
index 33419ebdcb651676adc35ecdac23f62731d4a280..3ac364552782ea6346d96511d9094759340cdbab 100644 (file)
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -818,8 +818,7 @@ along with GCC; see the file COPYING3.  If not see
 (simplify
   (mult (convert? (exact_div @0 @1)) @1)
   /* Look through a sign-changing conversion.  */
-  (if (TYPE_PRECISION (TREE_TYPE (@0)) == TYPE_PRECISION (type))
-   (convert @0)))
+  (convert @0))
 
 /* Canonicalization of binary operations.  */
 
@@ -970,9 +969,16 @@ along with GCC; see the file COPYING3.  If not see
  (bit_ior (unordered @0 @0) (unordered @1 @1))
  (if (types_match (@0, @1))
   (unordered @0 @1)))
+(simplify
+ (bit_and (ordered @0 @0) (ordered @1 @1))
+ (if (types_match (@0, @1))
+  (ordered @0 @1)))
 (simplify
  (bit_ior:c (unordered @0 @0) (unordered:c@2 @0 @1))
  @2)
+(simplify
+ (bit_and:c (ordered @0 @0) (ordered:c@2 @0 @1))
+ @2)
 
 /* Simplification of math builtins.  */
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 63ebd45dc9848e9c79e89daee626ff6675828a86..fe5d962c36c16a3e42c0cd7bdbeef4d6b3737cf3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-22  Marc Glisse  <marc.glisse@inria.fr>
+
+       PR tree-optimization/63387
+       * gcc.dg/pr63387-2.c: New testcase.
+
 2015-05-22  Marc Glisse  <marc.glisse@inria.fr>
 
        * gcc.dg/simd-1.c: Update to the new message.

diff --git a/gcc/testsuite/gcc.dg/pr63387-2.c b/gcc/testsuite/gcc.dg/pr63387-2.c
new file mode 100644 (file)
index 0000000..872195a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr63387-2.c
@@ -0,0 +1,26 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fdump-tree-optimized" } */
+
+int f(double aaa, double bbb){
+  int xa = !__builtin_isunordered(aaa, aaa);
+  int xb = !__builtin_isunordered(bbb, bbb);
+  return xa & xb;
+}
+
+int g(double aaa, double bbb){
+  int xa = !__builtin_isunordered(aaa, bbb);
+  int xb = !__builtin_isunordered(bbb, bbb);
+  return xa & xb;
+}
+
+int h(double ccc, float ddd){
+  int xc = !__builtin_isunordered(ccc, ccc);
+  int xd = !__builtin_isunordered(ddd, ddd);
+  return xc & xd;
+}
+
+/* { dg-final { scan-tree-dump-not "aaa\[^\n\r\]* ord aaa" "optimized" } } */
+/* { dg-final { scan-tree-dump-not "bbb\[^\n\r\]* ord bbb" "optimized" } } */
+/* { dg-final { scan-tree-dump-times "aaa\[^\n\r\]* ord bbb" 2 "optimized" } } */
+/* { dg-final { scan-tree-dump-not "ccc\[^\n\r\]* ord ddd" "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */