Cleanup OMPT after merge

Author: jprotze

runtime/CMakeLists.txt

@@ -194,12 +194,6 @@ elseif("${libomp_build_type_lowercase}" STREQUAL "minsizerel")
   set(MINSIZEREL_BUILD TRUE)
 endif()
 
-# OMPD-support
-set(OMPD_SUPPORT FALSE)
-if("${ompd_support}") # string "on" or "ON" is seen as boolean TRUE
-    set(OMPD_SUPPORT TRUE)
-endif()
-
 # Include itt notify interface?
 set(LIBOMP_USE_ITT_NOTIFY TRUE CACHE BOOL
   "Enable ITT notify?")
@@ -314,6 +308,9 @@ endif()
 set(LIBOMP_OMPT_SUPPORT ${OMPT_DEFAULT} CACHE BOOL
   "OMPT-support?")
 
+set(LIBOMP_OMPD_SUPPORT FALSE CACHE BOOL "OMPD-support?")
+
+
 set(LIBOMP_OMPT_DEBUG FALSE CACHE BOOL
   "Trace OMPT initialization?")
 set(LIBOMP_OMPT_OPTIONAL TRUE CACHE BOOL

runtime/src/CMakeLists.txt

@@ -194,7 +194,7 @@ if(WIN32)
   libomp_append(LIBOMP_MASM_DEFINITIONS "-D_M_IA32" IF_TRUE IA32)
   libomp_append(LIBOMP_MASM_DEFINITIONS "-D_M_AMD64" IF_TRUE INTEL64)
   libomp_append(LIBOMP_MASM_DEFINITIONS "-DOMPT_SUPPORT" IF_TRUE_1_0 LIBOMP_OMPT_SUPPORT)
-  libomp_append(LIBOMP_MASM_DEFINITIONS "OMPD_SUPPORT" IF_TRUE_1_0 LIBOMP_OMPD_SUPPORT)
+  libomp_append(LIBOMP_MASM_DEFINITIONS "-DOMPD_SUPPORT" IF_TRUE_1_0 LIBOMP_OMPD_SUPPORT)
   libomp_list_to_string("${LIBOMP_MASM_DEFINITIONS}" LIBOMP_MASM_DEFINITIONS)
   set_property(SOURCE z_Windows_NT-586_asm.asm APPEND_STRING PROPERTY COMPILE_FLAGS " ${LIBOMP_MASM_DEFINITIONS}")
   set_source_files_properties(thirdparty/ittnotify/ittnotify_static.c PROPERTIES COMPILE_DEFINITIONS "UNICODE")

runtime/src/kmp_runtime.cpp

@@ -1792,14 +1792,11 @@ int __kmp_fork_call(ident_t *loc, int gtid,
                                    exit_runtime_p
 #endif
                                    );
-#if OMPT_SUPPORT
-                *exit_runtime_p=0;
-#endif
           }
 
 #if OMPT_SUPPORT
           if (ompt_enabled.enabled) {
-            exit_runtime_p = NULL;
+            *exit_runtime_p = NULL;
             if (ompt_enabled.ompt_callback_implicit_task) {
               ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
                   ompt_scope_end, NULL, &(task_info->task_data), 1,
@@ -1897,9 +1894,6 @@ int __kmp_fork_call(ident_t *loc, int gtid,
                                    exit_runtime_p
 #endif
                                    );
-#if OMPT_SUPPORT
-                *exit_runtime_p=0;
-#endif
           }
 
 #if OMPT_SUPPORT

runtime/src/kmp_tasking.cpp

@@ -587,9 +587,6 @@ void __kmpc_omp_task_begin_if0(ident_t *loc_ref, kmp_int32 gtid,
                                    OMPT_LOAD_RETURN_ADDRESS(gtid));
     return;
   }
-    if (ompt_enabled)
-        taskdata->ompt_task_info.scheduling_parent = current_task;
-        
 #endif
   __kmpc_omp_task_begin_if0_template<false>(loc_ref, gtid, task, NULL, NULL);
 }

runtime/src/ompt-internal.h

@@ -39,8 +39,6 @@ typedef struct ompt_callbacks_active_s {
       (info->td_flags.final ? ompt_task_final : 0x0) |                         \
       (info->td_flags.merged_if0 ? ompt_task_mergeable : 0x0)
 
-//typedef struct kmp_taskdata  kmp_taskdata_t;
-    
 typedef struct {
   ompt_frame_t frame;
   ompt_data_t task_data;