On Thu, Oct 15, 2020 at 01:02:29PM +0200, Jakub Jelinek via Gcc-patches wrote:
> 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-21 Jakub Jelinek <ja...@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.
--- libgomp/icv.c.jj 2020-10-13 22:29:22.202958364 +0200
+++ libgomp/icv.c 2020-10-21 12:31:05.941289010 +0200
@@ -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)
--- libgomp/icv-device.c.jj 2020-01-12 11:54:39.016374137 +0100
+++ libgomp/icv-device.c 2020-10-21 12:32:24.827131320 +0200
@@ -43,6 +43,12 @@ omp_get_default_device (void)
}
int
+omp_get_initial_device (void)
+{
+ return gomp_get_num_devices ();
+}
+
+int
omp_get_num_devices (void)
{
return gomp_get_num_devices ();
@@ -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)
--- libgomp/target.c.jj 2020-10-20 19:51:38.149361531 +0200
+++ libgomp/target.c 2020-10-21 12:43:19.336526122 +0200
@@ -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, unsi
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 d
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,
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
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
|| 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
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
|| 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 *ho
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;
--- libgomp/libgomp.texi.jj 2020-10-20 14:37:36.594968429 +0200
+++ libgomp/libgomp.texi 2020-10-21 13:06:31.593116640 +0200
@@ -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
@@ -352,6 +353,33 @@ disabled by default.
@end table
+
+@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
--- libgomp/config/gcn/icv-device.c.jj 2020-01-12 11:54:39.012374197 +0100
+++ libgomp/config/gcn/icv-device.c 2020-10-21 12:32:54.423696983 +0200
@@ -40,6 +40,12 @@ omp_get_default_device (void)
}
int
+omp_get_initial_device (void)
+{
+ return GOMP_DEVICE_HOST_FALLBACK;
+}
+
+int
omp_get_num_devices (void)
{
return 0;
@@ -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)
--- libgomp/config/nvptx/icv-device.c.jj 2020-01-12 11:54:39.013374182
+0100
+++ libgomp/config/nvptx/icv-device.c 2020-10-21 12:33:29.757178445 +0200
@@ -40,6 +40,12 @@ omp_get_default_device (void)
}
int
+omp_get_initial_device (void)
+{
+ return GOMP_DEVICE_HOST_FALLBACK;
+}
+
+int
omp_get_num_devices (void)
{
return 0;
@@ -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)
--- libgomp/testsuite/libgomp.c/target-40.c.jj 2020-10-21 13:10:55.658250523
+0200
+++ libgomp/testsuite/libgomp.c/target-40.c 2020-10-21 13:10:49.348342902
+0200
@@ -0,0 +1,10 @@
+#include <omp.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+ if (omp_get_initial_device () != omp_get_num_devices ())
+ abort ();
+ return 0;
+}
Jakub
