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_barrier.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_barrier.cpp')
| -rw-r--r-- | openmp/runtime/src/kmp_barrier.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openmp/runtime/src/kmp_barrier.cpp b/openmp/runtime/src/kmp_barrier.cpp index 3f53d6b6730..e3925cb304d 100644 --- a/openmp/runtime/src/kmp_barrier.cpp +++ b/openmp/runtime/src/kmp_barrier.cpp @@ -1223,7 +1223,7 @@ int __kmp_barrier(enum barrier_type bt, int gtid, int is_split, kmp_info_t *this_thr = __kmp_threads[gtid]; kmp_team_t *team = this_thr->th.th_team; int status = 0; -#if OMPT_SUPPORT +#if OMPT_SUPPORT && OMPT_OPTIONAL ompt_data_t *my_task_data; ompt_data_t *my_parallel_data; void *return_address; @@ -1599,10 +1599,10 @@ void __kmp_join_barrier(int gtid) { ANNOTATE_BARRIER_BEGIN(&team->t.t_bar); #if OMPT_SUPPORT - ompt_data_t *my_task_data; - ompt_data_t *my_parallel_data; if (ompt_enabled.enabled) { #if OMPT_OPTIONAL + ompt_data_t *my_task_data; + ompt_data_t *my_parallel_data; void *codeptr = NULL; int ds_tid = this_thr->th.th_info.ds.ds_tid; if (KMP_MASTER_TID(ds_tid) && |
