Fix parallel-dims.f90 testcase for AMD GCN

2020-05-21  Kwok Cheung Yeung  <kcy@codesourcery.com>

	libgomp/
	* testsuite/libgomp.oacc-fortran/parallel-dims-aux.c (aux_gang):
	Handle case where AMD GCN is used.
	(acc_worker): Likewise.
	(acc_vector): Likewise.

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 1616078db6f5aaa60af6455cda74d03e25b0d2c7..f526095243b005edbb459bfab8d58beabeb0fc92 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,10 @@
+2020-05-21  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       * testsuite/libgomp.oacc-fortran/parallel-dims-aux.c (aux_gang):
+       Handle case where AMD GCN is used.
+       (acc_worker): Likewise.
+       (acc_vector): Likewise.
+
 2020-05-21  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
        * testsuite/libgomp.oacc-c-c++-common/loop-dim-default.c (check):

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims-aux.c b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims-aux.c
index b5986f4afef7bbeb324ee3d6d0786d39599d2850..9810a259f2a60f92cc6adba3dabfa0cd00720bdb 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims-aux.c
+++ b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims-aux.c
@@ -16,7 +16,8 @@
 {
   if (acc_on_device ((int) acc_device_host))
     return 0;
-  else if (acc_on_device ((int) acc_device_nvidia))
+  else if (acc_on_device ((int) acc_device_nvidia)
+          || acc_on_device ((int) acc_device_radeon))
     return __builtin_goacc_parlevel_id (GOMP_DIM_GANG);
   else
     __builtin_abort ();
@@ -27,7 +28,8 @@
 {
   if (acc_on_device ((int) acc_device_host))
     return 0;
-  else if (acc_on_device ((int) acc_device_nvidia))
+  else if (acc_on_device ((int) acc_device_nvidia)
+          || acc_on_device ((int) acc_device_radeon))
     return __builtin_goacc_parlevel_id (GOMP_DIM_WORKER);
   else
     __builtin_abort ();
@@ -38,7 +40,8 @@
 {
   if (acc_on_device ((int) acc_device_host))
     return 0;
-  else if (acc_on_device ((int) acc_device_nvidia))
+  else if (acc_on_device ((int) acc_device_nvidia)
+          || acc_on_device ((int) acc_device_radeon))
     return __builtin_goacc_parlevel_id (GOMP_DIM_VECTOR);
   else
     __builtin_abort ();