diff options
| author | Joachim Protze <protze@itc.rwth-aachen.de> | 2018-09-10 14:34:54 +0000 |
|---|---|---|
| committer | Joachim Protze <protze@itc.rwth-aachen.de> | 2018-09-10 14:34:54 +0000 |
| commit | 489cdb783a0655ed2d2812a62fda220eb17574dd (patch) | |
| tree | c0ef9c60f5df7b12e88e22ffecd12fb3c47309bb /openmp/runtime/src/kmp_tasking.cpp | |
| parent | 659c871a1b47836bb0b02f63124bc35e00990f1c (diff) | |
| download | bcm5719-llvm-489cdb783a0655ed2d2812a62fda220eb17574dd.tar.gz bcm5719-llvm-489cdb783a0655ed2d2812a62fda220eb17574dd.zip | |
[OMPT] Update types according to TR7
Some types and callback signatures have changed from TR6 to TR7.
Major changes (only adding signatures and stubs):
(-remove idle callback) done by D48362
-add reduction and dispatch callback
-add get_task_memory and finalize_tool runtime entry points
-ompt_invoker_t becomes ompt_parallel_flag_t
-more types of sync_regions
Patch provided by Simon Convent
Reviewers: hbae, protze.joachim
Differential Revision: https://reviews.llvm.org/D50774
llvm-svn: 341834
Diffstat (limited to 'openmp/runtime/src/kmp_tasking.cpp')
| -rw-r--r-- | openmp/runtime/src/kmp_tasking.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openmp/runtime/src/kmp_tasking.cpp b/openmp/runtime/src/kmp_tasking.cpp index e1b03f780b5..9028686bea1 100644 --- a/openmp/runtime/src/kmp_tasking.cpp +++ b/openmp/runtime/src/kmp_tasking.cpp @@ -473,7 +473,7 @@ static inline void __ompt_task_start(kmp_task_t *task, kmp_taskdata_t *current_task, kmp_int32 gtid) { kmp_taskdata_t *taskdata = KMP_TASK_TO_TASKDATA(task); - ompt_task_status_t status = ompt_task_others; + ompt_task_status_t status = ompt_task_switch; if (__kmp_threads[gtid]->th.ompt_thread_info.ompt_task_yielded) { status = ompt_task_yield; __kmp_threads[gtid]->th.ompt_thread_info.ompt_task_yielded = 0; @@ -1586,7 +1586,7 @@ kmp_int32 __kmpc_omp_task(ident_t *loc_ref, kmp_int32 gtid, // Scheduling back to the parent task. __ompt_task_finish(new_task, new_taskdata->ompt_task_info.scheduling_parent, - ompt_task_others); + ompt_task_switch); new_taskdata->ompt_task_info.frame.exit_frame = NULL; } } @@ -1766,7 +1766,7 @@ static kmp_int32 __kmpc_omp_taskwait_template(ident_t *loc_ref, kmp_int32 gtid, return TASK_CURRENT_NOT_QUEUED; } -#if OMPT_SUPPORT +#if OMPT_SUPPORT && OMPT_OPTIONAL OMPT_NOINLINE static kmp_int32 __kmpc_omp_taskwait_ompt(ident_t *loc_ref, kmp_int32 gtid, void *frame_address, @@ -1774,7 +1774,7 @@ static kmp_int32 __kmpc_omp_taskwait_ompt(ident_t *loc_ref, kmp_int32 gtid, return __kmpc_omp_taskwait_template<true>(loc_ref, gtid, frame_address, return_address); } -#endif // OMPT_SUPPORT +#endif // OMPT_SUPPORT && OMPT_OPTIONAL // __kmpc_omp_taskwait: Wait until all tasks generated by the current task are // complete |
