[gcc/devel/omp/gcc-10] Fix parallel-dims.f90 testcase for AMD GCN

[Kwok Yeung]

https://gcc.gnu.org/g:f05bd03d506a97aee5a2cfe7a026dc12f1171bc7

commit f05bd03d506a97aee5a2cfe7a026dc12f1171bc7
Author: Kwok Cheung Yeung <kcy@codesourcery.com>
Date:   Thu May 21 13:52:50 2020 -0700

    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:
---
 libgomp/ChangeLog.omp                                      | 7 +++++++
 libgomp/testsuite/libgomp.oacc-fortran/parallel-dims-aux.c | 9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 1b285b0265a..4df45a902ea 100644
--- 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 b5986f4afef..9810a259f2a 100644
--- 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 ();