diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2019-03-08 21:23:34 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2019-03-08 21:23:34 +0000 |
| commit | 529e0d2ea447ba9d40f3e3ac632f3018fb881373 (patch) | |
| tree | a8237fcc72653de563db86ad2c25e2d678b1d4d2 | |
| parent | 790edbc16e91aa8ed2a97d5dab7f5ee63d1f456e (diff) | |
| download | bcm5719-llvm-529e0d2ea447ba9d40f3e3ac632f3018fb881373.tar.gz bcm5719-llvm-529e0d2ea447ba9d40f3e3ac632f3018fb881373.zip | |
[OpenMP][stats] Update stats gathering macros
llvm-svn: 355739
| -rw-r--r-- | openmp/runtime/src/kmp_stats.cpp | 8 | ||||
| -rw-r--r-- | openmp/runtime/src/kmp_stats.h | 24 |
2 files changed, 16 insertions, 16 deletions
diff --git a/openmp/runtime/src/kmp_stats.cpp b/openmp/runtime/src/kmp_stats.cpp index 8413036a983..650a6145a13 100644 --- a/openmp/runtime/src/kmp_stats.cpp +++ b/openmp/runtime/src/kmp_stats.cpp @@ -669,9 +669,11 @@ void kmp_stats_output_module::printEvents(FILE *eventsOut, for (int i = 0; i < theEvents->size(); i++) { kmp_stats_event ev = theEvents->at(i); rgb_color color = getEventColor(ev.getTimerName()); - fprintf(eventsOut, "%d %lu %lu %1.1f rgb(%1.1f,%1.1f,%1.1f) %s\n", gtid, - ev.getStart(), ev.getStop(), 1.2 - (ev.getNestLevel() * 0.2), - color.r, color.g, color.b, timeStat::name(ev.getTimerName())); + fprintf(eventsOut, "%d %llu %llu %1.1f rgb(%1.1f,%1.1f,%1.1f) %s\n", gtid, + static_cast<unsigned long long>(ev.getStart()), + static_cast<unsigned long long>(ev.getStop()), + 1.2 - (ev.getNestLevel() * 0.2), color.r, color.g, color.b, + timeStat::name(ev.getTimerName())); } return; } diff --git a/openmp/runtime/src/kmp_stats.h b/openmp/runtime/src/kmp_stats.h index c0901567950..79192b33c9d 100644 --- a/openmp/runtime/src/kmp_stats.h +++ b/openmp/runtime/src/kmp_stats.h @@ -955,42 +955,40 @@ extern kmp_stats_output_module __kmp_stats_output; #define KMP_RESET_STATS() __kmp_reset_stats() #if (KMP_DEVELOPER_STATS) -#define KMP_TIME_DEVELOPER_BLOCK(n) KMP_TIME_BLOCK(n) #define KMP_COUNT_DEVELOPER_VALUE(n, v) KMP_COUNT_VALUE(n, v) #define KMP_COUNT_DEVELOPER_BLOCK(n) KMP_COUNT_BLOCK(n) -#define KMP_START_DEVELOPER_EXPLICIT_TIMER(n) KMP_START_EXPLICIT_TIMER(n) -#define KMP_STOP_DEVELOPER_EXPLICIT_TIMER(n) KMP_STOP_EXPLICIT_TIMER(n) #define KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(n) KMP_TIME_PARTITIONED_BLOCK(n) +#define KMP_PUSH_DEVELOPER_PARTITIONED_TIMER(n) KMP_PUSH_PARTITIONED_TIMER(n) +#define KMP_POP_DEVELOPER_PARTITIONED_TIMER(n) KMP_POP_PARTITIONED_TIMER(n) +#define KMP_EXCHANGE_DEVELOPER_PARTITIONED_TIMER(n) \ + KMP_EXCHANGE_PARTITIONED_TIMER(n) #else // Null definitions -#define KMP_TIME_DEVELOPER_BLOCK(n) ((void)0) #define KMP_COUNT_DEVELOPER_VALUE(n, v) ((void)0) #define KMP_COUNT_DEVELOPER_BLOCK(n) ((void)0) -#define KMP_START_DEVELOPER_EXPLICIT_TIMER(n) ((void)0) -#define KMP_STOP_DEVELOPER_EXPLICIT_TIMER(n) ((void)0) #define KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(n) ((void)0) +#define KMP_PUSH_DEVELOPER_PARTITIONED_TIMER(n) ((void)0) +#define KMP_POP_DEVELOPER_PARTITIONED_TIMER(n) ((void)0) +#define KMP_EXCHANGE_DEVELOPER_PARTITIONED_TIMER(n) ((void)0) #endif #else // KMP_STATS_ENABLED // Null definitions -#define KMP_TIME_BLOCK(n) ((void)0) #define KMP_COUNT_VALUE(n, v) ((void)0) #define KMP_COUNT_BLOCK(n) ((void)0) -#define KMP_START_EXPLICIT_TIMER(n) ((void)0) -#define KMP_STOP_EXPLICIT_TIMER(n) ((void)0) #define KMP_OUTPUT_STATS(heading_string) ((void)0) #define KMP_RESET_STATS() ((void)0) -#define KMP_TIME_DEVELOPER_BLOCK(n) ((void)0) #define KMP_COUNT_DEVELOPER_VALUE(n, v) ((void)0) #define KMP_COUNT_DEVELOPER_BLOCK(n) ((void)0) -#define KMP_START_DEVELOPER_EXPLICIT_TIMER(n) ((void)0) -#define KMP_STOP_DEVELOPER_EXPLICIT_TIMER(n) ((void)0) +#define KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(n) ((void)0) +#define KMP_PUSH_DEVELOPER_PARTITIONED_TIMER(n) ((void)0) +#define KMP_POP_DEVELOPER_PARTITIONED_TIMER(n) ((void)0) +#define KMP_EXCHANGE_DEVELOPER_PARTITIONED_TIMER(n) ((void)0) #define KMP_INIT_PARTITIONED_TIMERS(name) ((void)0) #define KMP_TIME_PARTITIONED_BLOCK(name) ((void)0) -#define KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(n) ((void)0) #define KMP_PUSH_PARTITIONED_TIMER(name) ((void)0) #define KMP_POP_PARTITIONED_TIMER() ((void)0) #define KMP_SET_THREAD_STATE(state_name) ((void)0) |
