backport: Makefile.am (liboffloadmic_host_la_DEPENDENCIES): Remove libcoi_host and libmyo-client.

Merge liboffloadmic from upstream, version 20150803.

liboffloadmic/
	* Makefile.am (liboffloadmic_host_la_DEPENDENCIES): Remove libcoi_host
	and libmyo-client.  liboffloadmic_host loads them dynamically.
	* Makefile.in: Regenerate.
	* doc/doxygen/header.tex: Merge from upstream, version 20150803
	<https://openmprtl.org/sites/default/files/liboffload_oss_20150803.tgz>.
	* runtime/cean_util.cpp: Likewise.
	* runtime/cean_util.h: Likewise.
	* runtime/coi/coi_client.cpp: Likewise.
	* runtime/coi/coi_client.h: Likewise.
	* runtime/coi/coi_server.cpp: Likewise.
	* runtime/coi/coi_server.h: Likewise.
	* runtime/compiler_if_host.cpp: Likewise.
	* runtime/compiler_if_host.h: Likewise.
	* runtime/compiler_if_target.cpp: Likewise.
	* runtime/compiler_if_target.h: Likewise.
	* runtime/dv_util.cpp: Likewise.
	* runtime/dv_util.h: Likewise.
	* runtime/liboffload_error.c: Likewise.
	* runtime/liboffload_error_codes.h: Likewise.
	* runtime/liboffload_msg.c: Likewise.
	* runtime/liboffload_msg.h: Likewise.
	* runtime/mic_lib.f90: Likewise.
	* runtime/offload.h: Likewise.
	* runtime/offload_common.cpp: Likewise.
	* runtime/offload_common.h: Likewise.
	* runtime/offload_engine.cpp: Likewise.
	* runtime/offload_engine.h: Likewise.
	* runtime/offload_env.cpp: Likewise.
	* runtime/offload_env.h: Likewise.
	* runtime/offload_host.cpp: Likewise.
	* runtime/offload_host.h: Likewise.
	* runtime/offload_iterator.h: Likewise.
	* runtime/offload_myo_host.cpp: Likewise.
	* runtime/offload_myo_host.h: Likewise.
	* runtime/offload_myo_target.cpp: Likewise.
	* runtime/offload_myo_target.h: Likewise.
	* runtime/offload_omp_host.cpp: Likewise.
	* runtime/offload_omp_target.cpp: Likewise.
	* runtime/offload_orsl.cpp: Likewise.
	* runtime/offload_orsl.h: Likewise.
	* runtime/offload_table.cpp: Likewise.
	* runtime/offload_table.h: Likewise.
	* runtime/offload_target.cpp: Likewise.
	* runtime/offload_target.h: Likewise.
	* runtime/offload_target_main.cpp: Likewise.
	* runtime/offload_timer.h: Likewise.
	* runtime/offload_timer_host.cpp: Likewise.
	* runtime/offload_timer_target.cpp: Likewise.
	* runtime/offload_trace.cpp: Likewise.
	* runtime/offload_trace.h: Likewise.
	* runtime/offload_util.cpp: Likewise.
	* runtime/offload_util.h: Likewise.
	* runtime/ofldbegin.cpp: Likewise.
	* runtime/ofldend.cpp: Likewise.
	* runtime/orsl-lite/include/orsl-lite.h: Likewise.
	* runtime/orsl-lite/lib/orsl-lite.c: Likewise.
	* runtime/use_mpss2.txt: Likewise.
	* include/coi/common/COIEngine_common.h: Merge from upstream, MPSS
	version 3.5
	<http://registrationcenter.intel.com/irc_nas/7445/mpss-src-3.5.tar>.
	* include/coi/common/COIEvent_common.h: Likewise.
	* include/coi/common/COIMacros_common.h: Likewise.
	* include/coi/common/COIPerf_common.h: Likewise.
	* include/coi/common/COIResult_common.h: Likewise.
	* include/coi/common/COISysInfo_common.h: Likewise.
	* include/coi/common/COITypes_common.h: Likewise.
	* include/coi/sink/COIBuffer_sink.h: Likewise.
	* include/coi/sink/COIPipeline_sink.h: Likewise.
	* include/coi/sink/COIProcess_sink.h: Likewise.
	* include/coi/source/COIBuffer_source.h: Likewise.
	* include/coi/source/COIEngine_source.h: Likewise.
	* include/coi/source/COIEvent_source.h: Likewise.
	* include/coi/source/COIPipeline_source.h: Likewise.
	* include/coi/source/COIProcess_source.h: Likewise.
	* include/myo/myo.h: Likewise.
	* include/myo/myoimpl.h: Likewise.
	* include/myo/myotypes.h: Likewise.
	* plugin/Makefile.am (myo_inc_dir): Remove.
	(libgomp_plugin_intelmic_la_CPPFLAGS): Do not define MYO_SUPPORT.
	(AM_CPPFLAGS): Likewise for offload_target_main.
	* plugin/Makefile.in: Regenerate.
	* runtime/emulator/coi_common.h: Update copyright years.
	(OFFLOAD_EMUL_KNC_NUM_ENV): Replace with ...
	(OFFLOAD_EMUL_NUM_ENV): ... this.
	(enum cmd_t): Add CMD_CLOSE_LIBRARY.
	* runtime/emulator/coi_device.cpp: Update copyright years.
	(COIProcessWaitForShutdown): Add space between string constants.
	Return handle to host in CMD_OPEN_LIBRARY.
	Support CMD_CLOSE_LIBRARY.
	* runtime/emulator/coi_device.h: Update copyright years.
	* runtime/emulator/coi_host.cpp: Update copyright years.
	(knc_engines_num): Replace with ...
	(num_engines): ... this.
	(init): Replace OFFLOAD_EMUL_KNC_NUM_ENV with OFFLOAD_EMUL_NUM_ENV.
	(COIEngineGetCount): Replace COI_ISA_KNC with COI_ISA_MIC, and
	knc_engines_num with num_engines.
	(COIEngineGetHandle): Likewise.
	(COIProcessCreateFromMemory): Add space between string constants.
	(COIProcessCreateFromFile): New function.
	(COIProcessLoadLibraryFromMemory): Rename arguments according to
	COIProcess_source.h.  Return handle, received from target.
	(COIProcessUnloadLibrary): New function.
	(COIPipelineClearCPUMask): New function.
	(COIPipelineSetCPUMask): New function.
	(COIEngineGetInfo): New function.
	* runtime/emulator/coi_host.h: Update copyright years.
	* runtime/emulator/coi_version_asm.h: Regenerate.
	* runtime/emulator/coi_version_linker_script.map: Regenerate.
	* runtime/emulator/myo_client.cpp: Update copyright years.
	* runtime/emulator/myo_service.cpp: Update copyright years.
	(myoArenaRelease): New function.
	(myoArenaAcquire): New function.
	(myoArenaAlignedFree): New function.
	(myoArenaAlignedMalloc): New function.
	* runtime/emulator/myo_service.h: Update copyright years.
	* runtime/emulator/myo_version_asm.h: Regenerate.
	* runtime/emulator/myo_version_linker_script.map: Regenerate.

From-SVN: r227532

1 files changed, 163 insertions, 15 deletions

diff --git a/liboffloadmic/runtime/ofldbegin.cpp b/liboffloadmic/runtime/ofldbegin.cpp
index 6f4b536..236500d 100644
--- a/liboffloadmic/runtime/ofldbegin.cpp
+++ b/liboffloadmic/runtime/ofldbegin.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2014 Intel Corporation.  All Rights Reserved.
+    Copyright (c) 2014-2015 Intel Corporation.  All Rights Reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -29,7 +29,7 @@
 
 
 #if HOST_LIBRARY
-#include "offload_host.h"
+#include "offload_table.h"
 #include "offload_myo_host.h"
 #else
 #include "compiler_if_target.h"
@@ -37,6 +37,14 @@
 #include "offload_myo_target.h"
 #endif
 
+// Initializes library and registers specified offload image.
+// Don't use this declarations from offload_host.h as offload_table.h
+// is used instead of it. Using offload_host.h contradicts with
+// STL library compiled with VS2010.
+extern "C" bool __offload_register_image(const void* image);
+extern "C" void __offload_unregister_image(const void* image);
+extern "C" bool __offload_target_image_is_executable(const void *image);
+
 #ifdef TARGET_WINNT
 #define ALLOCATE(name) __declspec(allocate(name))
 #define DLL_LOCAL
@@ -110,33 +118,127 @@ static VarList::Node __offload_var_node = {
 #ifdef MYO_SUPPORT
 
 // offload myo shared var section prolog
+// first element is empty
 ALLOCATE(OFFLOAD_MYO_SHARED_TABLE_SECTION_START)
 #ifdef TARGET_WINNT
 __declspec(align(sizeof(SharedTableEntry)))
 #endif // TARGET_WINNT
-static SharedTableEntry __offload_myo_shared_table_start = { 0 };
+static MYOVarTable::Entry __offload_myo_shared_var_start = { 0 };
+
+// list element for the current module
+// table entry pointer skips the empty first entry
+static MYOVarTableList::Node __offload_myo_shared_var_node = {
+    { &__offload_myo_shared_var_start + 1 },
+    0, 0
+};
+
+// offload myo shared vtable section prolog
+// first element is empty
+ALLOCATE(OFFLOAD_MYO_SHARED_VTABLE_SECTION_START)
+#ifdef TARGET_WINNT
+__declspec(align(sizeof(SharedTableEntry)))
+#endif // TARGET_WINNT
+static MYOVarTable::Entry __offload_myo_shared_vtable_start = { 0 };
+
+// list element for the current module
+// table entry pointer skips the empty first entry
+static MYOVarTableList::Node __offload_myo_shared_vtable_node = {
+    { &__offload_myo_shared_vtable_start + 1 },
+    0, 0
+};
 
-#if HOST_LIBRARY
 // offload myo shared var init section prolog
+// first element is empty
 ALLOCATE(OFFLOAD_MYO_SHARED_INIT_TABLE_SECTION_START)
 #ifdef TARGET_WINNT
 __declspec(align(sizeof(InitTableEntry)))
 #endif // TARGET_WINNT
-static InitTableEntry __offload_myo_shared_init_table_start = { 0 };
+static MYOInitTable::Entry __offload_myo_init_table_start = { 0 };
+
+// list element for the current module
+// table entry pointer skips the empty first entry
+static MYOInitTableList::Node __offload_myo_init_table_node = {
+    { &__offload_myo_init_table_start + 1 },
+    0, 0
+};
+
+// The functions and variables needed for a built-in
+// remote function entry for vtable initialization on MIC
+
+#if !HOST_LIBRARY
+MyoError __offload_init_vtables(void)
+{
+    SharedTableEntry *t_start;
+
+    //OFFLOAD_DEBUG_TRACE(3, "%s\n", __func__);
+    t_start = &__offload_myo_shared_vtable_start + 1;
+    //OFFLOAD_DEBUG_TRACE(3, "%s(%p)\n", __func__, t_start);
+    while (t_start->varName != 0) {
+        //OFFLOAD_DEBUG_TRACE(4,
+        //    "myo shared vtable \"%s\" &myo_ptr = %p myo_ptr = %p\n",
+        //    t_start->varName,
+        //    (void *)(t_start->sharedAddr),
+        //    ((void **)(t_start->sharedAddr))[0]);
+        t_start++;
+    }
+
+    __offload_myo_shared_init_table_process(
+        &__offload_myo_init_table_start + 1);
+    return MYO_SUCCESS;
+}
+#endif  // !HOST_LIBRARY
+
+static void vtable_initializer()
+{
+}
+
+#if !HOST_LIBRARY
+static MyoError vtable_initializer_wrapper()
+{
+    __offload_myoAcquire();
+    __offload_init_vtables();
+    __offload_myoRelease();
+    return MYO_SUCCESS;
+}
 #endif
 
+static void* __offload_vtable_initializer_thunk_ptr = 0;
+
 // offload myo fptr section prolog
+// first element is pre-initialized to the MIC vtable initializer
 ALLOCATE(OFFLOAD_MYO_FPTR_TABLE_SECTION_START)
 #ifdef TARGET_WINNT
 __declspec(align(sizeof(FptrTableEntry)))
 #endif // TARGET_WINNT
-static FptrTableEntry __offload_myo_fptr_table_start = { 0 };
+static MYOFuncTable::Entry __offload_myo_fptr_table_start = {
+#if HOST_LIBRARY
+    "--vtable_initializer--",
+    (void*)&vtable_initializer,
+    (void*)&__offload_vtable_initializer_thunk_ptr,
+#ifdef TARGET_WINNT
+    // Dummy to pad up to 32 bytes
+    0
+#endif // TARGET_WINNT
+#else  // HOST_LIBRARY
+    "--vtable_initializer--",
+    (void*)&vtable_initializer,
+    (void*)&vtable_initializer_wrapper,
+    &__offload_vtable_initializer_thunk_ptr,
+#endif // HOST_LIBRARY
+};
+
+// list element for the current module
+static MYOFuncTableList::Node __offload_myo_fptr_table_node = {
+    { &__offload_myo_fptr_table_start },
+    0, 0
+};
 
 #endif // MYO_SUPPORT
 
 // init/fini code which adds/removes local lookup data to/from the global list
 
 static void offload_fini();
+static void offload_fini_so();
 
 #ifndef TARGET_WINNT
 static void offload_init() __attribute__((constructor(101)));
@@ -150,35 +252,81 @@ static void (*addressof_offload_init)() = offload_init;
 
 static void offload_init()
 {
+    bool success;
+
     // register offload tables
     __offload_register_tables(&__offload_entry_node,
                               &__offload_func_node,
                               &__offload_var_node);
 
 #if HOST_LIBRARY
-    __offload_register_image(&__offload_target_image);
-    atexit(offload_fini);
+    success = __offload_register_image(&__offload_target_image);
+    if (!success)
+    {
+        return;
+    }
 #endif // HOST_LIBRARY
-
 #ifdef MYO_SUPPORT
-    __offload_myoRegisterTables(
 #if HOST_LIBRARY
-        &__offload_myo_shared_init_table_start + 1,
-#endif // HOST_LIBRARY
-        &__offload_myo_shared_table_start + 1,
-        &__offload_myo_fptr_table_start + 1
+    // If this was the main program register main atexit routine
+    if (__offload_myoProcessTables(
+            &__offload_target_image,
+            &__offload_myo_init_table_node,
+            &__offload_myo_shared_var_node,
+            &__offload_myo_shared_vtable_node,
+            &__offload_myo_fptr_table_node))
+    {
+        atexit(offload_fini);
+#ifdef TARGET_WINNT
+    } else {
+        atexit(offload_fini_so);
+#endif
+    }
+#else // HOST_LIBRARY
+    __offload_myoProcessTables(
+        &__offload_myo_init_table_start + 1,
+        &__offload_myo_shared_var_start + 1,
+        &__offload_myo_shared_vtable_start + 1,
+        &__offload_myo_fptr_table_start
     );
+#endif // HOST_LIBRARY
 #endif // MYO_SUPPORT
 }
 
+#ifndef TARGET_WINNT
+static void offload_fini_so() __attribute__((destructor(101)));
+#else // TARGET_WINNT
+static void offload_init_so();
+#endif // TARGET_WINNT
+
 static void offload_fini()
 {
 #if HOST_LIBRARY
     __offload_unregister_image(&__offload_target_image);
 #endif // HOST_LIBRARY
+}
 
-    // unregister offload tables
+static void offload_fini_so()
+{
+    // Offload and MYO tables need to be removed from list
+    // to prevent invalid accesses after dlclose
+    // Remove offload tables
     __offload_unregister_tables(&__offload_entry_node,
                                 &__offload_func_node,
                                 &__offload_var_node);
+#if HOST_LIBRARY
+   if(!__offload_target_image_is_executable(&__offload_target_image)) {
+      __offload_unregister_image(&__offload_target_image);
+   }
+#endif
+#ifdef MYO_SUPPORT
+#if HOST_LIBRARY
+    // Remove MYO tables
+    __offload_myoRemoveTables(
+        &__offload_myo_init_table_node,
+        &__offload_myo_shared_var_node,
+        &__offload_myo_shared_vtable_node,
+        &__offload_myo_fptr_table_node);
+#endif // HOST_LIBRARY
+#endif // MYO_SUPPORT
 }