Rename fields of ompt_frame_t
This is part of the renaming of data types from OpenMP TR4 to TR6
Patch by Simon Convent
Differential Revision: https://reviews.llvm.org/D39326
llvm-svn: 317435
diff --git a/openmp/runtime/src/kmp_csupport.cpp b/openmp/runtime/src/kmp_csupport.cpp
index 52440c9..d39d9f0 100644
--- a/openmp/runtime/src/kmp_csupport.cpp
+++ b/openmp/runtime/src/kmp_csupport.cpp
@@ -288,7 +288,7 @@
ompt_frame = &(
parent_team->t.t_implicit_task_taskdata[tid].ompt_task_info.frame);
}
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(gtid);
}
#endif
@@ -370,7 +370,7 @@
int tid = __kmp_tid_from_gtid(gtid);
if (ompt_enabled.enabled) {
parent_team->t.t_implicit_task_taskdata[tid]
- .ompt_task_info.frame.reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ .ompt_task_info.frame.enter_frame = OMPT_GET_FRAME_ADDRESS(1);
}
OMPT_STORE_RETURN_ADDRESS(gtid);
#endif
@@ -482,7 +482,7 @@
#if OMPT_SUPPORT
if (ompt_enabled.enabled &&
this_thr->th.ompt_thread_info.state != omp_state_overhead) {
- OMPT_CUR_TASK_INFO(this_thr)->frame.exit_runtime_frame = NULL;
+ OMPT_CUR_TASK_INFO(this_thr)->frame.exit_frame = NULL;
if (ompt_enabled.ompt_callback_implicit_task) {
ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
ompt_scope_end, NULL, OMPT_CUR_TASK_DATA(this_thr), 1,
@@ -680,8 +680,8 @@
ompt_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
- if (ompt_frame->reenter_runtime_frame == NULL)
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ if (ompt_frame->enter_frame == NULL)
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(global_tid);
}
#endif
@@ -696,7 +696,7 @@
__kmp_barrier(bs_plain_barrier, global_tid, FALSE, 0, NULL, NULL);
#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.enabled) {
- ompt_frame->reenter_runtime_frame = NULL;
+ ompt_frame->enter_frame = NULL;
}
#endif
}
@@ -1566,8 +1566,8 @@
ompt_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
- if (ompt_frame->reenter_runtime_frame == NULL)
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ if (ompt_frame->enter_frame == NULL)
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(global_tid);
}
#endif
@@ -1577,7 +1577,7 @@
status = __kmp_barrier(bs_plain_barrier, global_tid, TRUE, 0, NULL, NULL);
#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.enabled) {
- ompt_frame->reenter_runtime_frame = NULL;
+ ompt_frame->enter_frame = NULL;
}
#endif
@@ -1628,8 +1628,8 @@
ompt_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
- if (ompt_frame->reenter_runtime_frame == NULL)
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ if (ompt_frame->enter_frame == NULL)
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(global_tid);
}
#endif
@@ -1639,7 +1639,7 @@
__kmp_barrier(bs_plain_barrier, global_tid, FALSE, 0, NULL, NULL);
#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.enabled) {
- ompt_frame->reenter_runtime_frame = NULL;
+ ompt_frame->enter_frame = NULL;
}
#endif
@@ -1978,8 +1978,8 @@
ompt_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
- if (ompt_frame->reenter_runtime_frame == NULL)
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ if (ompt_frame->enter_frame == NULL)
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(gtid);
}
#endif
@@ -2007,7 +2007,7 @@
__kmp_barrier(bs_plain_barrier, gtid, FALSE, 0, NULL, NULL);
#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.enabled) {
- ompt_frame->reenter_runtime_frame = NULL;
+ ompt_frame->enter_frame = NULL;
}
#endif
}
@@ -3340,8 +3340,8 @@
ompt_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
- if (ompt_frame->reenter_runtime_frame == NULL)
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ if (ompt_frame->enter_frame == NULL)
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(global_tid);
}
#endif
@@ -3354,7 +3354,7 @@
retval = (retval != 0) ? (0) : (1);
#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.enabled) {
- ompt_frame->reenter_runtime_frame = NULL;
+ ompt_frame->enter_frame = NULL;
}
#endif
@@ -3516,8 +3516,8 @@
ompt_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
- if (ompt_frame->reenter_runtime_frame == NULL)
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ if (ompt_frame->enter_frame == NULL)
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(global_tid);
}
#endif
@@ -3531,7 +3531,7 @@
retval = (retval != 0) ? (0) : (1);
#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.enabled) {
- ompt_frame->reenter_runtime_frame = NULL;
+ ompt_frame->enter_frame = NULL;
}
#endif
@@ -3587,8 +3587,8 @@
ompt_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
- if (ompt_frame->reenter_runtime_frame == NULL)
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ if (ompt_frame->enter_frame == NULL)
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(global_tid);
}
#endif
@@ -3598,7 +3598,7 @@
__kmp_barrier(bs_plain_barrier, global_tid, FALSE, 0, NULL, NULL);
#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.enabled) {
- ompt_frame->reenter_runtime_frame = NULL;
+ ompt_frame->enter_frame = NULL;
}
#endif
@@ -3611,8 +3611,8 @@
ompt_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
- if (ompt_frame->reenter_runtime_frame == NULL)
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ if (ompt_frame->enter_frame == NULL)
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(global_tid);
}
#endif
@@ -3622,7 +3622,7 @@
__kmp_barrier(bs_plain_barrier, global_tid, FALSE, 0, NULL, NULL);
#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.enabled) {
- ompt_frame->reenter_runtime_frame = NULL;
+ ompt_frame->enter_frame = NULL;
}
#endif
@@ -3632,8 +3632,8 @@
ompt_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
- if (ompt_frame->reenter_runtime_frame == NULL)
- ompt_frame->reenter_runtime_frame = OMPT_GET_FRAME_ADDRESS(1);
+ if (ompt_frame->enter_frame == NULL)
+ ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
OMPT_STORE_RETURN_ADDRESS(global_tid);
}
#endif
@@ -3644,7 +3644,7 @@
__kmp_barrier(bs_plain_barrier, global_tid, FALSE, 0, NULL, NULL);
#if OMPT_SUPPORT && OMPT_OPTIONAL
if (ompt_enabled.enabled) {
- ompt_frame->reenter_runtime_frame = NULL;
+ ompt_frame->enter_frame = NULL;
}
#endif