[Openmp-commits] [openmp] r333367 - [OMPT] Rename ompt_frame_t to omp_frame_t
Joachim Protze via Openmp-commits
openmp-commits at lists.llvm.org
Mon May 28 01:14:59 PDT 2018
Author: jprotze
Date: Mon May 28 01:14:58 2018
New Revision: 333367
URL: http://llvm.org/viewvc/llvm-project?rev=333367&view=rev
Log:
[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
Modified:
openmp/trunk/runtime/src/include/50/ompt.h.var
openmp/trunk/runtime/src/kmp_csupport.cpp
openmp/trunk/runtime/src/kmp_gsupport.cpp
openmp/trunk/runtime/src/kmp_runtime.cpp
openmp/trunk/runtime/src/kmp_tasking.cpp
openmp/trunk/runtime/src/ompt-general.cpp
openmp/trunk/runtime/src/ompt-internal.h
openmp/trunk/runtime/src/ompt-specific.cpp
openmp/trunk/runtime/src/ompt-specific.h
openmp/trunk/runtime/test/ompt/callback.h
Modified: openmp/trunk/runtime/src/include/50/ompt.h.var
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/include/50/ompt.h.var?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/src/include/50/ompt.h.var (original)
+++ openmp/trunk/runtime/src/include/50/ompt.h.var Mon May 28 01:14:58 2018
@@ -179,13 +179,13 @@ static const ompt_wait_id_t ompt_wait_id
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_implicit_ta
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_schedu
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 @@ OMPT_API_FUNCTION(int, ompt_get_task_inf
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
));
Modified: openmp/trunk/runtime/src/kmp_csupport.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_csupport.cpp?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_csupport.cpp (original)
+++ openmp/trunk/runtime/src/kmp_csupport.cpp Mon May 28 01:14:58 2018
@@ -276,7 +276,7 @@ void __kmpc_fork_call(ident_t *loc, kmp_
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 @@ void __kmpc_barrier(ident_t *loc, kmp_in
}
#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_int32 __kmpc_barrier_master(ident_t
__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 @@ kmp_int32 __kmpc_barrier_master_nowait(i
}
#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 @@ void __kmpc_copyprivate(ident_t *loc, km
*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 @@ __kmpc_reduce_nowait(ident_t *loc, kmp_i
// 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 @@ kmp_int32 __kmpc_reduce(ident_t *loc, km
// 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 @@ void __kmpc_end_reduce(ident_t *loc, kmp
// 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 @@ void __kmpc_end_reduce(ident_t *loc, kmp
// 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 @@ void __kmpc_end_reduce(ident_t *loc, kmp
} 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)
Modified: openmp/trunk/runtime/src/kmp_gsupport.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_gsupport.cpp?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_gsupport.cpp (original)
+++ openmp/trunk/runtime/src/kmp_gsupport.cpp Mon May 28 01:14:58 2018
@@ -32,7 +32,7 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_B
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 @@ void *KMP_EXPAND_NAME(KMP_API_NAME_GOMP_
// 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 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_S
// 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 @@ static
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 @@ static
#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 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_P
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 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_L
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 @@ LOOP_NEXT_ULL(KMP_EXPAND_NAME(KMP_API_NA
#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 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_P
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 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_S
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);
Modified: openmp/trunk/runtime/src/kmp_runtime.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_runtime.cpp?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_runtime.cpp (original)
+++ openmp/trunk/runtime/src/kmp_runtime.cpp Mon May 28 01:14:58 2018
@@ -1462,7 +1462,7 @@ int __kmp_fork_call(ident_t *loc, int gt
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;
Modified: openmp/trunk/runtime/src/kmp_tasking.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_tasking.cpp?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_tasking.cpp (original)
+++ openmp/trunk/runtime/src/kmp_tasking.cpp Mon May 28 01:14:58 2018
@@ -845,7 +845,7 @@ static void __kmpc_omp_task_complete_if0
#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;
}
Modified: openmp/trunk/runtime/src/ompt-general.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/ompt-general.cpp?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/src/ompt-general.cpp (original)
+++ openmp/trunk/runtime/src/ompt-general.cpp Mon May 28 01:14:58 2018
@@ -502,7 +502,7 @@ OMPT_API_ROUTINE ompt_data_t *ompt_get_t
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,
Modified: openmp/trunk/runtime/src/ompt-internal.h
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/ompt-internal.h?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/src/ompt-internal.h (original)
+++ openmp/trunk/runtime/src/ompt-internal.h Mon May 28 01:14:58 2018
@@ -53,7 +53,7 @@ typedef struct ompt_callbacks_active_s {
(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;
Modified: openmp/trunk/runtime/src/ompt-specific.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/ompt-specific.cpp?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/src/ompt-specific.cpp (original)
+++ openmp/trunk/runtime/src/ompt-specific.cpp Mon May 28 01:14:58 2018
@@ -328,7 +328,7 @@ void __ompt_lw_taskteam_unlink(kmp_info_
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)
Modified: openmp/trunk/runtime/src/ompt-specific.h
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/ompt-specific.h?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/src/ompt-specific.h (original)
+++ openmp/trunk/runtime/src/ompt-specific.h Mon May 28 01:14:58 2018
@@ -47,7 +47,7 @@ int __ompt_get_parallel_info_internal(in
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();
Modified: openmp/trunk/runtime/test/ompt/callback.h
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/callback.h?rev=333367&r1=333366&r2=333367&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/callback.h (original)
+++ openmp/trunk/runtime/test/ompt/callback.h Mon May 28 01:14:58 2018
@@ -74,7 +74,7 @@ static ompt_enumerate_mutex_impls_t ompt
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 @@ on_ompt_callback_master(
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 @@ on_ompt_callback_parallel_end(
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 @@ on_ompt_callback_control_tool(
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
More information about the Openmp-commits
mailing list