This is an archive of the discontinued LLVM Phabricator instance.

Differential D139867

[OpenMP][libomp] Fix stats-gathering for new MSVC sections API
ClosedPublic

Authored by jlpeyton on Dec 12 2022, 11:28 AM.

Details

Reviewers
tlwilmar
Nawrin
hbae
jdoerfert
Commits
rGf31192253541: [OpenMP][libomp] Fix stats-gathering for new MSVC sections API
Summary

Fix -DLIBOMP_STATS=On builds.

Diff Detail

Event Timeline

jlpeyton created this revision.Dec 12 2022, 11:28 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 12 2022, 11:28 AM
Herald added subscribers: guansong, yaxunl. · View Herald Transcript
jlpeyton requested review of this revision.Dec 12 2022, 11:28 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptDec 12 2022, 11:28 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B202639: Diff 482202.Dec 12 2022, 11:33 AM
tlwilmar accepted this revision.Jan 17 2023, 1:00 PM

LGTM

This revision is now accepted and ready to land.Jan 17 2023, 1:00 PM
Closed by commit rGf31192253541: [OpenMP][libomp] Fix stats-gathering for new MSVC sections API (authored by jlpeyton). · Explain WhyJan 18 2023, 10:02 AM
This revision was automatically updated to reflect the committed changes.
jlpeyton added a commit: rGf31192253541: [OpenMP][libomp] Fix stats-gathering for new MSVC sections API.

Revision Contents

PathSize
openmp/
runtime/
src/
5 lines
3 lines

Diff 490215

openmp/runtime/src/kmp_dispatch.cpp

Show First 20 Lines • Show All 2,381 Lines • ▼ Show 20 Lines
@return unsigned [from 0 to n) - number (id) of the section to execute next on @return unsigned [from 0 to n) - number (id) of the section to execute next on
this thread. n (or any other number not in range) - nothing to execute on this this thread. n (or any other number not in range) - nothing to execute on this
thread thread
*/ */
kmp_int32 __kmpc_next_section(ident_t *loc, kmp_int32 gtid, kmp_int32 __kmpc_next_section(ident_t *loc, kmp_int32 gtid,
kmp_int32 numberOfSections) { kmp_int32 numberOfSections) {
KMP_TIME_PARTITIONED_BLOCK(OMP_sections); KMP_TIME_PARTITIONED_BLOCK(OMP_sections_overhead);
kmp_info_t *th = __kmp_threads[gtid]; kmp_info_t *th = __kmp_threads[gtid];
#ifdef KMP_DEBUG #ifdef KMP_DEBUG
kmp_team_t *team = th->th.th_team; kmp_team_t *team = th->th.th_team;
#endif #endif
KD_TRACE(1000, ("__kmp_dispatch_next: T#%d; number of sections:%d\n", gtid, KD_TRACE(1000, ("__kmp_dispatch_next: T#%d; number of sections:%d\n", gtid,
numberOfSections)); numberOfSections));
▲ Show 20 Lines • Show All 56 Lines • ▼ Show 20 Lines if (ompt_enabled.ompt_callback_dispatch) {
ompt_task_info_t *task_info = __ompt_get_task_info_object(0); ompt_task_info_t *task_info = __ompt_get_task_info_object(0);
ompt_data_t instance = ompt_data_none; ompt_data_t instance = ompt_data_none;
instance.ptr = OMPT_GET_RETURN_ADDRESS(0); instance.ptr = OMPT_GET_RETURN_ADDRESS(0);
ompt_callbacks.ompt_callback(ompt_callback_dispatch)( ompt_callbacks.ompt_callback(ompt_callback_dispatch)(
&(team_info->parallel_data), &(task_info->task_data), &(team_info->parallel_data), &(task_info->task_data),
ompt_dispatch_section, instance); ompt_dispatch_section, instance);
} }
#endif #endif
KMP_POP_PARTITIONED_TIMER();
} }
return sectionIndex; return sectionIndex;
} }
/*! /*!
@ingroup WORK_SHARING @ingroup WORK_SHARING
@param loc source location information @param loc source location information
Show All 15 Lines#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.ompt_callback_work) { if (ompt_enabled.ompt_callback_work) {
ompt_team_info_t *team_info = __ompt_get_teaminfo(0, NULL); ompt_team_info_t *team_info = __ompt_get_teaminfo(0, NULL);
ompt_task_info_t *task_info = __ompt_get_task_info_object(0); ompt_task_info_t *task_info = __ompt_get_task_info_object(0);
ompt_callbacks.ompt_callback(ompt_callback_work)( ompt_callbacks.ompt_callback(ompt_callback_work)(
ompt_work_sections, ompt_scope_end, &(team_info->parallel_data), ompt_work_sections, ompt_scope_end, &(team_info->parallel_data),
&(task_info->task_data), 0, OMPT_GET_RETURN_ADDRESS(0)); &(task_info->task_data), 0, OMPT_GET_RETURN_ADDRESS(0));
} }
#endif #endif
KMP_POP_PARTITIONED_TIMER();
} }
KMP_POP_PARTITIONED_TIMER();
KD_TRACE(100, ("__kmpc_end_sections: T#%d returned\n", gtid)); KD_TRACE(100, ("__kmpc_end_sections: T#%d returned\n", gtid));
} }
template <typename T> template <typename T>
static void __kmp_dist_get_bounds(ident_t *loc, kmp_int32 gtid, static void __kmp_dist_get_bounds(ident_t *loc, kmp_int32 gtid,
kmp_int32 *plastiter, T *plower, T *pupper, kmp_int32 *plastiter, T *plower, T *pupper,
typename traits_t<T>::signed_t incr) { typename traits_t<T>::signed_t incr) {
typedef typename traits_t<T>::unsigned_t UT; typedef typename traits_t<T>::unsigned_t UT;
▲ Show 20 Lines • Show All 477 Lines • Show Last 20 Lines

openmp/runtime/src/kmp_stats.h

Show First 20 Lines • Show All 96 Lines • ▼ Show 20 Lines#define KMP_FOREACH_COUNTER(macro, arg) \
macro(OMP_NESTED_PARALLEL, 0, arg) \ macro(OMP_NESTED_PARALLEL, 0, arg) \
macro(OMP_LOOP_STATIC, 0, arg) \ macro(OMP_LOOP_STATIC, 0, arg) \
macro(OMP_LOOP_STATIC_STEAL, 0, arg) \ macro(OMP_LOOP_STATIC_STEAL, 0, arg) \
macro(OMP_LOOP_DYNAMIC, 0, arg) \ macro(OMP_LOOP_DYNAMIC, 0, arg) \
macro(OMP_DISTRIBUTE, 0, arg) \ macro(OMP_DISTRIBUTE, 0, arg) \
macro(OMP_BARRIER, 0, arg) \ macro(OMP_BARRIER, 0, arg) \
macro(OMP_CRITICAL, 0, arg) \ macro(OMP_CRITICAL, 0, arg) \
macro(OMP_SINGLE, 0, arg) \ macro(OMP_SINGLE, 0, arg) \
macro(OMP_SECTIONS, 0, arg) \
macro(OMP_MASTER, 0, arg) \ macro(OMP_MASTER, 0, arg) \
macro(OMP_MASKED, 0, arg) \ macro(OMP_MASKED, 0, arg) \
macro(OMP_TEAMS, 0, arg) \ macro(OMP_TEAMS, 0, arg) \
macro(OMP_set_lock, 0, arg) \ macro(OMP_set_lock, 0, arg) \
macro(OMP_test_lock, 0, arg) \ macro(OMP_test_lock, 0, arg) \
macro(REDUCE_wait, 0, arg) \ macro(REDUCE_wait, 0, arg) \
macro(REDUCE_nowait, 0, arg) \ macro(REDUCE_nowait, 0, arg) \
macro(OMP_TASKYIELD, 0, arg) \ macro(OMP_TASKYIELD, 0, arg) \
Show All 32 Lines#define KMP_FOREACH_TIMER(macro, arg) \
macro (OMP_loop_static_scheduling, 0, arg) \ macro (OMP_loop_static_scheduling, 0, arg) \
macro (OMP_loop_dynamic, 0, arg) \ macro (OMP_loop_dynamic, 0, arg) \
macro (OMP_loop_dynamic_scheduling, 0, arg) \ macro (OMP_loop_dynamic_scheduling, 0, arg) \
macro (OMP_distribute, 0, arg) \ macro (OMP_distribute, 0, arg) \
macro (OMP_distribute_scheduling, 0, arg) \ macro (OMP_distribute_scheduling, 0, arg) \
macro (OMP_critical, 0, arg) \ macro (OMP_critical, 0, arg) \
macro (OMP_critical_wait, 0, arg) \ macro (OMP_critical_wait, 0, arg) \
macro (OMP_single, 0, arg) \ macro (OMP_single, 0, arg) \
macro (OMP_sections, 0, arg) \
macro (OMP_sections_overhead, 0, arg) \
macro (OMP_master, 0, arg) \ macro (OMP_master, 0, arg) \
macro (OMP_masked, 0, arg) \ macro (OMP_masked, 0, arg) \
macro (OMP_task_immediate, 0, arg) \ macro (OMP_task_immediate, 0, arg) \
macro (OMP_task_taskwait, 0, arg) \ macro (OMP_task_taskwait, 0, arg) \
macro (OMP_task_taskyield, 0, arg) \ macro (OMP_task_taskyield, 0, arg) \
macro (OMP_task_taskgroup, 0, arg) \ macro (OMP_task_taskgroup, 0, arg) \
macro (OMP_task_join_bar, 0, arg) \ macro (OMP_task_join_bar, 0, arg) \
macro (OMP_task_plain_bar, 0, arg) \ macro (OMP_task_plain_bar, 0, arg) \
▲ Show 20 Lines • Show All 858 Lines • Show Last 20 Lines