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 /liboffloadmic | |
| parent | 755cd5a907454199a9bff3d6f9f4baa4b298289d (diff) | |
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 'liboffloadmic')
| -rw-r--r-- | liboffloadmic/ChangeLog | 6 | ||||
| -rw-r--r-- | liboffloadmic/plugin/libgomp-plugin-intelmic.cpp | 17 |
2 files changed, 9 insertions, 14 deletions
diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog index fb9fa851512..c6fd49fbf70 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,9 @@ +2015-12-14 Ilya Verbin <ilya.verbin@intel.com> + + * 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. + 2015-11-19 Ilya Verbin <ilya.verbin@intel.com> * plugin/libgomp-plugin-intelmic.cpp (struct TargetImageDesc): New. diff --git a/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp b/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp index f8c172562ae..68f7b2c898b 100644 --- a/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp +++ b/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp @@ -231,12 +231,6 @@ offload (const char *file, uint64_t line, int device, const char *name, } static void -unregister_main_image () -{ - __offload_unregister_image (&main_target_image); -} - -static void register_main_image () { /* Do not check the return value, because old versions of liboffloadmic did @@ -246,12 +240,6 @@ register_main_image () /* liboffloadmic will call GOMP_PLUGIN_target_task_completion when asynchronous task on target is completed. */ __offload_register_task_callback (GOMP_PLUGIN_target_task_completion); - - if (atexit (unregister_main_image) != 0) - { - fprintf (stderr, "%s: atexit failed\n", __FILE__); - exit (1); - } } /* liboffloadmic loads and runs offload_target_main on all available devices @@ -269,8 +257,9 @@ extern "C" void GOMP_OFFLOAD_fini_device (int device) { TRACE ("(device = %d)", device); - /* Unreachable for GOMP_OFFLOAD_CAP_OPENMP_400. */ - abort (); + + /* liboffloadmic will finalize target processes on all available devices. */ + __offload_unregister_image (&main_target_image); } static void |