Skip to content

[OpenMP][OMPT][OMPD] Fix frame flags for OpenMP tool APIs #114118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2025
Merged

[OpenMP][OMPT][OMPD] Fix frame flags for OpenMP tool APIs #114118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions openmp/runtime/src/kmp_tasking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,22 +714,6 @@ static void __kmp_task_start(kmp_int32 gtid, kmp_task_t *task,

#if OMPT_SUPPORT
//------------------------------------------------------------------------------
// __ompt_task_init:
// Initialize OMPT fields maintained by a task. This will only be called after
// ompt_start_tool, so we already know whether ompt is enabled or not.

static inline void __ompt_task_init(kmp_taskdata_t *task, int tid) {
// The calls to __ompt_task_init already have the ompt_enabled condition.
task->ompt_task_info.task_data.value = 0;
task->ompt_task_info.frame.exit_frame = ompt_data_none;
task->ompt_task_info.frame.enter_frame = ompt_data_none;
task->ompt_task_info.frame.exit_frame_flags =
ompt_frame_runtime | ompt_frame_framepointer;
task->ompt_task_info.frame.enter_frame_flags =
ompt_frame_runtime | ompt_frame_framepointer;
task->ompt_task_info.dispatch_chunk.start = 0;
task->ompt_task_info.dispatch_chunk.iterations = 0;
}

// __ompt_task_start:
// Build and trigger task-begin event
Expand Down Expand Up @@ -804,7 +788,7 @@ static void __kmpc_omp_task_begin_if0_template(ident_t *loc_ref, kmp_int32 gtid,
taskdata->ompt_task_info.frame.exit_frame.ptr = frame_address;
current_task->ompt_task_info.frame.enter_frame_flags =
taskdata->ompt_task_info.frame.exit_frame_flags =
ompt_frame_application | ompt_frame_framepointer;
OMPT_FRAME_FLAGS_APP;
}
if (ompt_enabled.ompt_callback_task_create) {
ompt_task_info_t *parent_info = &(current_task->ompt_task_info);
Expand Down Expand Up @@ -1268,8 +1252,7 @@ static void __kmpc_omp_task_complete_if0_template(ident_t *loc_ref,
ompt_frame_t *ompt_frame;
__ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
ompt_frame->enter_frame = ompt_data_none;
ompt_frame->enter_frame_flags =
ompt_frame_runtime | ompt_frame_framepointer;
ompt_frame->enter_frame_flags = OMPT_FRAME_FLAGS_RUNTIME;
}
#endif

Expand Down Expand Up @@ -2010,6 +1993,7 @@ kmp_int32 __kmpc_omp_task_parts(ident_t *loc_ref, kmp_int32 gtid,
#if OMPT_SUPPORT
if (UNLIKELY(ompt_enabled.enabled)) {
parent->ompt_task_info.frame.enter_frame = ompt_data_none;
parent->ompt_task_info.frame.enter_frame_flags = OMPT_FRAME_FLAGS_RUNTIME;
}
#endif
return TASK_CURRENT_NOT_QUEUED;
Expand Down
1 change: 1 addition & 0 deletions openmp/runtime/src/ompt-general.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ void ompt_post_init() {
kmp_info_t *root_thread = ompt_get_thread();

ompt_set_thread_state(root_thread, ompt_state_overhead);
__ompt_task_init(root_thread->th.th_current_task, 0);

if (ompt_enabled.ompt_callback_thread_begin) {
ompt_callbacks.ompt_callback(ompt_callback_thread_begin)(
Expand Down
2 changes: 2 additions & 0 deletions openmp/runtime/src/ompt-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ void ompt_fini(void);

#define OMPT_GET_RETURN_ADDRESS(level) __builtin_return_address(level)
#define OMPT_GET_FRAME_ADDRESS(level) __builtin_frame_address(level)
#define OMPT_FRAME_FLAGS_APP (ompt_frame_application | ompt_frame_cfa)
#define OMPT_FRAME_FLAGS_RUNTIME (ompt_frame_runtime | ompt_frame_cfa)

int __kmp_control_tool(uint64_t command, uint64_t modifier, void *arg);

Expand Down
2 changes: 2 additions & 0 deletions openmp/runtime/src/ompt-specific.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@ void __ompt_lw_taskteam_init(ompt_lw_taskteam_t *lwt, kmp_info_t *thr, int gtid,
lwt->ompt_task_info.task_data.value = 0;
lwt->ompt_task_info.frame.enter_frame = ompt_data_none;
lwt->ompt_task_info.frame.exit_frame = ompt_data_none;
lwt->ompt_task_info.frame.enter_frame_flags = OMPT_FRAME_FLAGS_RUNTIME;
lwt->ompt_task_info.frame.exit_frame_flags = OMPT_FRAME_FLAGS_RUNTIME;
lwt->ompt_task_info.scheduling_parent = NULL;
lwt->heap = 0;
lwt->parent = 0;
Expand Down
15 changes: 15 additions & 0 deletions openmp/runtime/src/ompt-specific.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,21 @@ int __ompt_get_task_info_internal(int ancestor_level, int *type,

ompt_data_t *__ompt_get_thread_data_internal();

// __ompt_task_init:
// Initialize OMPT fields maintained by a task. This will only be called after
// ompt_start_tool, so we already know whether ompt is enabled or not.

static inline void __ompt_task_init(kmp_taskdata_t *task, int tid) {
// The calls to __ompt_task_init already have the ompt_enabled condition.
task->ompt_task_info.task_data.value = 0;
task->ompt_task_info.frame.exit_frame = ompt_data_none;
task->ompt_task_info.frame.enter_frame = ompt_data_none;
task->ompt_task_info.frame.exit_frame_flags =
task->ompt_task_info.frame.enter_frame_flags = OMPT_FRAME_FLAGS_RUNTIME;
task->ompt_task_info.dispatch_chunk.start = 0;
task->ompt_task_info.dispatch_chunk.iterations = 0;
}

/*
* Unused currently
static uint64_t __ompt_get_get_unique_id_internal();
Expand Down
22 changes: 21 additions & 1 deletion openmp/runtime/test/ompt/callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include <omp.h>
#include <omp-tools.h>
#include "ompt-signal.h"
#include <stdlib.h>
#include <assert.h>

// Used to detect architecture
#include "../../src/kmp_platform.h"
Expand Down Expand Up @@ -147,6 +149,22 @@ static ompt_get_proc_id_t ompt_get_proc_id;
static ompt_enumerate_states_t ompt_enumerate_states;
static ompt_enumerate_mutex_impls_t ompt_enumerate_mutex_impls;

void assert_frame_flags(int enterf, int exitf) {
if (!(enterf == (ompt_frame_application | ompt_frame_cfa) ||
enterf == (ompt_frame_runtime | ompt_frame_cfa))) {
printf("enter_frame_flags (%i) is invalid\n", enterf);
fflush(NULL);
}
if (!(exitf == (ompt_frame_application | ompt_frame_cfa) ||
exitf == (ompt_frame_runtime | ompt_frame_cfa))) {
printf("exit_frame_flags (%i) is invalid\n", exitf);
fflush(NULL);
}
assert(enterf == (ompt_frame_application | ompt_frame_cfa) ||
enterf == (ompt_frame_runtime | ompt_frame_cfa));
assert(exitf == (ompt_frame_application | ompt_frame_cfa) ||
exitf == (ompt_frame_runtime | ompt_frame_cfa));
}
static void print_ids(int level)
{
int task_type, thread_num;
Expand All @@ -157,14 +175,16 @@ static void print_ids(int level)
&task_parallel_data, &thread_num);
char buffer[2048];
format_task_type(task_type, buffer);
if (frame)
if (frame) {
printf("%" PRIu64 ": task level %d: parallel_id=%" PRIu64
", task_id=%" PRIu64 ", exit_frame=%p, reenter_frame=%p, "
"task_type=%s=%d, thread_num=%d\n",
ompt_get_thread_data()->value, level,
exists_task ? task_parallel_data->value : 0,
exists_task ? task_data->value : 0, frame->exit_frame.ptr,
frame->enter_frame.ptr, buffer, task_type, thread_num);
assert_frame_flags(frame->enter_frame_flags, frame->exit_frame_flags);
}
}

#define get_frame_address(level) __builtin_frame_address(level)
Expand Down
Loading