backport: [multiple changes]

2014-04-23  Richard Biener  <rguenther@suse.de>

	Backport from mainline
	2014-04-02  Richard Biener  <rguenther@suse.de>

	PR middle-end/60729
	* optabs.c (expand_abs_nojump): Honor flag_trapv only for
	MODE_INTs.  Properly use negv_optab.
	(expand_abs): Likewise.

	* g++.dg/vect/pr60729.cc: New testcase.

	2014-04-03  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/60740
	* graphite-scop-detection.c (stmt_simple_for_scop_p): Iterate
	over all GIMPLE_COND operands.

	* gcc.dg/graphite/pr60740.c: New testcase.

From-SVN: r209697

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8f7d2441d06043018f5603e511925121965843c4..6ef4c16b38806cf6da9efa67f19b0d2ff64f049f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,19 @@
+2014-04-23  Richard Biener  <rguenther@suse.de>
+
+       Backport from mainline
+       2014-04-02  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/60729
+       * optabs.c (expand_abs_nojump): Honor flag_trapv only for
+       MODE_INTs.  Properly use negv_optab.
+       (expand_abs): Likewise.
+
+       2014-04-03  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/60740
+       * graphite-scop-detection.c (stmt_simple_for_scop_p): Iterate
+       over all GIMPLE_COND operands.
+
 2014-04-23  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/60635

diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index ab2897d5c4308bf96e0a2543b1900afe3f623a2a..bd0ec8928325f225e2ecb20d7279db1866fb6fba 100644 (file)
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -330,13 +330,10 @@ stmt_simple_for_scop_p (basic_block scop_entry, loop_p outermost_loop,
 
     case GIMPLE_COND:
       {
-       tree op;
-       ssa_op_iter op_iter;
-        enum tree_code code = gimple_cond_code (stmt);
-
        /* We can handle all binary comparisons.  Inequalities are
           also supported as they can be represented with union of
           polyhedra.  */
+        enum tree_code code = gimple_cond_code (stmt);
         if (!(code == LT_EXPR
              || code == GT_EXPR
              || code == LE_EXPR
@@ -345,11 +342,14 @@ stmt_simple_for_scop_p (basic_block scop_entry, loop_p outermost_loop,
              || code == NE_EXPR))
           return false;
 
-       FOR_EACH_SSA_TREE_OPERAND (op, stmt, op_iter, SSA_OP_ALL_USES)
-         if (!graphite_can_represent_expr (scop_entry, loop, op)
-             /* We can not handle REAL_TYPE. Failed for pr39260.  */
-             || TREE_CODE (TREE_TYPE (op)) == REAL_TYPE)
-           return false;
+       for (unsigned i = 0; i < 2; ++i)
+         {
+           tree op = gimple_op (stmt, i);
+           if (!graphite_can_represent_expr (scop_entry, loop, op)
+               /* We can not handle REAL_TYPE. Failed for pr39260.  */
+               || TREE_CODE (TREE_TYPE (op)) == REAL_TYPE)
+             return false;
+         }
 
        return true;
       }

diff --git a/gcc/optabs.c b/gcc/optabs.c
index afb9b5f69711c9c445a71bbd5ecb1e075aaffa9e..dbf83076f2ba04815dfaa154c9324c6de1fccca1 100644 (file)
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -3376,7 +3376,8 @@ expand_abs_nojump (enum machine_mode mode, rtx op0, rtx target,
 {
   rtx temp;
 
-  if (! flag_trapv)
+  if (GET_MODE_CLASS (mode) != MODE_INT
+      || ! flag_trapv)
     result_unsignedp = 1;
 
   /* First try to do it with a special abs instruction.  */
@@ -3399,7 +3400,8 @@ expand_abs_nojump (enum machine_mode mode, rtx op0, rtx target,
     {
       rtx last = get_last_insn ();
 
-      temp = expand_unop (mode, neg_optab, op0, NULL_RTX, 0);
+      temp = expand_unop (mode, result_unsignedp ? neg_optab : negv_optab,
+                         op0, NULL_RTX, 0);
       if (temp != 0)
        temp = expand_binop (mode, smax_optab, op0, temp, target, 0,
                             OPTAB_WIDEN);
@@ -3441,7 +3443,8 @@ expand_abs (enum machine_mode mode, rtx op0, rtx target,
 {
   rtx temp, op1;
 
-  if (! flag_trapv)
+  if (GET_MODE_CLASS (mode) != MODE_INT
+      || ! flag_trapv)
     result_unsignedp = 1;
 
   temp = expand_abs_nojump (mode, op0, target, result_unsignedp);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 226f7e749c604749ae667b7175d5037d6829fbfb..daa6363d5e213d9c0a202af8600d43bae8ba8f66 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2014-04-23  Richard Biener  <rguenther@suse.de>
+
+       Backport from mainline
+       2014-04-02  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/60729
+       * g++.dg/vect/pr60729.cc: New testcase.
+
+       2014-04-03  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/60740
+       * gcc.dg/graphite/pr60740.c: New testcase.
+
 2014-04-23  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/60635

diff --git a/gcc/testsuite/g++.dg/vect/pr60729.cc b/gcc/testsuite/g++.dg/vect/pr60729.cc
new file mode 100644 (file)
index 0000000..fd472c5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/vect/pr60729.cc
@@ -0,0 +1,10 @@
+// { dg-do compile }
+// { dg-additional-options "-ftrapv" }
+
+void doSomething(int dim, double *Y, double *A) 
+{
+  for (int k=0; k<dim; k++) 
+    Y[k] += __builtin_fabs (A[k]);
+}
+
+// { dg-final { cleanup-tree-dump "vect" } }

diff --git a/gcc/testsuite/gcc.dg/graphite/pr60740.c b/gcc/testsuite/gcc.dg/graphite/pr60740.c
new file mode 100644 (file)
index 0000000..5b7c180
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/graphite/pr60740.c
@@ -0,0 +1,16 @@
+/* { dg-options "-O2 -floop-interchange" } */
+
+int **db6 = 0;
+
+void
+k26(void)
+{
+  static int geb = 0;
+  int *a22 = &geb;
+  int **l30 = &a22;
+  int *c4b;
+  int ndf;
+  for (ndf = 0; ndf <= 1; ++ndf)
+    *c4b = (db6 == l30) && (*a22)--;
+}
+