diff options
author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2018-07-30 17:41:08 +0000 |
---|---|---|
committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2018-07-30 17:41:08 +0000 |
commit | f0682ac498e8fe65fce4d901093e201e62939b94 (patch) | |
tree | e098dbb0daadb88c794fab2b24e70a807b366d88 /openmp/runtime/src/kmp_runtime.cpp | |
parent | 05779bfcc80fbae6021f142d6dda8a50e85e34af (diff) | |
download | bcm5719-llvm-f0682ac498e8fe65fce4d901093e201e62939b94.tar.gz bcm5719-llvm-f0682ac498e8fe65fce4d901093e201e62939b94.zip |
[OpenMP][Stats] Cleanup stats gathering code
1) Remove unnecessary data from list node structure
2) Remove timerPair in favor of pushing/popping explicitTimers.
This way, nested timers will work properly.
3) Fix #pragma omp critical timers
4) Add histogram capability
5) Add KMP_STATS_FILE formatting capability
6) Have time partitioned into serial & parallel by introducing
partitionedTimers::exchange(). This also counts the number of serial regions
in the executable.
7) Fix up the timers around OMP loops so that scheduling overhead and work are
both counted correctly.
8) Fix up the iterations statistics so they count the number of iterations the
thread receives at each loop scheduling event
9) Change timers so there is only one RDTSC read per event change
10) Fix up the outdated comments for the timers
Differential Revision: https://reviews.llvm.org/D49699
llvm-svn: 338276
Diffstat (limited to 'openmp/runtime/src/kmp_runtime.cpp')
-rw-r--r-- | openmp/runtime/src/kmp_runtime.cpp | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/openmp/runtime/src/kmp_runtime.cpp b/openmp/runtime/src/kmp_runtime.cpp index a16d2fdb55e..bf0f9dc03e3 100644 --- a/openmp/runtime/src/kmp_runtime.cpp +++ b/openmp/runtime/src/kmp_runtime.cpp @@ -1644,12 +1644,8 @@ int __kmp_fork_call(ident_t *loc, int gtid, KA_TRACE(20, ("__kmp_fork_call: T#%d(%d:0) invoke microtask = %p\n", gtid, parent_team->t.t_id, parent_team->t.t_pkfn)); - { - KMP_TIME_PARTITIONED_BLOCK(OMP_parallel); - KMP_SET_THREAD_STATE_BLOCK(IMPLICIT_TASK); - if (!parent_team->t.t_invoke(gtid)) { - KMP_ASSERT2(0, "cannot invoke microtask for MASTER thread"); - } + if (!parent_team->t.t_invoke(gtid)) { + KMP_ASSERT2(0, "cannot invoke microtask for MASTER thread"); } KA_TRACE(20, ("__kmp_fork_call: T#%d(%d:0) done microtask = %p\n", gtid, parent_team->t.t_id, parent_team->t.t_pkfn)); @@ -1839,11 +1835,7 @@ int __kmp_fork_call(ident_t *loc, int gtid, // because initial code in teams should have level=0 team->t.t_level--; // AC: call special invoker for outer "parallel" of teams construct - { - KMP_TIME_PARTITIONED_BLOCK(OMP_parallel); - KMP_SET_THREAD_STATE_BLOCK(IMPLICIT_TASK); - invoker(gtid); - } + invoker(gtid); } else { #endif /* OMP_40_ENABLED */ argv = args; @@ -2256,12 +2248,8 @@ int __kmp_fork_call(ident_t *loc, int gtid, team->t.t_id, team->t.t_pkfn)); } // END of timer KMP_fork_call block - { - KMP_TIME_PARTITIONED_BLOCK(OMP_parallel); - KMP_SET_THREAD_STATE_BLOCK(IMPLICIT_TASK); - if (!team->t.t_invoke(gtid)) { - KMP_ASSERT2(0, "cannot invoke microtask for MASTER thread"); - } + if (!team->t.t_invoke(gtid)) { + KMP_ASSERT2(0, "cannot invoke microtask for MASTER thread"); } KA_TRACE(20, ("__kmp_fork_call: T#%d(%d:0) done microtask = %p\n", gtid, team->t.t_id, team->t.t_pkfn)); @@ -3700,7 +3688,7 @@ int __kmp_register_root(int initial_thread) { #if KMP_STATS_ENABLED // Initialize stats as soon as possible (right after gtid assignment). __kmp_stats_thread_ptr = __kmp_stats_list->push_back(gtid); - KMP_START_EXPLICIT_TIMER(OMP_worker_thread_life); + __kmp_stats_thread_ptr->startLife(); KMP_SET_THREAD_STATE(SERIAL_REGION); KMP_INIT_PARTITIONED_TIMERS(OMP_serial); #endif @@ -5639,11 +5627,7 @@ void *__kmp_launch_thread(kmp_info_t *this_thr) { } #endif - { - KMP_TIME_PARTITIONED_BLOCK(OMP_parallel); - KMP_SET_THREAD_STATE_BLOCK(IMPLICIT_TASK); - rc = (*pteam)->t.t_invoke(gtid); - } + rc = (*pteam)->t.t_invoke(gtid); KMP_ASSERT(rc); KMP_MB(); |