From 8d07e3195068623b18a79b21d6fce0244df122f3 Mon Sep 17 00:00:00 2001
From: Jonathan Peyton <jonathan.l.peyton@intel.com>
Date: Tue, 21 Jun 2016 15:59:34 +0000
Subject: [PATCH] Addition of debugger comments and whitespace
The removal of legacy code to support long-deprecated debugger support library
resulted in some whitespace changes. Comments from that legacy code were made
public as they may be useful for other debuggers.
Patch by Olga Malysheva.
Differential Revision: http://reviews.llvm.org/D21391
git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@273282 91177308-0d34-0410-b5e6-96231b3b80d8
---
runtime/src/dllexports | 16 ++++++++--------
runtime/src/kmp_runtime.c | 1 -
runtime/src/kmp_tasking.c | 4 ++++
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/runtime/src/dllexports b/runtime/src/dllexports
index d4ec6fe..fe1f5f2 100644
--- a/runtime/src/dllexports
+++ b/runtime/src/dllexports
@@ -186,15 +186,15 @@
__kmp_omp_debug_struct_info DATA
%endif
- # Symbols for MS mutual detection:
- _You_must_link_with_exactly_one_OpenMP_library DATA
- _You_must_link_with_Intel_OpenMP_library DATA
- %ifdef msvc_compat
- _You_must_link_with_Microsoft_OpenMP_library DATA
- %endif
+ # Symbols for MS mutual detection:
+ _You_must_link_with_exactly_one_OpenMP_library DATA
+ _You_must_link_with_Intel_OpenMP_library DATA
+ %ifdef msvc_compat
+ _You_must_link_with_Microsoft_OpenMP_library DATA
+ %endif
- __kmp_wait_64
- __kmp_release_64
+ __kmp_wait_64
+ __kmp_release_64
# VT_getthid 1
diff --git a/runtime/src/kmp_runtime.c b/runtime/src/kmp_runtime.c
index 131d5a3..446dccb 100644
--- a/runtime/src/kmp_runtime.c
+++ b/runtime/src/kmp_runtime.c
@@ -531,7 +531,6 @@ static void __kmp_fini_allocator() {}
#ifdef KMP_DYNAMIC_LIB
# if KMP_OS_WINDOWS
-
static void
__kmp_reset_lock( kmp_bootstrap_lock_t* lck ) {
// TODO: Change to __kmp_break_bootstrap_lock().
diff --git a/runtime/src/kmp_tasking.c b/runtime/src/kmp_tasking.c
index f5bf65b..79466d8 100644
--- a/runtime/src/kmp_tasking.c
+++ b/runtime/src/kmp_tasking.c
@@ -1420,6 +1420,7 @@ __kmpc_omp_taskwait( ident_t *loc_ref, kmp_int32 gtid )
}
#endif
+ // Debugger: The taskwait is active. Store location and thread encountered the taskwait.
#if USE_ITT_BUILD
// Note: These values are used by ITT events as well.
#endif /* USE_ITT_BUILD */
@@ -1452,6 +1453,7 @@ __kmpc_omp_taskwait( ident_t *loc_ref, kmp_int32 gtid )
#endif /* USE_ITT_BUILD */
// GEH TODO: shouldn't we have some sort of OMPRAP API calls here to mark end of wait?
+ // Debugger: The taskwait is completed. Location remains, but thread is negated.
taskdata->td_taskwait_thread = - taskdata->td_taskwait_thread;
#if OMPT_SUPPORT && OMPT_TRACE
@@ -1494,6 +1496,7 @@ __kmpc_omp_taskyield( ident_t *loc_ref, kmp_int32 gtid, int end_part )
thread = __kmp_threads[ gtid ];
taskdata = thread -> th.th_current_task;
// Should we model this as a task wait or not?
+ // Debugger: The taskwait is active. Store location and thread encountered the taskwait.
#if USE_ITT_BUILD
// Note: These values are used by ITT events as well.
#endif /* USE_ITT_BUILD */
@@ -1521,6 +1524,7 @@ __kmpc_omp_taskyield( ident_t *loc_ref, kmp_int32 gtid, int end_part )
#endif /* USE_ITT_BUILD */
// GEH TODO: shouldn't we have some sort of OMPRAP API calls here to mark end of wait?
+ // Debugger: The taskwait is completed. Location remains, but thread is negated.
taskdata->td_taskwait_thread = - taskdata->td_taskwait_thread;
}
--
GitLab