Handle DR_NUM_DIMENSIONS == 0 in initialize_data_dependence_relation

2016-01-26  Tom de Vries  <tom@codesourcery.com>

	PR tree-optimization/69110
	* tree-data-ref.c (initialize_data_dependence_relation): Handle
	DR_NUM_DIMENSIONS == 0.

	* gcc.dg/autopar/pr69110.c: New test.

	* testsuite/libgomp.c/pr69110.c: New test.

From-SVN: r232854

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f2b8fba05cfac63d2824acfddd92bbccf6de3bb1..d2d25108052ab34384652197cb5e47736c18c0c5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-26  Tom de Vries  <tom@codesourcery.com>
+
+       PR tree-optimization/69110
+       * tree-data-ref.c (initialize_data_dependence_relation): Handle
+       DR_NUM_DIMENSIONS == 0.
+
 2016-01-25  Tom de Vries  <tom@codesourcery.com>
 
        backport from trunk:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3a5be2c9dbe1fd3754e08b65825e36848fe30d21..5e3d55439f8dfa32976c271b69bff4e419c31b6f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-26  Tom de Vries  <tom@codesourcery.com>
+
+       PR tree-optimization/69110
+       * gcc.dg/autopar/pr69110.c: New test.
+
 2016-01-25  Tom de Vries  <tom@codesourcery.com>
 
        backport from trunk:

diff --git a/gcc/testsuite/gcc.dg/autopar/pr69110.c b/gcc/testsuite/gcc.dg/autopar/pr69110.c
new file mode 100644 (file)
index 0000000..27cdae5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/autopar/pr69110.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -ftree-parallelize-loops=2 -fno-tree-loop-im -fdump-tree-parloops2-details" } */
+
+#define N 1000
+
+unsigned int i = 0;
+
+void
+foo (void)
+{
+  unsigned int z;
+  for (z = 0; z < N; ++z)
+    ++i;
+}
+
+/* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 0 "parloops2" } } */
+/* { dg-final { scan-tree-dump-times "FAILED: data dependencies exist across iterations" 1 "parloops2" } } */

diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 7def7f0cb3ba8f0514a1be02f6b701ec4b4188f3..4a517d75dd96b7c7b6f4d596e195425d9697d186 100644 (file)
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -1495,13 +1495,14 @@ initialize_data_dependence_relation (struct data_reference *a,
   /* The case where the references are exactly the same.  */
   if (operand_equal_p (DR_REF (a), DR_REF (b), 0))
     {
-     if (loop_nest.exists ()
-        && !object_address_invariant_in_loop_p (loop_nest[0],
-                                                       DR_BASE_OBJECT (a)))
-      {
-        DDR_ARE_DEPENDENT (res) = chrec_dont_know;
-        return res;
-      }
+      if ((loop_nest.exists ()
+          && !object_address_invariant_in_loop_p (loop_nest[0],
+                                                  DR_BASE_OBJECT (a)))
+         || DR_NUM_DIMENSIONS (a) == 0)
+       {
+         DDR_ARE_DEPENDENT (res) = chrec_dont_know;
+         return res;
+       }
       DDR_AFFINE_P (res) = true;
       DDR_ARE_DEPENDENT (res) = NULL_TREE;
       DDR_SUBSCRIPTS (res).create (DR_NUM_DIMENSIONS (a));
@@ -1533,9 +1534,9 @@ initialize_data_dependence_relation (struct data_reference *a,
   /* If the base of the object is not invariant in the loop nest, we cannot
      analyze it.  TODO -- in fact, it would suffice to record that there may
      be arbitrary dependences in the loops where the base object varies.  */
-  if (loop_nest.exists ()
-      && !object_address_invariant_in_loop_p (loop_nest[0],
-                                             DR_BASE_OBJECT (a)))
+  if ((loop_nest.exists ()
+       && !object_address_invariant_in_loop_p (loop_nest[0], DR_BASE_OBJECT (a)))
+      || DR_NUM_DIMENSIONS (a) == 0)
     {
       DDR_ARE_DEPENDENT (res) = chrec_dont_know;
       return res;

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 924feddfec0211f4bf82c195fc74ec8c5eff9404..e4c9c7712d5f9e404548c2958d6c43de71d928df 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-26  Tom de Vries  <tom@codesourcery.com>
+
+       PR tree-optimization/69110
+       * testsuite/libgomp.c/pr69110.c: New test.
+
 2015-06-26  Release Manager
 
        * GCC 4.9.3 released.

diff --git a/libgomp/testsuite/libgomp.c/pr69110.c b/libgomp/testsuite/libgomp.c/pr69110.c
new file mode 100644 (file)
index 0000000..0d9e5ca
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/pr69110.c
@@ -0,0 +1,26 @@
+/* { dg-do run } */
+/* { dg-options "-ftree-parallelize-loops=2 -O1 -fno-tree-loop-im" } */
+
+#define N 1000
+
+unsigned int i = 0;
+
+static void __attribute__((noinline, noclone))
+foo (void)
+{
+  unsigned int z;
+  for (z = 0; z < N; ++z)
+    ++i;
+}
+
+extern void abort (void);
+
+int
+main (void)
+{
+  foo ();
+  if (i != N)
+    abort ();
+
+  return 0;
+}