diff options
| author | Ilya Verbin <ilya.verbin@intel.com> | 2015-12-14 16:46:54 +0000 |
|---|---|---|
| committer | Ilya Verbin <iverbin@gcc.gnu.org> | 2015-12-14 16:46:54 +0000 |
| commit | d84ffc0a56d84a02929fa67d2edb52d4b81fab37 (patch) | |
| tree | 942a44d60d4c5cc795b051eb83959cabdbc8fe20 /libgomp/oacc-init.c | |
| parent | 755cd5a907454199a9bff3d6f9f4baa4b298289d (diff) | |
| download | gcc-d84ffc0a56d84a02929fa67d2edb52d4b81fab37.zip gcc-d84ffc0a56d84a02929fa67d2edb52d4b81fab37.tar.gz gcc-d84ffc0a56d84a02929fa67d2edb52d4b81fab37.tar.bz2 | |
libgomp.h (gomp_device_state): New enum.
libgomp/
* libgomp.h (gomp_device_state): New enum.
(struct gomp_device_descr): Replace is_initialized with state.
(gomp_fini_device): Remove declaration.
* oacc-host.c (host_dispatch): Use state instead of is_initialized.
* oacc-init.c (acc_init_1): Use state instead of is_initialized.
(acc_shutdown_1): Likewise. Inline gomp_fini_device.
(acc_set_device_type): Use state instead of is_initialized.
(acc_set_device_num): Likewise.
* target.c (resolve_device): Use state instead of is_initialized.
Do not initialize finalized device.
(gomp_map_vars): Do nothing if device is finalized.
(gomp_unmap_vars): Likewise.
(gomp_update): Likewise.
(GOMP_offload_register_ver): Use state instead of is_initialized.
(GOMP_offload_unregister_ver): Likewise.
(gomp_init_device): Likewise.
(gomp_unload_device): Likewise.
(gomp_fini_device): Remove.
(gomp_get_target_fn_addr): Do nothing if device is finalized.
(GOMP_target): Go to host fallback if device is finalized.
(GOMP_target_ext): Likewise.
(gomp_exit_data): Do nothing if device is finalized.
(gomp_target_task_fn): Go to host fallback if device is finalized.
(gomp_target_fini): New static function.
(gomp_target_init): Use state instead of is_initialized.
Call gomp_target_fini at exit.
liboffloadmic/
* plugin/libgomp-plugin-intelmic.cpp (unregister_main_image): Remove.
(register_main_image): Do not call unregister_main_image at exit.
(GOMP_OFFLOAD_fini_device): Allow for OpenMP. Unregister main image.
From-SVN: r231623
Diffstat (limited to 'libgomp/oacc-init.c')
| -rw-r--r-- | libgomp/oacc-init.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libgomp/oacc-init.c b/libgomp/oacc-init.c index 9a9a0b0..c4f7b67 100644 --- a/libgomp/oacc-init.c +++ b/libgomp/oacc-init.c @@ -225,7 +225,7 @@ acc_init_1 (acc_device_t d) acc_dev = &base_dev[goacc_device_num]; gomp_mutex_lock (&acc_dev->lock); - if (acc_dev->is_initialized) + if (acc_dev->state == GOMP_DEVICE_INITIALIZED) { gomp_mutex_unlock (&acc_dev->lock); gomp_fatal ("device already active"); @@ -306,10 +306,11 @@ acc_shutdown_1 (acc_device_t d) { struct gomp_device_descr *acc_dev = &base_dev[i]; gomp_mutex_lock (&acc_dev->lock); - if (acc_dev->is_initialized) + if (acc_dev->state == GOMP_DEVICE_INITIALIZED) { devices_active = true; - gomp_fini_device (acc_dev); + acc_dev->fini_device_func (acc_dev->target_id); + acc_dev->state = GOMP_DEVICE_UNINITIALIZED; } gomp_mutex_unlock (&acc_dev->lock); } @@ -506,7 +507,7 @@ acc_set_device_type (acc_device_t d) acc_dev = &base_dev[goacc_device_num]; gomp_mutex_lock (&acc_dev->lock); - if (!acc_dev->is_initialized) + if (acc_dev->state == GOMP_DEVICE_UNINITIALIZED) gomp_init_device (acc_dev); gomp_mutex_unlock (&acc_dev->lock); @@ -608,7 +609,7 @@ acc_set_device_num (int ord, acc_device_t d) acc_dev = &base_dev[ord]; gomp_mutex_lock (&acc_dev->lock); - if (!acc_dev->is_initialized) + if (acc_dev->state == GOMP_DEVICE_UNINITIALIZED) gomp_init_device (acc_dev); gomp_mutex_unlock (&acc_dev->lock); |