diff mbox

[gomp4] fix some tests

Message ID 56A271BD.8000804@acm.org
State New
Headers show

Commit Message

Nathan Sidwell Jan. 22, 2016, 6:15 p.m. UTC
I discovered these tests were relying on implicitly using vector partitioning, 
rather than specifying it explicitly.

Fixed thusly.

nathan
diff mbox

Patch

Index: gcc/testsuite/c-c++-common/goacc/reduction-1.c
===================================================================
--- gcc/testsuite/c-c++-common/goacc/reduction-1.c	(revision 232738)
+++ gcc/testsuite/c-c++-common/goacc/reduction-1.c	(working copy)
@@ -12,55 +12,55 @@  main(void)
 
   /* '+' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (+:result)
+#pragma acc loop vector reduction (+:result)
   for (i = 0; i < n; i++)
     result += array[i];
 
   /* '*' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (*:result)
+#pragma acc loop vector reduction (*:result)
   for (i = 0; i < n; i++)
     result *= array[i];
 
   /* 'max' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (max:result)
+#pragma acc loop vector reduction (max:result)
   for (i = 0; i < n; i++)
     result = result > array[i] ? result : array[i];
 
   /* 'min' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (min:result)
+#pragma acc loop vector reduction (min:result)
   for (i = 0; i < n; i++)
     result = result < array[i] ? result : array[i];
 
   /* '&' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (&:result)
+#pragma acc loop vector reduction (&:result)
   for (i = 0; i < n; i++)
     result &= array[i];
 
   /* '|' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (|:result)
+#pragma acc loop vector reduction (|:result)
   for (i = 0; i < n; i++)
     result |= array[i];
 
   /* '^' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (^:result)
+#pragma acc loop vector reduction (^:result)
   for (i = 0; i < n; i++)
     result ^= array[i];
 
   /* '&&' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (&&:lresult)
+#pragma acc loop vector reduction (&&:lresult)
   for (i = 0; i < n; i++)
     lresult = lresult && (result > array[i]);
 
   /* '||' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (||:lresult)
+#pragma acc loop vector reduction (||:lresult)
   for (i = 0; i < n; i++)
     lresult = lresult || (result > array[i]);
 
Index: gcc/testsuite/c-c++-common/goacc/reduction-2.c
===================================================================
--- gcc/testsuite/c-c++-common/goacc/reduction-2.c	(revision 232738)
+++ gcc/testsuite/c-c++-common/goacc/reduction-2.c	(working copy)
@@ -12,37 +12,37 @@  main(void)
 
   /* '+' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (+:result)
+#pragma acc loop vector reduction (+:result)
   for (i = 0; i < n; i++)
     result += array[i];
 
   /* '*' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (*:result)
+#pragma acc loop vector reduction (*:result)
   for (i = 0; i < n; i++)
     result *= array[i];
 
   /* 'max' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (max:result)
+#pragma acc loop vector reduction (max:result)
   for (i = 0; i < n; i++)
     result = result > array[i] ? result : array[i];
 
   /* 'min' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (min:result)
+#pragma acc loop vector reduction (min:result)
   for (i = 0; i < n; i++)
     result = result < array[i] ? result : array[i];
 
   /* '&&' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (&&:lresult)
+#pragma acc loop vector reduction (&&:lresult)
   for (i = 0; i < n; i++)
     lresult = lresult && (result > array[i]);
 
   /* '||' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (||:lresult)
+#pragma acc loop vector reduction (||:lresult)
   for (i = 0; i < n; i++)
     lresult = lresult || (result > array[i]);
 
Index: gcc/testsuite/c-c++-common/goacc/reduction-3.c
===================================================================
--- gcc/testsuite/c-c++-common/goacc/reduction-3.c	(revision 232738)
+++ gcc/testsuite/c-c++-common/goacc/reduction-3.c	(working copy)
@@ -12,37 +12,37 @@  main(void)
 
   /* '+' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (+:result)
+#pragma acc loop vector reduction (+:result)
   for (i = 0; i < n; i++)
     result += array[i];
 
   /* '*' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (*:result)
+#pragma acc loop vector reduction (*:result)
   for (i = 0; i < n; i++)
     result *= array[i];
 
   /* 'max' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (max:result)
+#pragma acc loop vector reduction (max:result)
   for (i = 0; i < n; i++)
     result = result > array[i] ? result : array[i];
 
   /* 'min' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (min:result)
+#pragma acc loop vector reduction (min:result)
   for (i = 0; i < n; i++)
     result = result < array[i] ? result : array[i];
 
   /* '&&' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (&&:lresult)
+#pragma acc loop vector reduction (&&:lresult)
   for (i = 0; i < n; i++)
     lresult = lresult && (result > array[i]);
 
   /* '||' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (||:lresult)
+#pragma acc loop vector reduction (||:lresult)
   for (i = 0; i < n; i++)
     lresult = lresult || (result > array[i]);
 
Index: gcc/testsuite/c-c++-common/goacc/reduction-4.c
===================================================================
--- gcc/testsuite/c-c++-common/goacc/reduction-4.c	(revision 232738)
+++ gcc/testsuite/c-c++-common/goacc/reduction-4.c	(working copy)
@@ -12,13 +12,13 @@  main(void)
 
   /* '+' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (+:result)
+#pragma acc loop vector reduction (+:result)
   for (i = 0; i < n; i++)
     result += array[i];
 
   /* '*' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (*:result)
+#pragma acc loop vector reduction (*:result)
   for (i = 0; i < n; i++)
     result *= array[i];
 
@@ -26,7 +26,7 @@  main(void)
 #if 0
   // error: 'result' has invalid type for 'reduction(max)'
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (max:result)
+#pragma acc loop vector reduction (max:result)
   for (i = 0; i < n; i++)
     result = result > array[i] ? result : array[i];
 #endif
@@ -35,20 +35,20 @@  main(void)
 #if 0
   // error: 'result' has invalid type for 'reduction(min)'
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (min:result)
+#pragma acc loop vector reduction (min:result)
   for (i = 0; i < n; i++)
     result = result < array[i] ? result : array[i];
 #endif
 
   /* '&&' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (&&:lresult)
+#pragma acc loop vector reduction (&&:lresult)
   for (i = 0; i < n; i++)
     lresult = lresult && (__real__(result) > __real__(array[i]));
 
   /* '||' reductions.  */
 #pragma acc parallel vector_length (vl)
-#pragma acc loop reduction (||:lresult)
+#pragma acc loop vector reduction (||:lresult)
   for (i = 0; i < n; i++)
     lresult = lresult || (__real__(result) > __real__(array[i]));