From 6687d13a87c42dddc7d1c7adade38d31ba0d1401 Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Fri, 17 Jan 2020 14:46:59 +0000 Subject: [PATCH] Rename acc_device_gcn to acc_device_radeon 2020-01-17 Andrew Stubbs libgomp/ * 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. --- libgomp/ChangeLog | 25 +++++++++++++++++++ libgomp/config/accel/openacc.f90 | 4 +-- libgomp/openacc.f90 | 4 +-- libgomp/openacc.h | 2 +- libgomp/openacc_lib.h | 2 +- libgomp/testsuite/lib/libgomp.exp | 2 +- .../acc_prof-init-1.c | 2 +- .../acc_prof-kernels-1.c | 4 +-- .../acc_prof-parallel-1.c | 12 ++++----- .../asyncwait-nop-1.c | 2 +- 10 files changed, 42 insertions(+), 17 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index de286ddac7c..24cbe04bd2f 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,28 @@ +2020-01-17 Andrew Stubbs + + * 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 * 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 b4d40362c5d..a8e5144349e 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 6c92c7c12c9..e2639bf622e 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 62b2b0ea559..61736463474 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 b327ba76403..717f9b4ef08 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 f52ed7184e4..7e94527c7ca 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 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 e82a03e8f3c..7d05f482f46 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 ddf647cda9b..ad33f72e2fb 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 dc7c7582ce2..a5e9ab3f936 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 840052fec12..754e015a280 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 -- 2.30.2