diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index de286ddac7c1da893b4336b2041a79c0dc8d3daa..24cbe04bd2f35d484ca55254bacec6cb36082ffc 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,28 @@
+2020-01-17 Andrew Stubbs <ams@codesourcery.com>
+
+ * config/accel/openacc.f90 (openacc_kinds): Rename acc_device_gcn to
+ acc_device_radeon.
+ (openacc): Likewise.
+ * openacc.f90 (openacc_kinds): Likewise.
+ (openacc): Likewise.
+ * openacc.h (acc_device_t): Likewise.
+ * openacc_lib.h: Likewise.
+ * testsuite/lib/libgomp.exp
+ (check_effective_target_openacc_amdgcn_accel_present): Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/acc_prof-init-1.c
+ (cb_compute_construct_end): Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c
+ (cb_enqueue_launch_start): Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/acc_prof-parallel-1.c
+ (cb_enter_data_end): Likewise.
+ (cb_exit_data_start): Likewise.
+ (cb_exit_data_end): Likewise.
+ (cb_compute_construct_end): Likewise.
+ (cb_enqueue_launch_start): Likewise.
+ (cb_enqueue_launch_end): Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/asyncwait-nop-1.c
+ (main): Likewise.
+
2020-01-10 Thomas Schwinge <thomas@codesourcery.com>
* libgomp-plugin.h (enum goacc_property): New. Adjust all users
diff --git a/libgomp/config/accel/openacc.f90 b/libgomp/config/accel/openacc.f90
index b4d40362c5d0a21fe95c90b26de0c376356ab92a..a8e5144349e132453ac954d7c611a2097099e608 100644
--- a/libgomp/config/accel/openacc.f90
+++ b/libgomp/config/accel/openacc.f90
@@ -50,7 +50,7 @@ module openacc_kinds
! integer (acc_device_kind), parameter :: acc_device_host_nonshm = 3 removed.
integer (acc_device_kind), parameter :: acc_device_not_host = 4
integer (acc_device_kind), parameter :: acc_device_nvidia = 5
- integer (acc_device_kind), parameter :: acc_device_gcn = 8
+ integer (acc_device_kind), parameter :: acc_device_radeon = 8
end module openacc_kinds
@@ -86,7 +86,7 @@ module openacc
! From openacc_kinds
public :: acc_device_kind
public :: acc_device_none, acc_device_default, acc_device_host
- public :: acc_device_not_host, acc_device_nvidia, acc_device_gcn
+ public :: acc_device_not_host, acc_device_nvidia, acc_device_radeon
public :: acc_on_device
diff --git a/libgomp/openacc.f90 b/libgomp/openacc.f90
index 6c92c7c12c97a67d409c2dea2f26493395f82005..e2639bf622ed6fa9ca00a784692dc1f007bad8e8 100644
--- a/libgomp/openacc.f90
+++ b/libgomp/openacc.f90
@@ -49,7 +49,7 @@ module openacc_kinds
! integer (acc_device_kind), parameter :: acc_device_host_nonshm = 3 removed.
integer (acc_device_kind), parameter :: acc_device_not_host = 4
integer (acc_device_kind), parameter :: acc_device_nvidia = 5
- integer (acc_device_kind), parameter :: acc_device_gcn = 8
+ integer (acc_device_kind), parameter :: acc_device_radeon = 8
integer, parameter :: acc_device_property = c_size_t
@@ -767,7 +767,7 @@ module openacc
! From openacc_kinds
public :: acc_device_kind
public :: acc_device_none, acc_device_default, acc_device_host
- public :: acc_device_not_host, acc_device_nvidia, acc_device_gcn
+ public :: acc_device_not_host, acc_device_nvidia, acc_device_radeon
public :: acc_device_property
public :: acc_property_memory, acc_property_free_memory
diff --git a/libgomp/openacc.h b/libgomp/openacc.h
index 62b2b0ea5596deb2717ea75966c7e178ff1cc765..61736463474823d513b2d75a912bfec02ed54e7c 100644
--- a/libgomp/openacc.h
+++ b/libgomp/openacc.h
@@ -56,7 +56,7 @@ typedef enum acc_device_t {
/* acc_device_host_nonshm = 3 removed. */
acc_device_not_host = 4,
acc_device_nvidia = 5,
- acc_device_gcn = 8,
+ acc_device_radeon = 8,
_ACC_device_hwm,
/* Ensure enumeration is layout compatible with int. */
_ACC_highest = __INT_MAX__,
diff --git a/libgomp/openacc_lib.h b/libgomp/openacc_lib.h
index b327ba7640382cd827d103dc54138cb289b480a4..717f9b4ef08804ca0d336045888f730186740b10 100644
--- a/libgomp/openacc_lib.h
+++ b/libgomp/openacc_lib.h
@@ -44,7 +44,7 @@
! removed.
integer (acc_device_kind), parameter :: acc_device_not_host = 4
integer (acc_device_kind), parameter :: acc_device_nvidia = 5
- integer (acc_device_kind), parameter :: acc_device_gcn = 8
+ integer (acc_device_kind), parameter :: acc_device_radeon = 8
integer, parameter :: acc_handle_kind = 4
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index f52ed7184e44313520b6754730d6d2a658d3474d..7e94527c7cae1ddcbf38020cb22301ccd6ea719b 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -489,7 +489,7 @@ proc check_effective_target_openacc_amdgcn_accel_present { } {
return [check_runtime openacc_amdgcn_accel_present {
#include <openacc.h>
int main () {
- return !(acc_get_num_devices (acc_device_gcn) > 0);
+ return !(acc_get_num_devices (acc_device_radeon) > 0);
}
} "" ]
}
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-init-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-init-1.c
index e82a03e8f3cb1bc5b7f28e472196b8769c80adf6..7d05f482f466591fc20aa9ad39ae34d3de097804 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-init-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-init-1.c
@@ -224,7 +224,7 @@ static void cb_compute_construct_end (acc_prof_info *prof_info, acc_event_info *
if (acc_device_type == acc_device_host)
assert (api_info->device_api == acc_device_api_none);
- else if (acc_device_type == acc_device_gcn)
+ else if (acc_device_type == acc_device_radeon)
assert (api_info->device_api == acc_device_api_other);
else
assert (api_info->device_api == acc_device_api_cuda);
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c
index ddf647cda9beecbc227583f3191a05d2ebc0c239..ad33f72e2fb6b24658b54b01f83d60f5da02b6b5 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c
@@ -106,7 +106,7 @@ static void cb_enqueue_launch_start (acc_prof_info *prof_info, acc_event_info *e
assert (event_info->launch_event.vector_length >= 1);
else if (acc_device_type == acc_device_nvidia) /* ... is special. */
assert (event_info->launch_event.vector_length == 32);
- else if (acc_device_type == acc_device_gcn) /* ...and so is this. */
+ else if (acc_device_type == acc_device_radeon) /* ...and so is this. */
assert (event_info->launch_event.vector_length == 64);
else
{
@@ -120,7 +120,7 @@ static void cb_enqueue_launch_start (acc_prof_info *prof_info, acc_event_info *e
if (acc_device_type == acc_device_host)
assert (api_info->device_api == acc_device_api_none);
- else if (acc_device_type == acc_device_gcn)
+ else if (acc_device_type == acc_device_radeon)
assert (api_info->device_api == acc_device_api_other);
else
assert (api_info->device_api == acc_device_api_cuda);
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-parallel-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-parallel-1.c
index dc7c7582ce2dfc212d97100509e355c3f379b5b4..a5e9ab3f936fc5d32da46fc4d9c49b78d5faa13e 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-parallel-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-parallel-1.c
@@ -265,7 +265,7 @@ static void cb_enter_data_end (acc_prof_info *prof_info, acc_event_info *event_i
if (acc_device_type == acc_device_host)
assert (api_info->device_api == acc_device_api_none);
- else if (acc_device_type == acc_device_gcn)
+ else if (acc_device_type == acc_device_radeon)
assert (api_info->device_api == acc_device_api_other);
else
assert (api_info->device_api == acc_device_api_cuda);
@@ -321,7 +321,7 @@ static void cb_exit_data_start (acc_prof_info *prof_info, acc_event_info *event_
if (acc_device_type == acc_device_host)
assert (api_info->device_api == acc_device_api_none);
- else if (acc_device_type == acc_device_gcn)
+ else if (acc_device_type == acc_device_radeon)
assert (api_info->device_api == acc_device_api_other);
else
assert (api_info->device_api == acc_device_api_cuda);
@@ -375,7 +375,7 @@ static void cb_exit_data_end (acc_prof_info *prof_info, acc_event_info *event_in
if (acc_device_type == acc_device_host)
assert (api_info->device_api == acc_device_api_none);
- else if (acc_device_type == acc_device_gcn)
+ else if (acc_device_type == acc_device_radeon)
assert (api_info->device_api == acc_device_api_other);
else
assert (api_info->device_api == acc_device_api_cuda);
@@ -516,7 +516,7 @@ static void cb_compute_construct_end (acc_prof_info *prof_info, acc_event_info *
if (acc_device_type == acc_device_host)
assert (api_info->device_api == acc_device_api_none);
- else if (acc_device_type == acc_device_gcn)
+ else if (acc_device_type == acc_device_radeon)
assert (api_info->device_api == acc_device_api_other);
else
assert (api_info->device_api == acc_device_api_cuda);
@@ -581,7 +581,7 @@ static void cb_enqueue_launch_start (acc_prof_info *prof_info, acc_event_info *e
if (acc_device_type == acc_device_host)
assert (api_info->device_api == acc_device_api_none);
- else if (acc_device_type == acc_device_gcn)
+ else if (acc_device_type == acc_device_radeon)
assert (api_info->device_api == acc_device_api_other);
else
assert (api_info->device_api == acc_device_api_cuda);
@@ -647,7 +647,7 @@ static void cb_enqueue_launch_end (acc_prof_info *prof_info, acc_event_info *eve
if (acc_device_type == acc_device_host)
assert (api_info->device_api == acc_device_api_none);
- else if (acc_device_type == acc_device_gcn)
+ else if (acc_device_type == acc_device_radeon)
assert (api_info->device_api == acc_device_api_other);
else
assert (api_info->device_api == acc_device_api_cuda);
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-nop-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-nop-1.c
index 840052fec12252668bbd4bcdc5e1ab3cdad03d3c..754e015a280cc7bd94e38af1e0ba8c83652b7e2b 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-nop-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-nop-1.c
@@ -27,7 +27,7 @@ main ()
#if defined ACC_DEVICE_TYPE_nvidia
d = acc_device_nvidia;
#elif defined ACC_DEVICE_TYPE_gcn
- d = acc_device_gcn;
+ d = acc_device_radeon;
#elif defined ACC_DEVICE_TYPE_host
d = acc_device_host;
#else