Fix OACC_LOOP usage in goacc tests
2015-07-17 Tom de Vries <tom@codesourcery.com>
* c-c++-common/goacc/kernels-loop-2-acc-loop.c (ACC_LOOP): Define empty.
* c-c++-common/goacc/kernels-loop-3-acc-loop.c: Same.
* c-c++-common/goacc/kernels-loop-acc-loop.c: Same.
* c-c++-common/goacc/kernels-loop-n-acc-loop.c: Same.
* c-c++-common/goacc/kernels-loop-2.c (ACC_LOOP): Remove default define.
(main): Define #pragma acc loop conditional on ACC_LOOP.
* c-c++-common/goacc/kernels-loop-3.c: Same.
* c-c++-common/goacc/kernels-loop.c: Same.
* c-c++-common/goacc/kernels-loop-n.c (ACC_LOOP): Remove default define.
(foo): Define #pragma acc loop conditional on ACC_LOOP.
---
.../c-c++-common/goacc/kernels-loop-2-acc-loop.c | 2 +-
gcc/testsuite/c-c++-common/goacc/kernels-loop-2.c | 16 +++++++++-------
.../c-c++-common/goacc/kernels-loop-3-acc-loop.c | 2 +-
gcc/testsuite/c-c++-common/goacc/kernels-loop-3.c | 8 +++-----
gcc/testsuite/c-c++-common/goacc/kernels-loop-acc-loop.c | 2 +-
.../c-c++-common/goacc/kernels-loop-n-acc-loop.c | 2 +-
gcc/testsuite/c-c++-common/goacc/kernels-loop-n.c | 8 +++-----
gcc/testsuite/c-c++-common/goacc/kernels-loop.c | 8 +++-----
8 files changed, 22 insertions(+), 26 deletions(-)
@@ -4,7 +4,7 @@
/* { dg-additional-options "-fdump-tree-optimized" } */
/* Check that loops with '#pragma acc loop' tagged gets properly parallelized. */
-#define ACC_LOOP acc loop
+#define ACC_LOOP
#include "kernels-loop-2.c"
/* Check that only three loops are analyzed, and that all can be
@@ -8,10 +8,6 @@
#define N (1024 * 512)
#define COUNTERTYPE unsigned int
-#ifndef ACC_LOOP
-#define ACC_LOOP
-#endif
-
int
main (void)
{
@@ -25,21 +21,27 @@ main (void)
#pragma acc kernels copyout (a[0:N])
{
- #pragma ACC_LOOP
+#ifdef ACC_LOOP
+ #pragma acc loop
+#endif
for (COUNTERTYPE i = 0; i < N; i++)
a[i] = i * 2;
}
#pragma acc kernels copyout (b[0:N])
{
- #pragma ACC_LOOP
+#ifdef ACC_LOOP
+ #pragma acc loop
+#endif
for (COUNTERTYPE i = 0; i < N; i++)
b[i] = i * 4;
}
#pragma acc kernels copyin (a[0:N], b[0:N]) copyout (c[0:N])
{
- #pragma ACC_LOOP
+#ifdef ACC_LOOP
+ #pragma acc loop
+#endif
for (COUNTERTYPE ii = 0; ii < N; ii++)
c[ii] = a[ii] + b[ii];
}
@@ -4,7 +4,7 @@
/* { dg-additional-options "-fdump-tree-optimized" } */
/* Check that loops with '#pragma acc loop' tagged gets properly parallelized. */
-#define ACC_LOOP acc loop
+#define ACC_LOOP
#include "kernels-loop-3.c"
/* Check that only one loop is analyzed, and that it can be parallelized. */
@@ -8,10 +8,6 @@
#define N (1024 * 512)
#define COUNTERTYPE unsigned int
-#ifndef ACC_LOOP
-#define ACC_LOOP
-#endif
-
int
main (void)
{
@@ -26,7 +22,9 @@ main (void)
#pragma acc kernels copy (c[0:N])
{
- #pragma ACC_LOOP
+#ifdef ACC_LOOP
+ #pragma acc loop
+#endif
for (COUNTERTYPE ii = 0; ii < N; ii++)
c[ii] = c[ii] + ii + 1;
}
@@ -4,7 +4,7 @@
/* { dg-additional-options "-fdump-tree-optimized" } */
/* Check that loops with '#pragma acc loop' tagged gets properly parallelized. */
-#define ACC_LOOP acc loop
+#define ACC_LOOP
#include "kernels-loop.c"
/* Check that only one loop is analyzed, and that it can be parallelized. */
@@ -4,7 +4,7 @@
/* { dg-additional-options "-fdump-tree-optimized" } */
/* Check that loops with '#pragma acc loop' tagged gets properly parallelized. */
-#define ACC_LOOP acc loop
+#define ACC_LOOP
#include "kernels-loop-n.c"
/* Check that only one loop is analyzed, and that it can be parallelized. */
@@ -8,10 +8,6 @@
#define N ((1024 * 512) + 1)
#define COUNTERTYPE unsigned int
-#ifndef ACC_LOOP
-#define ACC_LOOP
-#endif
-
int
foo (COUNTERTYPE n)
{
@@ -31,7 +27,9 @@ foo (COUNTERTYPE n)
#pragma acc kernels copyin (a[0:n], b[0:n]) copyout (c[0:n])
{
- #pragma ACC_LOOP
+#ifdef ACC_LOOP
+ #pragma acc loop
+#endif
for (COUNTERTYPE ii = 0; ii < n; ii++)
c[ii] = a[ii] + b[ii];
}
@@ -8,10 +8,6 @@
#define N (1024 * 512)
#define COUNTERTYPE unsigned int
-#ifndef ACC_LOOP
-#define ACC_LOOP
-#endif
-
int
main (void)
{
@@ -31,7 +27,9 @@ main (void)
#pragma acc kernels copyin (a[0:N], b[0:N]) copyout (c[0:N])
{
- #pragma ACC_LOOP
+#ifdef ACC_LOOP
+ #pragma acc loop
+#endif
for (COUNTERTYPE ii = 0; ii < N; ii++)
c[ii] = a[ii] + b[ii];
}
--
1.9.1