[OMPT] Rename ompt_frame_t to omp_frame_t
Rename ompt_frame_t to omp_frame_t, as defined in the spec.
Differential Revision: https://reviews.llvm.org/D43568
git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@333367 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/runtime/src/include/50/ompt.h.var b/runtime/src/include/50/ompt.h.var
index ffbb9c6..4ffdc45 100644
--- a/runtime/src/include/50/ompt.h.var
+++ b/runtime/src/include/50/ompt.h.var
@@ -179,13 +179,13 @@
typedef void ompt_device_t;
/*---------------------
- * ompt_frame_t
+ * omp_frame_t
*---------------------*/
-typedef struct ompt_frame_t {
+typedef struct omp_frame_t {
void *exit_frame; /* next frame is user code */
void *enter_frame; /* previous frame is user code */
-} ompt_frame_t;
+} omp_frame_t;
/*---------------------
@@ -308,7 +308,7 @@
typedef void (*ompt_callback_parallel_begin_t) (
ompt_data_t *encountering_task_data, /* data of encountering task */
- const ompt_frame_t *encountering_task_frame, /* frame data of encountering task */
+ const omp_frame_t *encountering_task_frame, /* frame data of encountering task */
ompt_data_t *parallel_data, /* data of parallel region */
unsigned int requested_team_size, /* requested number of threads in team */
ompt_invoker_t invoker, /* invoker of master task */
@@ -350,7 +350,7 @@
typedef void (*ompt_callback_task_create_t) (
ompt_data_t *encountering_task_data, /* data of parent task */
- const ompt_frame_t *encountering_task_frame, /* frame data for parent task */
+ const omp_frame_t *encountering_task_frame, /* frame data for parent task */
ompt_data_t *new_task_data, /* data of created task */
int type, /* type of created task */
int has_dependences, /* created task has dependences */
@@ -587,7 +587,7 @@
int ancestor_level,
int *type,
ompt_data_t **task_data,
- ompt_frame_t **task_frame,
+ omp_frame_t **task_frame,
ompt_data_t **parallel_data,
int *thread_num
));
diff --git a/runtime/src/kmp_csupport.cpp b/runtime/src/kmp_csupport.cpp
index 6bbae57..2d81abb 100644
--- a/runtime/src/kmp_csupport.cpp
+++ b/runtime/src/kmp_csupport.cpp
@@ -276,7 +276,7 @@
va_start(ap, microtask);
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
kmp_info_t *master_th = __kmp_threads[gtid];
kmp_team_t *parent_team = master_th->th.th_team;
@@ -677,7 +677,7 @@
}
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
if (ompt_frame->enter_frame == NULL)
@@ -1563,7 +1563,7 @@
__kmp_check_barrier(global_tid, ct_barrier, loc);
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
if (ompt_frame->enter_frame == NULL)
@@ -1625,7 +1625,7 @@
}
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
if (ompt_frame->enter_frame == NULL)
@@ -1975,7 +1975,7 @@
*data_ptr = cpy_data;
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
if (ompt_frame->enter_frame == NULL)
@@ -3359,7 +3359,7 @@
// JP: as long as there is a barrier in the implementation, OMPT should and
// will provide the barrier events
// so we set-up the necessary frame/return addresses.
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
if (ompt_frame->enter_frame == NULL)
@@ -3540,7 +3540,7 @@
// this barrier should be visible to a customer and to the threading profile
// tool (it's a terminating barrier on constructs if NOWAIT not specified)
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
if (ompt_frame->enter_frame == NULL)
@@ -3626,7 +3626,7 @@
// TODO: implicit barrier: should be exposed
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
if (ompt_frame->enter_frame == NULL)
@@ -3650,7 +3650,7 @@
// TODO: implicit barrier: should be exposed
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
if (ompt_frame->enter_frame == NULL)
@@ -3671,7 +3671,7 @@
} else if (packed_reduction_method == atomic_reduce_block) {
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
if (ompt_frame->enter_frame == NULL)
diff --git a/runtime/src/kmp_gsupport.cpp b/runtime/src/kmp_gsupport.cpp
index be645e2..7aa4a66 100644
--- a/runtime/src/kmp_gsupport.cpp
+++ b/runtime/src/kmp_gsupport.cpp
@@ -32,7 +32,7 @@
MKLOC(loc, "GOMP_barrier");
KA_TRACE(20, ("GOMP_barrier: T#%d\n", gtid));
#if OMPT_SUPPORT && OMPT_OPTIONAL
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
@@ -178,7 +178,7 @@
// and for all other threads to reach this point.
#if OMPT_SUPPORT && OMPT_OPTIONAL
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
@@ -214,7 +214,7 @@
// propagated to all threads before trying to reuse the t_copypriv_data field.
__kmp_team_from_gtid(gtid)->t.t_copypriv_data = data;
#if OMPT_SUPPORT && OMPT_OPTIONAL
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
@@ -284,7 +284,7 @@
void *data) {
#if OMPT_SUPPORT
kmp_info_t *thr;
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
omp_state_t enclosing_state;
if (ompt_enabled.enabled) {
@@ -331,7 +331,7 @@
#if OMPT_SUPPORT
kmp_info_t *thr;
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
omp_state_t enclosing_state;
if (ompt_enabled.enabled) {
@@ -422,7 +422,7 @@
int gtid = __kmp_entry_gtid();
#if OMPT_SUPPORT
- ompt_frame_t *parent_frame, *frame;
+ omp_frame_t *parent_frame, *frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &parent_frame, NULL, NULL);
@@ -639,7 +639,7 @@
KA_TRACE(20, ("GOMP_loop_end: T#%d\n", gtid))
#if OMPT_SUPPORT && OMPT_OPTIONAL
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
@@ -834,7 +834,7 @@
#if OMPT_SUPPORT && OMPT_OPTIONAL
#define OMPT_LOOP_PRE() \
- ompt_frame_t *parent_frame; \
+ omp_frame_t *parent_frame; \
if (ompt_enabled.enabled) { \
__ompt_get_task_info_internal(0, NULL, NULL, &parent_frame, NULL, NULL); \
parent_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1); \
@@ -1062,7 +1062,7 @@
int gtid = __kmp_entry_gtid();
#if OMPT_SUPPORT
- ompt_frame_t *parent_frame;
+ omp_frame_t *parent_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &parent_frame, NULL, NULL);
@@ -1102,7 +1102,7 @@
KA_TRACE(20, ("GOMP_sections_end: T#%d\n", gtid))
#if OMPT_SUPPORT
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
if (ompt_enabled.enabled) {
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
ompt_frame->enter_frame = OMPT_GET_FRAME_ADDRESS(1);
diff --git a/runtime/src/kmp_runtime.cpp b/runtime/src/kmp_runtime.cpp
index c4e2579..da5e5bc 100644
--- a/runtime/src/kmp_runtime.cpp
+++ b/runtime/src/kmp_runtime.cpp
@@ -1462,7 +1462,7 @@
ompt_data_t ompt_parallel_data;
ompt_parallel_data.ptr = NULL;
ompt_data_t *parent_task_data;
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
ompt_data_t *implicit_task_data;
void *return_address = NULL;
diff --git a/runtime/src/kmp_tasking.cpp b/runtime/src/kmp_tasking.cpp
index 5e1f552..657d314 100644
--- a/runtime/src/kmp_tasking.cpp
+++ b/runtime/src/kmp_tasking.cpp
@@ -845,7 +845,7 @@
#if OMPT_SUPPORT
if (ompt) {
__ompt_task_finish(task, NULL);
- ompt_frame_t *ompt_frame;
+ omp_frame_t *ompt_frame;
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
ompt_frame->enter_frame = NULL;
}
diff --git a/runtime/src/ompt-general.cpp b/runtime/src/ompt-general.cpp
index 80a6900..8c845f5 100644
--- a/runtime/src/ompt-general.cpp
+++ b/runtime/src/ompt-general.cpp
@@ -502,7 +502,7 @@
OMPT_API_ROUTINE int ompt_get_task_info(int ancestor_level, int *type,
ompt_data_t **task_data,
- ompt_frame_t **task_frame,
+ omp_frame_t **task_frame,
ompt_data_t **parallel_data,
int *thread_num) {
return __ompt_get_task_info_internal(ancestor_level, type, task_data,
diff --git a/runtime/src/ompt-internal.h b/runtime/src/ompt-internal.h
index 6b44a06..24b97c7 100644
--- a/runtime/src/ompt-internal.h
+++ b/runtime/src/ompt-internal.h
@@ -53,7 +53,7 @@
(info->td_flags.merged_if0 ? ompt_task_mergeable : 0x0)
typedef struct {
- ompt_frame_t frame;
+ omp_frame_t frame;
ompt_data_t task_data;
struct kmp_taskdata *scheduling_parent;
int thread_num;
diff --git a/runtime/src/ompt-specific.cpp b/runtime/src/ompt-specific.cpp
index 1ae6e1d..84dace8 100644
--- a/runtime/src/ompt-specific.cpp
+++ b/runtime/src/ompt-specific.cpp
@@ -328,7 +328,7 @@
int __ompt_get_task_info_internal(int ancestor_level, int *type,
ompt_data_t **task_data,
- ompt_frame_t **task_frame,
+ omp_frame_t **task_frame,
ompt_data_t **parallel_data,
int *thread_num) {
if (__kmp_get_gtid() < 0)
diff --git a/runtime/src/ompt-specific.h b/runtime/src/ompt-specific.h
index 68233c6..450f4c4 100644
--- a/runtime/src/ompt-specific.h
+++ b/runtime/src/ompt-specific.h
@@ -47,7 +47,7 @@
int __ompt_get_task_info_internal(int ancestor_level, int *type,
ompt_data_t **task_data,
- ompt_frame_t **task_frame,
+ omp_frame_t **task_frame,
ompt_data_t **parallel_data, int *thread_num);
ompt_data_t *__ompt_get_thread_data_internal();
diff --git a/runtime/test/ompt/callback.h b/runtime/test/ompt/callback.h
index 82fff99..aff8c0d 100755
--- a/runtime/test/ompt/callback.h
+++ b/runtime/test/ompt/callback.h
@@ -74,7 +74,7 @@
static void print_ids(int level)
{
int task_type, thread_num;
- ompt_frame_t *frame;
+ omp_frame_t *frame;
ompt_data_t *task_parallel_data;
ompt_data_t *task_data;
int exists_task = ompt_get_task_info(level, &task_type, &task_data, &frame,
@@ -571,7 +571,7 @@
static void
on_ompt_callback_parallel_begin(
ompt_data_t *encountering_task_data,
- const ompt_frame_t *encountering_task_frame,
+ const omp_frame_t *encountering_task_frame,
ompt_data_t* parallel_data,
uint32_t requested_team_size,
ompt_invoker_t invoker,
@@ -596,7 +596,7 @@
static void
on_ompt_callback_task_create(
ompt_data_t *encountering_task_data,
- const ompt_frame_t *encountering_task_frame,
+ const omp_frame_t *encountering_task_frame,
ompt_data_t* new_task_data,
int type,
int has_dependences,
@@ -678,7 +678,7 @@
void *arg,
const void *codeptr_ra)
{
- ompt_frame_t* omptTaskFrame;
+ omp_frame_t* omptTaskFrame;
ompt_get_task_info(0, NULL, (ompt_data_t**) NULL, &omptTaskFrame, NULL, NULL);
printf("%" PRIu64 ": ompt_event_control_tool: command=%" PRIu64 ", modifier=%" PRIu64 ", arg=%p, codeptr_ra=%p, current_task_frame.exit=%p, current_task_frame.reenter=%p \n", ompt_get_thread_data()->value, command, modifier, arg, codeptr_ra, omptTaskFrame->exit_frame, omptTaskFrame->enter_frame);
return 0; //success
