From 2b46d30fc7049fc5cc5b9f98df654509bb4d61a2 Mon Sep 17 00:00:00 2001 From: Joachim Protze Date: Tue, 15 Jan 2019 15:36:53 +0000 Subject: [OMPT] Second chunk of final OMPT 5.0 interface updates The omp-tools.h file is generated from the OpenMP spec to ensure that the interface is implemented as specified. The other changes are necessary to update the interface implementation to the final version as published in 5.0. The omp-tools.h header was previously called ompt.h, currently a copy under this name is installed for legacy tools. Patch partially perpared by @sconvent Reviewers: AndreyChurbanov, hbae, Hahnfeld Reviewed By: hbae Tags: #openmp, #ompt Differential Revision: https://reviews.llvm.org/D55579 llvm-svn: 351197 --- openmp/runtime/src/kmp_csupport.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'openmp/runtime/src/kmp_csupport.cpp') diff --git a/openmp/runtime/src/kmp_csupport.cpp b/openmp/runtime/src/kmp_csupport.cpp index 4c627201f16..61d4a930112 100644 --- a/openmp/runtime/src/kmp_csupport.cpp +++ b/openmp/runtime/src/kmp_csupport.cpp @@ -511,7 +511,7 @@ void __kmpc_end_serialized_parallel(ident_t *loc, kmp_int32 global_tid) { if (ompt_enabled.ompt_callback_implicit_task) { ompt_callbacks.ompt_callback(ompt_callback_implicit_task)( ompt_scope_end, NULL, OMPT_CUR_TASK_DATA(this_thr), 1, - OMPT_CUR_TASK_INFO(this_thr)->thread_num); + OMPT_CUR_TASK_INFO(this_thr)->thread_num, ompt_task_implicit); } // reset clear the task id only after unlinking the task @@ -1292,7 +1292,7 @@ __ompt_get_mutex_impl_type(void *user_lock, kmp_indirect_lock_t *ilock = 0) { return kmp_mutex_impl_speculative; #endif default: - return ompt_mutex_impl_none; + return kmp_mutex_impl_none; } ilock = KMP_LOOKUP_I_LOCK(user_lock); } @@ -1316,7 +1316,7 @@ __ompt_get_mutex_impl_type(void *user_lock, kmp_indirect_lock_t *ilock = 0) { case locktag_nested_drdpa: return kmp_mutex_impl_queuing; default: - return ompt_mutex_impl_none; + return kmp_mutex_impl_none; } } #else @@ -1339,7 +1339,7 @@ static kmp_mutex_impl_t __ompt_get_mutex_impl_type() { return kmp_mutex_impl_speculative; #endif default: - return ompt_mutex_impl_none; + return kmp_mutex_impl_none; } } #endif // KMP_USE_DYNAMIC_LOCK -- cgit v1.2.3