Add expected warnings to parallel-dims.c and parallel-dims.f90 testcases

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

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/parallel-dims.c (main): Add
	expected warnings.
	* testsuite/libgomp.oacc-fortran/parallel-dims.f90 (main): Likewise.

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 420e483c19eeaff00fd0197c80c19728b0c1bdc7..691e09a5d9f506591413a9ef6f8a284e8902bba5 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,9 @@
+2020-03-16  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c (main): Add
+       expected warnings.
+       * testsuite/libgomp.oacc-fortran/parallel-dims.f90 (main): Likewise.
+
 2020-03-05  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
        * testsuite/libgomp.oacc-c-c++-common/loop-dim-default.c (main):

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c
index 0ec1082a3f2c0fda8abefe4146fc80707fd4260f..71600e2386ed7f288120d87f6f7988aa945fd784 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c
@@ -616,8 +616,12 @@ int main ()
     int gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max;
     gangs_min = workers_min = vectors_min = INT_MAX;
     gangs_max = workers_max = vectors_max = INT_MIN;
-#pragma acc serial copy (vectors_actual) /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } */ \
+#pragma acc serial copy (vectors_actual) \
   copy (gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max)
+  /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 619 } */
+  /* { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } 619 } */
+  /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } 619 } */
+  /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } 619 } */
     {
       if (acc_on_device (acc_device_nvidia))
        {

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90
index 1bfcd6ce0998ca11dbf036c917080994900764a8..0a7463a95acbc2d5a46fe5337177083b5ab85c1d 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90
@@ -83,7 +83,11 @@ program main
   workers_max = -huge(gangs_max) - 1 ! INT_MIN
   vectors_max = -huge(gangs_max) - 1 ! INT_MIN
   !$acc serial copy (vectors_actual) &
-  !$acc   copy (gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max) ! { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } }
+  !$acc   copy (gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max)
+  ! { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 86 }
+  ! { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } 86 }
+  ! { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } 86 }
+  ! { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } 86 }
   if (acc_on_device (acc_device_nvidia)) then
      ! The GCC nvptx back end enforces vector_length (32).
      ! It's unclear if that's actually permissible here;