diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2023-06-16 17:21:59 +0200 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2023-06-16 17:48:09 +0200 |
| commit | 8216ca85037be9f4d5c20540522a22a4a93b660e (patch) | |
| tree | 8c861605f379299840b712a519faeddbbef1cae4 /libgomp/target.c | |
| parent | 95020d33ad6991fe4fbdccf70e7133116cac68f4 (diff) | |
| download | gcc-8216ca85037be9f4d5c20540522a22a4a93b660e.zip gcc-8216ca85037be9f4d5c20540522a22a4a93b660e.tar.gz gcc-8216ca85037be9f4d5c20540522a22a4a93b660e.tar.bz2 | |
libgomp: Fix OMP_TARGET_OFFLOAD=mandatory
It turned out that gomp_init_targets_once() was not run when directly
calling 'omp target' or 'omp target (enter/exit) data' causing an
abort with OMP_TARGET_OFFLOAD=mandatory wrongly claiming that no
device is available. It was called a tiny bit later but few lines too
late for updating the default-device-var.
libgomp/ChangeLog:
* target.c (resolve_device): Call gomp_get_num_devices early to ensure
gomp_init_targets_once was called before using default-device-var.
* testsuite/libgomp.c/target-55.c: New test.
* testsuite/libgomp.c/target-55a.c: New test.
Diffstat (limited to 'libgomp/target.c')
| -rw-r--r-- | libgomp/target.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libgomp/target.c b/libgomp/target.c index e39ef8f..b6a7214 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -138,6 +138,10 @@ gomp_get_num_devices (void) static struct gomp_device_descr * resolve_device (int device_id, bool remapped) { + /* Get number of devices and thus ensure that 'gomp_init_targets_once' was + called, which must be done before using default_device_var. */ + int num_devices = gomp_get_num_devices (); + if (remapped && device_id == GOMP_DEVICE_ICV) { struct gomp_task_icv *icv = gomp_icv (false); @@ -151,7 +155,7 @@ resolve_device (int device_id, bool remapped) : omp_initial_device)) return NULL; if (gomp_target_offload_var == GOMP_TARGET_OFFLOAD_MANDATORY - && gomp_get_num_devices () == 0) + && num_devices == 0) gomp_fatal ("OMP_TARGET_OFFLOAD is set to MANDATORY, " "but only the host device is available"); else if (device_id == omp_invalid_device) @@ -162,10 +166,10 @@ resolve_device (int device_id, bool remapped) return NULL; } - else if (device_id >= gomp_get_num_devices ()) + else if (device_id >= num_devices) { if (gomp_target_offload_var == GOMP_TARGET_OFFLOAD_MANDATORY - && device_id != num_devices_openmp) + && device_id != num_devices) gomp_fatal ("OMP_TARGET_OFFLOAD is set to MANDATORY, " "but device not found"); |