[OMPT] A few improvements

[hbae]

Summary

This change includes miscellaneous improvements as follows.

• added ompt_get_proc_id() implementation for Windows
• added parser and print tool for omp-tool-var, just in case it needs to be printed (OMP_DISPLAY_ENV)
• omp_control_tool is exported on Windows

[jlpeyton]

LGTM

runtime/src/dllexports

%ifdef OMP_50
     omp_const_mem_alloc                    DATA
     omp_high_bw_mem_alloc                  DATA
     omp_low_lat_mem_alloc                  DATA
     omp_cgroup_mem_alloc                   DATA
     omp_pteam_mem_alloc                    DATA
     omp_thread_mem_alloc                   DATA
 %endif # OMP_50
 
+%ifdef OMP_50
+    omp_control_tool                        891
+%endif # OMP_50
 %ifndef stub
     # Ordinals between 900 and 999 are reserved
 
     # Ordinals between 1000 and 1999 are reserved
     # for user-callable uppercase Fortran entries.
 
 
     # ATOMIC entries

runtime/src/kmp_dispatch.h

 //===----------------------------------------------------------------------===//
 
 #ifndef KMP_DISPATCH_H
 #define KMP_DISPATCH_H
 
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
 
-// Need to raise Win version from XP to Vista here for support of
-// InterlockedExchange64
-#if defined(_WIN32_WINNT) && defined(_M_IX86)
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
-
 #include "kmp.h"
 #include "kmp_error.h"
 #include "kmp_i18n.h"
 #include "kmp_itt.h"
 #include "kmp_stats.h"
 #include "kmp_str.h"
 #if KMP_OS_WINDOWS && KMP_ARCH_X86
 #include <float.h>

runtime/src/kmp_dispatch.cpp

 
 /* Dynamic scheduling initialization and dispatch.
  *
  * NOTE: __kmp_nth is a constant inside of any dispatch loop, however
  *       it may change values between parallel regions.  __kmp_max_nth
  *       is the largest value __kmp_nth may take, 1 is the smallest.
  */
 
-// Need to raise Win version from XP to Vista here for support of
-// InterlockedExchange64
-#if defined(_WIN32_WINNT) && defined(_M_IX86)
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
-
 #include "kmp.h"
 #include "kmp_error.h"
 #include "kmp_i18n.h"
 #include "kmp_itt.h"
 #include "kmp_stats.h"
 #include "kmp_str.h"
 #if KMP_OS_WINDOWS && KMP_ARCH_X86
 #include <float.h>

runtime/src/kmp_settings.h

 int __kmp_convert_to_milliseconds(char const *);
 int __kmp_default_tp_capacity(int, int, int);
 
 #if KMP_MIC
 #define KMP_STR_BUF_PRINT_NAME                                                 \
   __kmp_str_buf_print(buffer, "  %s %s", KMP_I18N_STR(Device), name)
 #define KMP_STR_BUF_PRINT_NAME_EX(x)                                           \
   __kmp_str_buf_print(buffer, "  %s %s='", KMP_I18N_STR(Device), x)
+#define KMP_STR_BUF_PRINT_BOOL_EX(n, v, t, f)                                  \
+  __kmp_str_buf_print(buffer, "  %s %s='%s'\n", KMP_I18N_STR(Device), n,       \
+                      (v) ? t : f)
 #define KMP_STR_BUF_PRINT_BOOL                                                 \
-  __kmp_str_buf_print(buffer, "  %s %s='%s'\n", KMP_I18N_STR(Device), name,    \
-                      value ? "TRUE" : "FALSE");
+  KMP_STR_BUF_PRINT_BOOL_EX(name, value, "TRUE", "FALSE")
 #define KMP_STR_BUF_PRINT_INT                                                  \
   __kmp_str_buf_print(buffer, "  %s %s='%d'\n", KMP_I18N_STR(Device), name,    \
                       value)
 #define KMP_STR_BUF_PRINT_UINT64                                               \
   __kmp_str_buf_print(buffer, "  %s %s='%" KMP_UINT64_SPEC "'\n",              \
                       KMP_I18N_STR(Device), name, value);
 #define KMP_STR_BUF_PRINT_STR                                                  \
   __kmp_str_buf_print(buffer, "  %s %s='%s'\n", KMP_I18N_STR(Device), name,    \
                       value)
 #else
 #define KMP_STR_BUF_PRINT_NAME                                                 \
   __kmp_str_buf_print(buffer, "  %s %s", KMP_I18N_STR(Host), name)
 #define KMP_STR_BUF_PRINT_NAME_EX(x)                                           \
   __kmp_str_buf_print(buffer, "  %s %s='", KMP_I18N_STR(Host), x)
+#define KMP_STR_BUF_PRINT_BOOL_EX(n, v, t, f)                                  \
+  __kmp_str_buf_print(buffer, "  %s %s='%s'\n", KMP_I18N_STR(Host), n,         \
+                      (v) ? t : f)
 #define KMP_STR_BUF_PRINT_BOOL                                                 \
-  __kmp_str_buf_print(buffer, "  %s %s='%s'\n", KMP_I18N_STR(Host), name,      \
-                      value ? "TRUE" : "FALSE");
+  KMP_STR_BUF_PRINT_BOOL_EX(name, value, "TRUE", "FALSE")
 #define KMP_STR_BUF_PRINT_INT                                                  \
   __kmp_str_buf_print(buffer, "  %s %s='%d'\n", KMP_I18N_STR(Host), name, value)
 #define KMP_STR_BUF_PRINT_UINT64                                               \
   __kmp_str_buf_print(buffer, "  %s %s='%" KMP_UINT64_SPEC "'\n",              \
                       KMP_I18N_STR(Host), name, value);
 #define KMP_STR_BUF_PRINT_STR                                                  \
   __kmp_str_buf_print(buffer, "  %s %s='%s'\n", KMP_I18N_STR(Host), name, value)
 #endif
 
 #endif // KMP_SETTINGS_H
 
 // end of file //

runtime/src/kmp_settings.cpp

 static void __kmp_stg_print_omp_cancellation(kmp_str_buf_t *buffer,
                                              char const *name, void *data) {
   __kmp_stg_print_bool(buffer, name, __kmp_omp_cancellation);
 } // __kmp_stg_print_omp_cancellation
 
 #endif
 
 #if OMP_50_ENABLED && OMPT_SUPPORT
+static int __kmp_tool = 1;
+
+static void __kmp_stg_parse_omp_tool(char const *name, char const *value,
+                                     void *data) {
+  __kmp_stg_parse_bool(name, value, &__kmp_tool);
+} // __kmp_stg_parse_omp_tool
+
+static void __kmp_stg_print_omp_tool(kmp_str_buf_t *buffer, char const *name,
+                                     void *data) {
+  if (__kmp_env_format) {
+    KMP_STR_BUF_PRINT_BOOL_EX(name, __kmp_tool, "enabled", "disabled");
+  } else {
+    __kmp_str_buf_print(buffer, "   %s=%s\n", name,
+                        __kmp_tool ? "enabled" : "disabled");
+  }
+} // __kmp_stg_print_omp_tool
 
 static char *__kmp_tool_libraries = NULL;
 
 static void __kmp_stg_parse_omp_tool_libraries(char const *name,
                                                char const *value, void *data) {
   __kmp_stg_parse_str(name, value, &__kmp_tool_libraries);
 } // __kmp_stg_parse_omp_tool_libraries
 

 #endif
 
 #if OMP_50_ENABLED
     {"OMP_ALLOCATOR", __kmp_stg_parse_allocator, __kmp_stg_print_allocator,
      NULL, 0, 0},
 #endif
 
 #if OMP_50_ENABLED && OMPT_SUPPORT
+    {"OMP_TOOL", __kmp_stg_parse_omp_tool, __kmp_stg_print_omp_tool, NULL, 0,
+     0},
     {"OMP_TOOL_LIBRARIES", __kmp_stg_parse_omp_tool_libraries,
      __kmp_stg_print_omp_tool_libraries, NULL, 0, 0},
 #endif
 
     {"", NULL, NULL, NULL, 0, 0}}; // settings
 
 static int const __kmp_stg_count =
     sizeof(__kmp_stg_table) / sizeof(kmp_setting_t);

runtime/src/kmp_str.cpp

int __kmp_str_match(char const *target, int len, char const *data) {
   }
   return ((len > 0) ? i >= len : (!target[i] && (len || !data[i])));
 } // __kmp_str_match
 
 int __kmp_str_match_false(char const *data) {
   int result =
       __kmp_str_match("false", 1, data) || __kmp_str_match("off", 2, data) ||
       __kmp_str_match("0", 1, data) || __kmp_str_match(".false.", 2, data) ||
-      __kmp_str_match(".f.", 2, data) || __kmp_str_match("no", 1, data);
+      __kmp_str_match(".f.", 2, data) || __kmp_str_match("no", 1, data) ||
+      __kmp_str_match("disabled", 0, data);
   return result;
 } // __kmp_str_match_false
 
 int __kmp_str_match_true(char const *data) {
   int result =
       __kmp_str_match("true", 1, data) || __kmp_str_match("on", 2, data) ||
       __kmp_str_match("1", 1, data) || __kmp_str_match(".true.", 2, data) ||
-      __kmp_str_match(".t.", 2, data) || __kmp_str_match("yes", 1, data);
+      __kmp_str_match(".t.", 2, data) || __kmp_str_match("yes", 1, data) ||
+      __kmp_str_match("enabled", 0, data);
   return result;
 } // __kmp_str_match_true
 
 void __kmp_str_replace(char *str, char search_for, char replace_with) {
   char *found = NULL;
 
   found = strchr(str, search_for);
   while (found) {

runtime/src/ompt-general.cpp

 #endif
 }
 
 /*****************************************************************************
  * places
  ****************************************************************************/
 
 OMPT_API_ROUTINE int ompt_get_proc_id(void) {
-#if KMP_OS_LINUX
   if (__kmp_get_gtid() < 0)
     return -1;
-
+#if KMP_OS_LINUX
   return sched_getcpu();
+#elif KMP_OS_WINDOWS
+  PROCESSOR_NUMBER pn;
+  GetCurrentProcessorNumberEx(&pn);
+  return 64 * pn.Group + pn.Number;
 #else
   return -1;
 #endif
 }
 
 /*****************************************************************************
  * compatability
  ****************************************************************************/