Revert "[openmp] Add OMPT initialization in libomptarget"

Reverting initial OMPT for target implementation in favor of a different implementation. This reverts commit 3bc8ce5.

Author: jprotze

openmp/libomptarget/CMakeLists.txt

@@ -50,19 +50,6 @@ set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda-n
 set (LIBOMPTARGET_SYSTEM_TARGETS "")
 set (LIBOMPTARGET_TESTED_PLUGINS "")
 
-# Check OMPT support
-set(OMPT_DEFAULT_IN_LIBOMPTARGET FALSE)
-if ((LIBOMP_HAVE_OMPT_SUPPORT) AND (NOT WIN32))
- set(OMPT_DEFAULT_IN_LIBOMPTARGET TRUE)
-endif()
-set(LIBOMP_OMPT_SUPPORT_IN_LIBOMPTARGET ${OMPT_DEFAULT_IN_LIBOMPTARGET} CACHE BOOL
- "OMPT-support in libomptarget?")
-if(LIBOMP_OMPT_SUPPORT_IN_LIBOMPTARGET)
- message(STATUS "OMPT enabled in libomptarget")
-else()
- message(STATUS "OMPT disabled in libomptarget")
-endif()
-
 # Check whether using debug mode. In debug mode, allow dumping progress
 # messages at runtime by default. Otherwise, it can be enabled
 # independently using the LIBOMPTARGET_ENABLE_DEBUG option.

openmp/libomptarget/src/CMakeLists.txt

@@ -20,12 +20,8 @@ set(LIBOMPTARGET_SRC_FILES
  ${CMAKE_CURRENT_SOURCE_DIR}/omptarget.cpp
 )
 
-if(LIBOMP_OMPT_SUPPORT_IN_LIBOMPTARGET)
- list(APPEND LIBOMPTARGET_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ompt-target.cpp)
- list(APPEND LIBOMPTARGET_LLVM_INCLUDE_DIRS ${LIBOMP_INCLUDE_DIR})
-endif()
-
 set(LIBOMPTARGET_SRC_FILES ${LIBOMPTARGET_SRC_FILES} PARENT_SCOPE)
+
 include_directories(${LIBOMPTARGET_LLVM_INCLUDE_DIRS})
 
 # Build libomptarget library with libdl dependency.

openmp/libomptarget/src/ompt-target.cpp

@@ -14,10 +14,6 @@
 #include "device.h"
 #include "private.h"
 
-#if OMPT_SUPPORT
-#include "ompt-target.h"
-#endif
-
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
@@ -193,19 +189,6 @@ void RTLsTy::LoadRTLs() {
  dlsym(dynlib_handle, "__tgt_rtl_destroy_event");
  }
 
-#if OMPT_SUPPORT
- DP("OMPT_SUPPORT is enabled in libomptarget\n");
- DP("Init OMPT for libomptarget\n");
- if (libomp_start_tool) {
- DP("Retrieve libomp_start_tool successfully\n");
- if (!libomp_start_tool(&ompt_target_enabled)) {
- DP("Turn off OMPT in libomptarget because libomp_start_tool returns "
- "false\n");
- memset(&ompt_target_enabled, 0, sizeof(ompt_target_enabled));
- }
- }
-#endif
-
  DP("RTLs loaded!\n");
 
  return;

openmp/libomptarget/src/ompt-target.h

@@ -329,7 +329,6 @@ else()
  set(LIBOMP_HAVE_OMPT_SUPPORT FALSE)
  endif()
 endif()
-set(LIBOMP_HAVE_OMPT_SUPPORT ${LIBOMP_HAVE_OMPT_SUPPORT} PARENT_SCOPE)
 
 # Check if HWLOC support is available
 if(${LIBOMP_USE_HWLOC})

openmp/libomptarget/src/rtl.cpp

@@ -25,9 +25,7 @@ VERSION {
  #
  # OMPT API
  #
- ompt_start_tool; # OMPT start interface
- libomp_start_tool; # OMPT start interface for libomptarget
- libomp_ompt_*; # OMPT callback functions
+ ompt_start_tool; # OMPT start interface
 
  ompc_*; # omp.h renames some standard functions to ompc_*.
  kmp_*; # Intel extensions.

openmp/runtime/cmake/config-ix.cmake

@@ -108,7 +108,7 @@
  macro (kmp_mutex_impl_queuing, 2) /* based on some fair policy */ \
  macro (kmp_mutex_impl_speculative, 3) /* based on HW-supported speculation */
 
-#define FOREACH_OMPT_HOST_EVENT(macro) \
+#define FOREACH_OMPT_EVENT(macro)  \
  \
  /*--- Mandatory Events ---*/ \
  macro (ompt_callback_thread_begin, ompt_callback_thread_begin_t, 1) /* thread begin */ \
@@ -121,9 +121,17 @@
  macro (ompt_callback_task_schedule, ompt_callback_task_schedule_t, 6) /* task schedule */ \
  macro (ompt_callback_implicit_task, ompt_callback_implicit_task_t, 7) /* implicit task */ \
  \
+ macro (ompt_callback_target, ompt_callback_target_t, 8) /* target */ \
+ macro (ompt_callback_target_data_op, ompt_callback_target_data_op_t, 9) /* target data op */ \
+ macro (ompt_callback_target_submit, ompt_callback_target_submit_t, 10) /* target submit */ \
  \
  macro (ompt_callback_control_tool, ompt_callback_control_tool_t, 11) /* control tool */ \
  \
+ macro (ompt_callback_device_initialize, ompt_callback_device_initialize_t, 12) /* device initialize */ \
+ macro (ompt_callback_device_finalize, ompt_callback_device_finalize_t, 13) /* device finalize */ \
+ \
+ macro (ompt_callback_device_load, ompt_callback_device_load_t, 14) /* device load */ \
+ macro (ompt_callback_device_unload, ompt_callback_device_unload_t, 15) /* device unload */ \
  \
  /* Optional Events */ \
  macro (ompt_callback_sync_region_wait, ompt_callback_sync_region_t, 16) /* sync region wait begin or end */ \
@@ -137,6 +145,7 @@
  \
  macro (ompt_callback_masked, ompt_callback_masked_t, 21) /* task at masked begin or end */ \
  \
+ macro (ompt_callback_target_map, ompt_callback_target_map_t, 22) /* target map */ \
  \
  macro (ompt_callback_sync_region, ompt_callback_sync_region_t, 23) /* sync region begin or end */ \
  \
@@ -155,48 +164,11 @@
  macro (ompt_callback_reduction, ompt_callback_sync_region_t, 31) /* reduction */ \
  \
  macro (ompt_callback_dispatch, ompt_callback_dispatch_t, 32) /* dispatch of work */ \
- macro (ompt_callback_error, ompt_callback_error_t, 37) /* error */
-
-
-#define FOREACH_OMPT_DEVICE_EVENT(macro) \
- macro (ompt_callback_device_initialize, ompt_callback_device_initialize_t, 12) /* device initialize */ \
- macro (ompt_callback_device_finalize, ompt_callback_device_finalize_t, 13) /* device finalize */ \
- \
- macro (ompt_callback_device_load, ompt_callback_device_load_t, 14) /* device load */ \
- macro (ompt_callback_device_unload, ompt_callback_device_unload_t, 15) /* device unload */ \
-
-
-#define FOREACH_OMPT_NOEMI_EVENT(macro) \
- macro (ompt_callback_target, ompt_callback_target_t, 8) /* target */ \
- macro (ompt_callback_target_data_op, ompt_callback_target_data_op_t, 9) /* target data op */ \
- macro (ompt_callback_target_submit, ompt_callback_target_submit_t, 10) /* target submit */ \
- macro (ompt_callback_target_map, ompt_callback_target_map_t, 22) /* target map */ \
-
-
-#define FOREACH_OMPT_EMI_EVENT(macro) \
  macro (ompt_callback_target_emi, ompt_callback_target_emi_t, 33) /* target */ \
  macro (ompt_callback_target_data_op_emi,ompt_callback_target_data_op_emi_t,34) /* target data op */ \
  macro (ompt_callback_target_submit_emi, ompt_callback_target_submit_emi_t, 35) /* target submit */ \
  macro (ompt_callback_target_map_emi, ompt_callback_target_map_emi_t, 36) /* target map */ \
-
-#define FOREACH_OMPT_50_TARGET_EVENT(macro) \
- FOREACH_OMPT_DEVICE_EVENT(macro) \
- FOREACH_OMPT_NOEMI_EVENT(macro) 
-
-#define FOREACH_OMPT_51_TARGET_EVENT(macro) \
- FOREACH_OMPT_DEVICE_EVENT(macro) \
- FOREACH_OMPT_EMI_EVENT(macro) 
-
-#define FOREACH_OMPT_EVENT(macro) \
- FOREACH_OMPT_HOST_EVENT(macro) \
- FOREACH_OMPT_DEVICE_EVENT(macro) \
- FOREACH_OMPT_NOEMI_EVENT(macro) \
- FOREACH_OMPT_EMI_EVENT(macro)
-
-#define FOREACH_OMPT_51_EVENT(macro) \
- FOREACH_OMPT_HOST_EVENT(macro) \
- FOREACH_OMPT_DEVICE_EVENT(macro) \
- FOREACH_OMPT_EMI_EVENT(macro)
+ macro (ompt_callback_error, ompt_callback_error_t, 37) /* error */
 
 /*****************************************************************************
  * implementation specific types

openmp/runtime/src/exports_so.txt

@@ -86,8 +86,8 @@
 
 #define ompt_callback_masked_implemented ompt_event_MAY_ALWAYS_OPTIONAL
 
-#define ompt_callback_target_map_implemented ompt_event_MAY_ALWAYS_OPTIONAL
-#define ompt_callback_target_map_emi_implemented ompt_event_MAY_ALWAYS_OPTIONAL
+#define ompt_callback_target_map_implemented ompt_event_UNIMPLEMENTED
+#define ompt_callback_target_map_emi_implemented ompt_event_UNIMPLEMENTED
 
 #define ompt_callback_sync_region_implemented ompt_event_MAY_ALWAYS_OPTIONAL
 

openmp/runtime/src/include/omp-tools.h.var

@@ -86,8 +86,6 @@ enum tool_setting_e {
 
 ompt_callbacks_active_t ompt_enabled;
 
-ompt_target_callbacks_active_t ompt_target_enabled;
-
 ompt_state_info_t ompt_state_info[] = {
 #define ompt_state_macro(state, code) {#state, state},
  FOREACH_OMPT_STATE(ompt_state_macro)
@@ -102,10 +100,6 @@ kmp_mutex_impl_info_t kmp_mutex_impl_info[] = {
 
 ompt_callbacks_internal_t ompt_callbacks;
 
-ompt_target_callbacks_internal_t ompt_target_callbacks;
-
-ompt_callbacks_internal_noemi_t ompt_callbacks_noemi;
-
 static ompt_start_tool_result_t *ompt_start_tool_result = NULL;
 
 #if KMP_OS_WINDOWS
@@ -131,51 +125,6 @@ OMPT_API_ROUTINE ompt_data_t *ompt_get_thread_data(void);
 typedef ompt_start_tool_result_t *(*ompt_start_tool_t)(unsigned int,
  const char *);
 
-_OMP_EXTERN OMPT_WEAK_ATTRIBUTE bool
-libomp_start_tool(ompt_target_callbacks_active_t *libomptarget_ompt_enabled) {
- if (!TCR_4(__kmp_init_middle)) {
- __kmp_middle_initialize();
- }
- bool ret = false;
- libomptarget_ompt_enabled->enabled = ompt_enabled.enabled;
- if (ompt_enabled.enabled) {
- ret = true;
-#define ompt_event_macro(event_name, callback_type, event_id) \
- libomptarget_ompt_enabled->event_name = ompt_target_enabled.event_name;
-
- FOREACH_OMPT_51_TARGET_EVENT(ompt_event_macro)
-#undef ompt_event_macro
- }
- return ret;
-}
-
-void ompt_callback_target_data_op_emi_wrapper(
- ompt_scope_endpoint_t endpoint, ompt_data_t *target_task_data,
- ompt_data_t *target_data, ompt_id_t *host_op_id,
- ompt_target_data_op_t optype, void *src_addr, int src_device_num,
- void *dest_addr, int dest_device_num, size_t bytes,
- const void *codeptr_ra) {}
-
-void ompt_callback_target_emi_wrapper(ompt_target_t kind,
- ompt_scope_endpoint_t endpoint,
- int device_num, ompt_data_t *task_data,
- ompt_data_t *target_task_data,
- ompt_data_t *target_data,
- const void *codeptr_ra) {}
-
-void ompt_callback_target_map_emi_wrapper(ompt_data_t *target_data,
- unsigned int nitems, void **host_addr,
- void **device_addr, size_t *bytes,
- unsigned int *mapping_flags,
- const void *codeptr_ra) {}
-
-void ompt_callback_target_submit_emi_wrapper(ompt_scope_endpoint_t endpoint,
- ompt_data_t *target_data,
- ompt_id_t *host_op_id,
- unsigned int requested_num_teams) {
-
-}
-
 #if KMP_OS_DARWIN
 
 // While Darwin supports weak symbols, the library that wishes to provide a new
@@ -629,37 +578,7 @@ OMPT_API_ROUTINE ompt_set_result_t ompt_set_callback(ompt_callbacks_t which,
  else \
  return ompt_set_always;
 
- FOREACH_OMPT_HOST_EVENT(ompt_event_macro)
-
-#undef ompt_event_macro
-
-#define ompt_event_macro(event_name, callback_type, event_id) \
- case event_name: \
- ompt_target_callbacks.ompt_callback(event_name) = (callback_type)callback; \
- ompt_target_enabled.event_name = (callback != 0); \
- if (callback) \
- return ompt_event_implementation_status(event_name); \
- else \
- return ompt_set_always;
-
- FOREACH_OMPT_51_TARGET_EVENT(ompt_event_macro)
-
-#undef ompt_event_macro
-
-#define ompt_event_macro(event_name, callback_type, event_id) \
- case event_name: \
- ompt_callbacks_noemi.ompt_callback(event_name) = (callback_type)callback; \
- ompt_target_enabled.ompt_emi_event(event_name) = (callback != 0); \
- if (callback) { \
- ompt_target_callbacks.ompt_emi_callback(event_name) = \
- (ompt_emi_callback_type(event_name))(&ompt_emi_wrapper(event_name)); \
- return ompt_event_implementation_status(event_name); \
- } else { \
- ompt_target_callbacks.ompt_emi_callback(event_name) = NULL; \
- return ompt_set_always; \
- }
-
- FOREACH_OMPT_NOEMI_EVENT(ompt_event_macro)
+ FOREACH_OMPT_EVENT(ompt_event_macro)
 
 #undef ompt_event_macro
 
@@ -686,56 +605,7 @@ OMPT_API_ROUTINE int ompt_get_callback(ompt_callbacks_t which,
  return ompt_get_callback_failure; \
  }
 
- FOREACH_OMPT_HOST_EVENT(ompt_event_macro)
-
-#undef ompt_event_macro
-
-#define ompt_event_macro(event_name, callback_type, event_id) \
- case event_name: { \
- ompt_callback_t mycb = \
- (ompt_callback_t)ompt_target_callbacks.ompt_callback(event_name); \
- if (ompt_target_enabled.event_name && mycb) { \
- *callback = mycb; \
- return ompt_get_callback_success; \
- } \
- return ompt_get_callback_failure; \
- }
-
- FOREACH_OMPT_DEVICE_EVENT(ompt_event_macro)
-
-#undef ompt_event_macro
-
-#define ompt_event_macro(event_name, callback_type, event_id) \
- case ompt_emi_event(event_name): { \
- ompt_callback_t mycb = \
- (ompt_callback_t)ompt_target_callbacks.ompt_emi_callback(event_name); \
- if (ompt_target_enabled.ompt_emi_event(event_name) && \
- mycb != (ompt_callback_t)(&ompt_emi_wrapper(event_name))) { \
- *callback = mycb; \
- return ompt_get_callback_success; \
- } \
- return ompt_get_callback_failure; \
- }
-
- FOREACH_OMPT_NOEMI_EVENT(ompt_event_macro)
-
-#undef ompt_event_macro
-
-#define ompt_event_macro(event_name, callback_type, event_id) \
- case event_name: { \
- ompt_callback_t mycb = \
- (ompt_callback_t)ompt_callbacks_noemi.ompt_callback(event_name); \
- ompt_callback_t wrapper = \
- (ompt_callback_t)ompt_target_callbacks.ompt_emi_callback(event_name); \
- if (ompt_target_enabled.ompt_emi_event(event_name) && \
- wrapper == (ompt_callback_t)(&ompt_emi_wrapper(event_name))) { \
- *callback = mycb; \
- return ompt_get_callback_success; \
- } \
- return ompt_get_callback_failure; \
- }
-
- FOREACH_OMPT_NOEMI_EVENT(ompt_event_macro)
+ FOREACH_OMPT_EVENT(ompt_event_macro)
 
 #undef ompt_event_macro