Fix testsuite failures due to expected compiler warnings

2020-03-02  Kwok Cheung Yeung  <kcy@codesourcery.com>

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/loop-w-1.c (main): Add
	dg-warnings for	expected compiler warnings.
	* testsuite/libgomp.oacc-c-c++-common/routine-wv-2.c (DoWorkVec):
	Likewise.
	* testsuite/libgomp.oacc-fortran/optional-private.f90 (t1, t2):
	Likewise.

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index d4e5970d16ee7bdbe3e1bced51c227b8b1f193ce..1a9f7d130888f75a6a2a9cc7224414e9513f1ff7 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,12 @@
+2020-03-02  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       * testsuite/libgomp.oacc-c-c++-common/loop-w-1.c (main): Add
+       dg-warnings for expected compiler warnings.
+       * testsuite/libgomp.oacc-c-c++-common/routine-wv-2.c (DoWorkVec):
+       Likewise.
+       * testsuite/libgomp.oacc-fortran/optional-private.f90 (t1, t2):
+       Likewise.
+
 2019-09-18  Tobias Burnus  <tobias@codesourcery.com>
 
        * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Fix dg-warning

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-w-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-w-1.c
index a49d8df2fbf51523549c584791899b53c7598d44..8731c805b7984189c1a6d68303e9189bf5f8f8c1 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-w-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-w-1.c
@@ -16,7 +16,7 @@ int main ()
   
 #pragma acc parallel num_workers(32) vector_length(32) copy(ary) copy(ondev) \
            copyout(workersize)
-  /* { dg-warning "region is vector partitioned but does not contain vector partitioned code" "vector" { target *-*-* } 16 } */
+  /* { dg-warning "region is vector partitioned but does not contain vector partitioned code" "vector" { target *-*-* } 17 } */
   {
 #pragma acc loop worker
     for (unsigned ix = 0; ix < N; ix++)

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-wv-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-wv-2.c
index 9769ee7243085ddbbf82de86c57b71f14935fdd5..1d951c1ff1b8be3f07c268c1c3d391af75d160d0 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-wv-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-wv-2.c
@@ -42,7 +42,8 @@ int DoWorkVec (int nw)
       ary[ix][jx] = 0xdeadbeef;
 
   printf ("spawning %d ...", nw); fflush (stdout);
-  
+
+  /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "vector" { target openacc_amdgcn_accel_selected } 47 } */
 #pragma acc parallel num_workers(nw) vector_length (NUM_VECTORS) copy (ary)
   {
     WorkVec ((int *)ary, WIDTH, HEIGHT, nw, NUM_VECTORS);

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/optional-private.f90 b/libgomp/testsuite/libgomp.oacc-fortran/optional-private.f90
index 0320bbb3bc99ca2e91e22ba3a931b86942095a26..6bc91b7a0bbaaf0978db9106a6fc80c939bb40c5 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/optional-private.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/optional-private.f90
@@ -30,6 +30,8 @@ contains
     end do
 
     !$acc parallel copy(arr) num_gangs(32) num_workers(8) vector_length(32)
+    ! { dg-warning "region is worker partitioned but does not contain worker partitioned code" "worker" { target *-*-* } 32 }
+    ! { dg-warning "region is vector partitioned but does not contain vector partitioned code" "vector" { target *-*-* } 32 }
     !$acc loop gang private(x)
     do i = 1, 32
        x = i * 2;
@@ -55,6 +57,7 @@ contains
     end do
 
     !$acc parallel copy(arr) num_gangs(32) num_workers(8) vector_length(32)
+    ! { dg-warning "region is worker partitioned but does not contain worker partitioned code" "worker" { target *-*-* } 59 }
     !$acc loop gang private(pt)
     do i = 0, 31
        pt%x = i