diff options
Diffstat (limited to 'openmp/runtime/src')
-rw-r--r-- | openmp/runtime/src/include/50/ompt.h.var | 5 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_wait_release.h | 17 | ||||
-rw-r--r-- | openmp/runtime/src/ompt-event-specific.h | 2 |
3 files changed, 0 insertions, 24 deletions
diff --git a/openmp/runtime/src/include/50/ompt.h.var b/openmp/runtime/src/include/50/ompt.h.var index 21b4c4635c0..56c5834a113 100644 --- a/openmp/runtime/src/include/50/ompt.h.var +++ b/openmp/runtime/src/include/50/ompt.h.var @@ -151,7 +151,6 @@ macro (ompt_callback_flush, ompt_callback_flush_t, 29) /* after executing flush */ \ \ macro (ompt_callback_cancel, ompt_callback_cancel_t, 30) /* cancel innermost binding region */ \ - macro (ompt_callback_idle, ompt_callback_idle_t, 31) /* begin or end idle state */ @@ -490,10 +489,6 @@ typedef void (*ompt_callback_master_t) ( const void *codeptr_ra /* return address of runtime call */ ); -typedef void (*ompt_callback_idle_t) ( - ompt_scope_endpoint_t endpoint /* endpoint of idle time */ -); - typedef enum ompt_work_type_t { ompt_work_loop = 1, ompt_work_sections = 2, diff --git a/openmp/runtime/src/kmp_wait_release.h b/openmp/runtime/src/kmp_wait_release.h index 71c334d4a61..ec489d1cd69 100644 --- a/openmp/runtime/src/kmp_wait_release.h +++ b/openmp/runtime/src/kmp_wait_release.h @@ -142,11 +142,6 @@ static inline void __ompt_implicit_task_end(kmp_info_t *this_thr, ompt_callbacks.ompt_callback(ompt_callback_implicit_task)( ompt_scope_end, NULL, tId, 0, ds_tid); } -#if OMPT_OPTIONAL - if (ompt_enabled.ompt_callback_idle) { - ompt_callbacks.ompt_callback(ompt_callback_idle)(ompt_scope_begin); - } -#endif // return to idle state this_thr->th.ompt_thread_info.state = omp_state_idle; } else { @@ -266,13 +261,6 @@ final_spin=FALSE) pId = NULL; tId = &(this_thr->th.ompt_thread_info.task_data); } -#if OMPT_OPTIONAL - if (ompt_entry_state == omp_state_idle) { - if (ompt_enabled.ompt_callback_idle) { - ompt_callbacks.ompt_callback(ompt_callback_idle)(ompt_scope_begin); - } - } else -#endif if (final_spin && (__kmp_tasking_mode == tskm_immediate_exec || this_thr->th.th_task_team == NULL)) { // implicit task is done. Either no taskqueue, or task-team finished @@ -453,11 +441,6 @@ final_spin=FALSE) } #endif if (ompt_exit_state == omp_state_idle) { -#if OMPT_OPTIONAL - if (ompt_enabled.ompt_callback_idle) { - ompt_callbacks.ompt_callback(ompt_callback_idle)(ompt_scope_end); - } -#endif this_thr->th.ompt_thread_info.state = omp_state_overhead; } } diff --git a/openmp/runtime/src/ompt-event-specific.h b/openmp/runtime/src/ompt-event-specific.h index 4a36ef36ad6..305b1764f7b 100644 --- a/openmp/runtime/src/ompt-event-specific.h +++ b/openmp/runtime/src/ompt-event-specific.h @@ -105,6 +105,4 @@ #define ompt_callback_cancel_implemented ompt_event_MAY_ALWAYS_OPTIONAL -#define ompt_callback_idle_implemented ompt_event_MAY_ALWAYS_OPTIONAL - #endif |