From 74c9882b80bda50b37c9555498de7123c6bdb9e4 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 22 Oct 2020 09:31:01 +0200 Subject: [PATCH] openmp: Change omp_get_initial_device () to match OpenMP 5.1 requirements > Therefore, I think until omp_get_initial_device () value is changed, we The following so far untested patch implements that change. OpenMP 4.5 said for omp_get_initial_device: The value of the device number is implementation defined. If it is between 0 and one less than omp_get_num_devices() then it is valid for use with all device constructs and routines; if it is outside that range, then it is only valid for use with the device memory routines and not in the device clause. and OpenMP 5.0 similarly, but OpenMP 5.1 says: The value of the device number is the value returned by the omp_get_num_devices routine. As the new value is compatible with what has been required earlier, I think we can change it already now. 2020-10-22 Jakub Jelinek * icv.c (omp_get_initial_device): Remove including corresponding ialias. * icv-device.c (omp_get_initial_device): New function. Return gomp_get_num_devices (). Add ialias. * target.c (resolve_device): Don't fail with OMP_TARGET_OFFLOAD=mandatory if device_id is equal to gomp_get_num_devices (). (omp_target_alloc, omp_target_free, omp_target_is_present, omp_target_memcpy, omp_target_memcpy_rect, omp_target_associate_ptr, omp_target_disassociate_ptr, omp_pause_resource): Use gomp_get_num_devices () instead of GOMP_DEVICE_HOST_FALLBACK on the first use in the functions, in uses dominated by the gomp_get_num_devices call use num_devices_openmp instead. * libgomp.texi (omp_get_initial_device): Document. * config/gcn/icv-device.c (omp_get_initial_device): New function. Add ialias. * config/nvptx/icv-device.c (omp_get_initial_device): Likewise. * testsuite/libgomp.c/target-40.c: New test. --- libgomp/config/gcn/icv-device.c | 7 +++++++ libgomp/config/nvptx/icv-device.c | 7 +++++++ libgomp/icv-device.c | 7 +++++++ libgomp/icv.c | 7 ------- libgomp/libgomp.texi | 28 +++++++++++++++++++++++++ libgomp/target.c | 28 ++++++++++++------------- libgomp/testsuite/libgomp.c/target-40.c | 10 +++++++++ 7 files changed, 73 insertions(+), 21 deletions(-) create mode 100644 libgomp/testsuite/libgomp.c/target-40.c diff --git a/libgomp/config/gcn/icv-device.c b/libgomp/config/gcn/icv-device.c index 1b09f9738f1..ba3a446a6ea 100644 --- a/libgomp/config/gcn/icv-device.c +++ b/libgomp/config/gcn/icv-device.c @@ -39,6 +39,12 @@ omp_get_default_device (void) return 0; } +int +omp_get_initial_device (void) +{ + return GOMP_DEVICE_HOST_FALLBACK; +} + int omp_get_num_devices (void) { @@ -66,6 +72,7 @@ omp_is_initial_device (void) ialias (omp_set_default_device) ialias (omp_get_default_device) +ialias (omp_get_initial_device) ialias (omp_get_num_devices) ialias (omp_get_num_teams) ialias (omp_get_team_num) diff --git a/libgomp/config/nvptx/icv-device.c b/libgomp/config/nvptx/icv-device.c index 6a70329c032..795da7db757 100644 --- a/libgomp/config/nvptx/icv-device.c +++ b/libgomp/config/nvptx/icv-device.c @@ -39,6 +39,12 @@ omp_get_default_device (void) return 0; } +int +omp_get_initial_device (void) +{ + return GOMP_DEVICE_HOST_FALLBACK; +} + int omp_get_num_devices (void) { @@ -54,5 +60,6 @@ omp_is_initial_device (void) ialias (omp_set_default_device) ialias (omp_get_default_device) +ialias (omp_get_initial_device) ialias (omp_get_num_devices) ialias (omp_is_initial_device) diff --git a/libgomp/icv-device.c b/libgomp/icv-device.c index 414960c3821..af7972eae67 100644 --- a/libgomp/icv-device.c +++ b/libgomp/icv-device.c @@ -42,6 +42,12 @@ omp_get_default_device (void) return icv->default_device_var; } +int +omp_get_initial_device (void) +{ + return gomp_get_num_devices (); +} + int omp_get_num_devices (void) { @@ -57,5 +63,6 @@ omp_is_initial_device (void) ialias (omp_set_default_device) ialias (omp_get_default_device) +ialias (omp_get_initial_device) ialias (omp_get_num_devices) ialias (omp_is_initial_device) diff --git a/libgomp/icv.c b/libgomp/icv.c index 1bb46abac43..4da6527c9b8 100644 --- a/libgomp/icv.c +++ b/libgomp/icv.c @@ -155,12 +155,6 @@ omp_get_proc_bind (void) return icv->bind_var; } -int -omp_get_initial_device (void) -{ - return GOMP_DEVICE_HOST_FALLBACK; -} - int omp_get_num_places (void) { @@ -241,7 +235,6 @@ ialias (omp_get_max_active_levels) ialias (omp_get_supported_active_levels) ialias (omp_get_cancellation) ialias (omp_get_proc_bind) -ialias (omp_get_initial_device) ialias (omp_get_max_task_priority) ialias (omp_get_num_places) ialias (omp_get_place_num) diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi index 7c6d5fd6efa..69370639c5b 100644 --- a/libgomp/libgomp.texi +++ b/libgomp/libgomp.texi @@ -166,6 +166,7 @@ linkage, and do not throw exceptions. * omp_get_cancellation:: Whether cancellation support is enabled * omp_get_default_device:: Get the default device for target regions * omp_get_dynamic:: Dynamic teams setting +* omp_get_initial_device:: Device number of host device * omp_get_level:: Number of parallel regions * omp_get_max_active_levels:: Current maximum number of active regions * omp_get_max_task_priority:: Maximum task priority value that can be set @@ -353,6 +354,33 @@ disabled by default. +@node omp_get_initial_device +@section @code{omp_get_initial_device} -- Return device number of initial device +@table @asis +@item @emph{Description}: +This function returns a device number that represents the host device. +For OpenMP 5.1, this must be equal to the value returned by the +@code{omp_get_num_devices} function. + +@item @emph{C/C++} +@multitable @columnfractions .20 .80 +@item @emph{Prototype}: @tab @code{int omp_get_initial_device(void);} +@end multitable + +@item @emph{Fortran}: +@multitable @columnfractions .20 .80 +@item @emph{Interface}: @tab @code{integer function omp_get_initial_device()} +@end multitable + +@item @emph{See also}: +@ref{omp_get_num_devices} + +@item @emph{Reference}: +@uref{https://www.openmp.org, OpenMP specification v4.5}, Section 3.2.35. +@end table + + + @node omp_get_level @section @code{omp_get_level} -- Obtain the current nesting level @table @asis diff --git a/libgomp/target.c b/libgomp/target.c index 97f0cdd2a42..1a8c67c2df5 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -118,7 +118,8 @@ resolve_device (int device_id) if (device_id < 0 || device_id >= gomp_get_num_devices ()) { if (gomp_target_offload_var == GOMP_TARGET_OFFLOAD_MANDATORY - && device_id != GOMP_DEVICE_HOST_FALLBACK) + && device_id != GOMP_DEVICE_HOST_FALLBACK + && device_id != num_devices_openmp) gomp_fatal ("OMP_TARGET_OFFLOAD is set to MANDATORY, " "but device not found"); @@ -132,8 +133,7 @@ resolve_device (int device_id) { gomp_mutex_unlock (&devices[device_id].lock); - if (gomp_target_offload_var == GOMP_TARGET_OFFLOAD_MANDATORY - && device_id != GOMP_DEVICE_HOST_FALLBACK) + if (gomp_target_offload_var == GOMP_TARGET_OFFLOAD_MANDATORY) gomp_fatal ("OMP_TARGET_OFFLOAD is set to MANDATORY, " "but device is finalized"); @@ -2716,7 +2716,7 @@ GOMP_teams (unsigned int num_teams, unsigned int thread_limit) void * omp_target_alloc (size_t size, int device_num) { - if (device_num == GOMP_DEVICE_HOST_FALLBACK) + if (device_num == gomp_get_num_devices ()) return malloc (size); if (device_num < 0) @@ -2742,7 +2742,7 @@ omp_target_free (void *device_ptr, int device_num) if (device_ptr == NULL) return; - if (device_num == GOMP_DEVICE_HOST_FALLBACK) + if (device_num == gomp_get_num_devices ()) { free (device_ptr); return; @@ -2773,7 +2773,7 @@ omp_target_is_present (const void *ptr, int device_num) if (ptr == NULL) return 1; - if (device_num == GOMP_DEVICE_HOST_FALLBACK) + if (device_num == gomp_get_num_devices ()) return 1; if (device_num < 0) @@ -2807,7 +2807,7 @@ omp_target_memcpy (void *dst, const void *src, size_t length, struct gomp_device_descr *dst_devicep = NULL, *src_devicep = NULL; bool ret; - if (dst_device_num != GOMP_DEVICE_HOST_FALLBACK) + if (dst_device_num != gomp_get_num_devices ()) { if (dst_device_num < 0) return EINVAL; @@ -2820,7 +2820,7 @@ omp_target_memcpy (void *dst, const void *src, size_t length, || dst_devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM) dst_devicep = NULL; } - if (src_device_num != GOMP_DEVICE_HOST_FALLBACK) + if (src_device_num != num_devices_openmp) { if (src_device_num < 0) return EINVAL; @@ -2958,7 +2958,7 @@ omp_target_memcpy_rect (void *dst, const void *src, size_t element_size, if (!dst && !src) return INT_MAX; - if (dst_device_num != GOMP_DEVICE_HOST_FALLBACK) + if (dst_device_num != gomp_get_num_devices ()) { if (dst_device_num < 0) return EINVAL; @@ -2971,7 +2971,7 @@ omp_target_memcpy_rect (void *dst, const void *src, size_t element_size, || dst_devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM) dst_devicep = NULL; } - if (src_device_num != GOMP_DEVICE_HOST_FALLBACK) + if (src_device_num != num_devices_openmp) { if (src_device_num < 0) return EINVAL; @@ -3007,7 +3007,7 @@ int omp_target_associate_ptr (const void *host_ptr, const void *device_ptr, size_t size, size_t device_offset, int device_num) { - if (device_num == GOMP_DEVICE_HOST_FALLBACK) + if (device_num == gomp_get_num_devices ()) return EINVAL; if (device_num < 0) @@ -3070,7 +3070,7 @@ omp_target_associate_ptr (const void *host_ptr, const void *device_ptr, int omp_target_disassociate_ptr (const void *ptr, int device_num) { - if (device_num == GOMP_DEVICE_HOST_FALLBACK) + if (device_num == gomp_get_num_devices ()) return EINVAL; if (device_num < 0) @@ -3113,9 +3113,9 @@ int omp_pause_resource (omp_pause_resource_t kind, int device_num) { (void) kind; - if (device_num == GOMP_DEVICE_HOST_FALLBACK) + if (device_num == gomp_get_num_devices ()) return gomp_pause_host (); - if (device_num < 0 || device_num >= gomp_get_num_devices ()) + if (device_num < 0 || device_num >= num_devices_openmp) return -1; /* Do nothing for target devices for now. */ return 0; diff --git a/libgomp/testsuite/libgomp.c/target-40.c b/libgomp/testsuite/libgomp.c/target-40.c new file mode 100644 index 00000000000..138e16298d5 --- /dev/null +++ b/libgomp/testsuite/libgomp.c/target-40.c @@ -0,0 +1,10 @@ +#include +#include + +int +main () +{ + if (omp_get_initial_device () != omp_get_num_devices ()) + abort (); + return 0; +} -- 2.30.2