[Openmp-commits] [openmp] 77dc7b4 - [OpenMP] Fix printing routine for OMP_TOOL_VERBOSE_INIT

[Hansang Bae via Openmp-commits]

Author: Hansang Bae
Date: 2021-04-14T07:55:26-05:00
New Revision: 77dc7b465313345ab0a5929f6f0386dbcab6594c

URL: https://github.com/llvm/llvm-project/commit/77dc7b465313345ab0a5929f6f0386dbcab6594c
DIFF: https://github.com/llvm/llvm-project/commit/77dc7b465313345ab0a5929f6f0386dbcab6594c.diff

LOG: [OpenMP] Fix printing routine for OMP_TOOL_VERBOSE_INIT

Also fixed typo in the verbose message.

Differential Revision: https://reviews.llvm.org/D100414

Added: 
    

Modified: 
    openmp/runtime/src/kmp_settings.cpp
    openmp/runtime/src/ompt-general.cpp
    openmp/runtime/test/ompt/loadtool/tool_available/tool_available.c

Removed: 
    


################################################################################
diff  --git a/openmp/runtime/src/kmp_settings.cpp b/openmp/runtime/src/kmp_settings.cpp
index 7aff8f742783..a4c846d16465 100644
--- a/openmp/runtime/src/kmp_settings.cpp
+++ b/openmp/runtime/src/kmp_settings.cpp
@@ -5080,7 +5080,7 @@ static void __kmp_stg_print_omp_tool_verbose_init(kmp_str_buf_t *buffer,
                                                   char const *name,
                                                   void *data) {
   if (__kmp_tool_verbose_init)
-    __kmp_stg_print_str(buffer, name, __kmp_tool_libraries);
+    __kmp_stg_print_str(buffer, name, __kmp_tool_verbose_init);
   else {
     if (__kmp_env_format) {
       KMP_STR_BUF_PRINT_NAME;

diff  --git a/openmp/runtime/src/ompt-general.cpp b/openmp/runtime/src/ompt-general.cpp
index f755887e896b..b0af1815b210 100644
--- a/openmp/runtime/src/ompt-general.cpp
+++ b/openmp/runtime/src/ompt-general.cpp
@@ -266,7 +266,7 @@ ompt_try_start_tool(unsigned int omp_version, const char *runtime_version) {
 #error Activation of OMPT is not supported on this platform.
 #endif
   if (ret) {
-    OMPT_VERBOSE_INIT_CONTINUED_PRINT("Sucess.\n");
+    OMPT_VERBOSE_INIT_CONTINUED_PRINT("Success.\n");
     OMPT_VERBOSE_INIT_PRINT(
         "Tool was started and is using the OMPT interface.\n");
     OMPT_VERBOSE_INIT_PRINT("----- END LOGGING OF TOOL REGISTRATION -----\n");

diff  --git a/openmp/runtime/test/ompt/loadtool/tool_available/tool_available.c b/openmp/runtime/test/ompt/loadtool/tool_available/tool_available.c
index ed027e0b8704..ba6ce32b921e 100644
--- a/openmp/runtime/test/ompt/loadtool/tool_available/tool_available.c
+++ b/openmp/runtime/test/ompt/loadtool/tool_available/tool_available.c
@@ -84,7 +84,7 @@
 // CHECK-NOT: {{^}}0: Could not register callback
 
 // ADDRSPACE: ----- START LOGGING OF TOOL REGISTRATION -----
-// ADDRSPACE-NEXT: Search for OMP tool in current address space... Sucess.
+// ADDRSPACE-NEXT: Search for OMP tool in current address space... Success.
 // ADDRSPACE-NEXT: Tool was started and is using the OMPT interface.
 // ADDRSPACE-NEXT: ----- END LOGGING OF TOOL REGISTRATION -----