diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-10-22 09:31:01 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2020-10-22 09:31:01 +0200 |
| commit | 74c9882b80bda50b37c9555498de7123c6bdb9e4 (patch) | |
| tree | a076a134ac5adf7de55c2eb0cf7776d79edfb542 /libgomp/icv.c | |
| parent | d3acf7a02631997c5505e109660457fdca3ed2d1 (diff) | |
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 <jakub@redhat.com>
* 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.
Diffstat (limited to 'libgomp/icv.c')
| -rw-r--r-- | libgomp/icv.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libgomp/icv.c b/libgomp/icv.c index 1bb46abac43..4da6527c9b8 100644 --- a/libgomp/icv.c +++ b/libgomp/icv.c @@ -156,12 +156,6 @@ omp_get_proc_bind (void) } int -omp_get_initial_device (void) -{ - return GOMP_DEVICE_HOST_FALLBACK; -} - -int omp_get_num_places (void) { return gomp_places_list_len; @@ -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) |