shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Revert "[OMPT][Offload][OpenMP] Fixes for OMPT data used by libomptarget" (#172827)

Browse Source 
Reverts llvm/llvm-project#156020

We will need some time for investigating buildbot failures
This commit is contained in:
Joachim 2025-12-18 10:48:30 +01:00 committed by GitHub
parent 64e3de71b0
commit b036d70eee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 33 additions and 516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
offload/include/OpenMP/OMPT/Interface.h
View File

@ -25,23 +25,12 @@
#define OMPT_IF_BUILT(stmt) stmt
#define TargetTaskData \
((OmptTaskInfoPtr == &OmptTaskInfo) ? nullptr \
: (&(OmptTaskInfoPtr->task_data)))
#define TargetData (OmptTaskInfoPtr->target_data)
/// Prefix of ompt_task_info_t struct from libomp
typedef struct ompt_task_info_t {
ompt_data_t task_data;
ompt_data_t target_data;
} ompt_task_info_t;
/// Callbacks for target regions require task_data representing the
/// encountering task.
/// Callbacks for target regions and target data ops require
/// target_task_data representing the target task region.
typedef ompt_data_t *(*ompt_get_task_data_t)();
typedef ompt_task_info_t *(*ompt_get_task_info_target_t)();
typedef ompt_data_t *(*ompt_get_target_task_data_t)();
namespace llvm {
namespace omp {
@ -51,7 +40,7 @@ namespace ompt {
/// Function pointers that will be used to track task_data and
/// target_task_data.
static ompt_get_task_data_t ompt_get_task_data_fn;
static ompt_get_task_info_target_t ompt_get_task_info_target_fn;
static ompt_get_target_task_data_t ompt_get_target_task_data_fn;
/// Used to maintain execution state for this thread
class Interface {
@ -227,16 +216,16 @@ public:
private:
/// Target operations id
ompt_id_t HostOpId{0};
ompt_id_t HostOpId = 0;
/// Target region data
ompt_data_t TargetData = ompt_data_none;
/// Task data representing the encountering task
ompt_data_t *TaskData{nullptr};
ompt_data_t *TaskData = nullptr;
/// TaskInfo contains target_data and task_data
ompt_task_info_t OmptTaskInfo{ompt_data_none, ompt_data_none};
/// Ptr to TaskInfo in OpenMP runtime in case of deferred target tasks
ompt_task_info_t *OmptTaskInfoPtr{&OmptTaskInfo};
/// Target task data representing the target task region
ompt_data_t *TargetTaskData = nullptr;
/// Used for marking begin of a data operation
void beginTargetDataOperation();

22
offload/libomptarget/OpenMP/OMPT/Callback.cpp
View File

@ -51,8 +51,8 @@ bool llvm::omp::target::ompt::Initialized = false;
ompt_get_callback_t llvm::omp::target::ompt::lookupCallbackByCode = nullptr;
ompt_function_lookup_t llvm::omp::target::ompt::lookupCallbackByName = nullptr;
ompt_get_target_task_data_t ompt_get_target_task_data_fn = nullptr;
ompt_get_task_data_t ompt_get_task_data_fn = nullptr;
ompt_get_task_info_target_t ompt_get_task_info_target_fn = nullptr;
/// Unique correlation id
static std::atomic<uint64_t> IdCounter(1);
@ -424,18 +424,18 @@ void Interface::beginTargetRegion() {
// Set up task state
assert(ompt_get_task_data_fn && "Calling a null task data function");
TaskData = ompt_get_task_data_fn();
// Set up target task and target state
assert(ompt_get_task_info_target_fn &&
"Calling a null target task info function");
// In case of deferred target tasks, use pointer from libomp
if (ompt_task_info_t *TempTaskInfoPtr = ompt_get_task_info_target_fn())
OmptTaskInfoPtr = TempTaskInfoPtr;
// Set up target task state
assert(ompt_get_target_task_data_fn &&
"Calling a null target task data function");
TargetTaskData = ompt_get_target_task_data_fn();
// Target state will be set later
TargetData = ompt_data_none;
}
void Interface::endTargetRegion() {
TaskData = 0;
OmptTaskInfo = {ompt_data_none, ompt_data_none};
OmptTaskInfoPtr = &OmptTaskInfo;
TargetTaskData = 0;
TargetData = ompt_data_none;
}
/// Used to maintain the finalization functions that are received
@ -474,7 +474,7 @@ int llvm::omp::target::ompt::initializeLibrary(ompt_function_lookup_t lookup,
bindOmptFunctionName(ompt_get_callback, lookupCallbackByCode);
bindOmptFunctionName(ompt_get_task_data, ompt_get_task_data_fn);
bindOmptFunctionName(ompt_get_task_info_target, ompt_get_task_info_target_fn);
bindOmptFunctionName(ompt_get_target_task_data, ompt_get_target_task_data_fn);
#undef bindOmptFunctionName
// Store pointer of 'ompt_libomp_target_fn_lookup' for use by libomptarget
@ -483,6 +483,8 @@ int llvm::omp::target::ompt::initializeLibrary(ompt_function_lookup_t lookup,
assert(lookupCallbackByCode && "lookupCallbackByCode should be non-null");
assert(lookupCallbackByName && "lookupCallbackByName should be non-null");
assert(ompt_get_task_data_fn && "ompt_get_task_data_fn should be non-null");
assert(ompt_get_target_task_data_fn &&
"ompt_get_target_task_data_fn should be non-null");
assert(LibraryFinalizer == nullptr &&
"LibraryFinalizer should not be initialized yet");

68
offload/test/ompt/register_with_host.h
View File

@ -1,68 +0,0 @@
#define SKIP_CALLBACK_REGISTRATION 1
#include "../../../openmp/runtime/test/ompt/callback.h"
#include "callbacks.h"
#include <omp-tools.h>
// From openmp/runtime/test/ompt/callback.h
#define register_ompt_callback_t(name, type) \
do { \
type f_##name = &on_##name; \
if (ompt_set_callback(name, (ompt_callback_t)f_##name) == ompt_set_never) \
printf("0: Could not register callback '" #name "'\n"); \
} while (0)
#define register_ompt_callback(name) register_ompt_callback_t(name, name##_t)
// Init functions
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
ompt_data_t *tool_data) {
ompt_set_callback = (ompt_set_callback_t)lookup("ompt_set_callback");
if (!ompt_set_callback)
return 0; // failed
// host runtime functions
ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
ompt_get_thread_data = (ompt_get_thread_data_t)lookup("ompt_get_thread_data");
ompt_get_task_info = (ompt_get_task_info_t)lookup("ompt_get_task_info");
ompt_get_unique_id();
// host callbacks
register_ompt_callback(ompt_callback_sync_region);
register_ompt_callback_t(ompt_callback_sync_region_wait,
ompt_callback_sync_region_t);
register_ompt_callback_t(ompt_callback_reduction,
ompt_callback_sync_region_t);
register_ompt_callback(ompt_callback_implicit_task);
register_ompt_callback(ompt_callback_parallel_begin);
register_ompt_callback(ompt_callback_parallel_end);
register_ompt_callback(ompt_callback_task_create);
register_ompt_callback(ompt_callback_task_schedule);
// device callbacks
register_ompt_callback(ompt_callback_device_initialize);
register_ompt_callback(ompt_callback_device_finalize);
register_ompt_callback(ompt_callback_device_load);
register_ompt_callback(ompt_callback_target_data_op_emi);
register_ompt_callback(ompt_callback_target_emi);
register_ompt_callback(ompt_callback_target_submit_emi);
return 1; // success
}
void ompt_finalize(ompt_data_t *tool_data) {}
#ifdef __cplusplus
extern "C" {
#endif
ompt_start_tool_result_t *ompt_start_tool(unsigned int omp_version,
const char *runtime_version) {
static ompt_start_tool_result_t ompt_start_tool_result = {&ompt_initialize,
&ompt_finalize, 0};
return &ompt_start_tool_result;
}
#ifdef __cplusplus
}
#endif

152
offload/test/ompt/target_tool_data.c
View File

@ -1,152 +0,0 @@
// clang-format off
// RUN: env LIBOMP_NUM_HIDDEN_HELPER_THREADS=1 %libomptarget-compile-run-and-check-generic
// REQUIRES: ompt
// clang-format on
#include <inttypes.h>
#include <omp-tools.h>
#include <omp.h>
#include <stdio.h>
#include <string.h>
#include "register_with_host.h"
#define N 1000000
#define M 1000
int main() {
float *x = malloc(N * sizeof(float));
float *y = malloc(N * sizeof(float));
for (int i = 0; i < N; i++) {
x[i] = 1;
y[i] = 1;
}
#pragma omp target enter data map(to : x[0 : N]) map(alloc : y[0 : N])
#pragma omp target teams distribute parallel for
for (int i = 0; i < N; i++) {
for (int j = 0; j < M; j++) {
y[i] += 3 * x[i];
}
}
#pragma omp target teams distribute parallel for
for (int i = 0; i < N; i++) {
for (int j = 0; j < M; j++) {
y[i] += 3 * x[i];
}
}
#pragma omp target exit data map(release : x[0 : N]) map(from : y[0 : N])
printf("%f, %f\n", x[0], y[0]);
free(x);
free(y);
return 0;
}
// clang-format off
/// CHECK: ompt_event_initial_task_begin
/// CHECK-SAME: task_id=[[ENCOUNTERING_TASK:[0-f]+]]
/// CHECK: Callback Target EMI: kind=ompt_target_enter_data endpoint=ompt_scope_begin
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA:[0-f]+]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target_enter_data endpoint=ompt_scope_end
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target endpoint=ompt_scope_begin
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA:[0-f]+]])
/// CHECK: Callback Submit EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Submit EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target endpoint=ompt_scope_end
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target endpoint=ompt_scope_begin
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA:[0-f]+]])
/// CHECK: Callback Submit EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Submit EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target endpoint=ompt_scope_end
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target_exit_data endpoint=ompt_scope_begin
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA:[0-f]+]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target_exit_data endpoint=ompt_scope_end
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=(nil) (0x0)
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])

171
offload/test/ompt/target_tool_data_nowait.c
View File

@ -1,171 +0,0 @@
// clang-format off
// RUN: env LIBOMP_NUM_HIDDEN_HELPER_THREADS=1 %libomptarget-compile-run-and-check-generic
// REQUIRES: ompt
// clang-format on
#include <inttypes.h>
#include <omp-tools.h>
#include <omp.h>
#include <stdio.h>
#include <string.h>
#include "register_with_host.h"
#define N 1000000
#define M 1000
int main() {
float *x = malloc(N * sizeof(float));
float *y = malloc(N * sizeof(float));
for (int i = 0; i < N; i++) {
x[i] = 1;
y[i] = 1;
}
#pragma omp target enter data map(to : x[0 : N]) map(alloc : y[0 : N]) \
nowait depend(inout : x)
#pragma omp target teams distribute parallel for nowait depend(inout : x)
for (int i = 0; i < N; i++) {
for (int j = 0; j < M; j++) {
y[i] += 3 * x[i];
}
}
#pragma omp target teams distribute parallel for nowait depend(inout : x)
for (int i = 0; i < N; i++) {
for (int j = 0; j < M; j++) {
y[i] += 3 * x[i];
}
}
#pragma omp target exit data map(release : x[0 : N]) map(from : y[0 : N]) \
nowait depend(inout : x)
#pragma omp taskwait
printf("%f, %f\n", x[0], y[0]);
free(x);
free(y);
return 0;
}
// clang-format off
/// CHECK: ompt_event_initial_task_begin
/// CHECK-SAME: task_id=[[ENCOUNTERING_TASK:[0-f]+]]
/// CHECK: ompt_event_task_create
/// CHECK-SAME: new_task_id=[[TARGET_TASK_1:[0-f]+]]
/// CHECK-SAME: task_type=ompt_task_target
/// CHECK: ompt_event_task_create
/// CHECK-SAME: new_task_id=[[TARGET_TASK_2:[0-f]+]]
/// CHECK-SAME: task_type=ompt_task_target
/// CHECK: ompt_event_task_create
/// CHECK-SAME: new_task_id=[[TARGET_TASK_3:[0-f]+]]
/// CHECK-SAME: task_type=ompt_task_target
/// CHECK: ompt_event_task_create
/// CHECK-SAME: new_task_id=[[TARGET_TASK_4:[0-f]+]]
/// CHECK-SAME: task_type=ompt_task_target
/// CHECK: Callback Target EMI: kind=ompt_target_enter_data endpoint=ompt_scope_begin
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_1]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA:[0-f]+]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_1]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_1]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_1]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_1]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_1]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_1]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target_enter_data endpoint=ompt_scope_end
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_1]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target endpoint=ompt_scope_begin
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_2]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA:[0-f]+]])
/// CHECK: Callback Submit EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Submit EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target endpoint=ompt_scope_end
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_2]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target endpoint=ompt_scope_begin
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_3]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA:[0-f]+]])
/// CHECK: Callback Submit EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Submit EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target endpoint=ompt_scope_end
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_3]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target_exit_data endpoint=ompt_scope_begin
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_4]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA:[0-f]+]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_4]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_4]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_4]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_4]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_begin
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_4]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback DataOp EMI: endpoint=ompt_scope_end
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_4]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])
/// CHECK: Callback Target EMI: kind=ompt_target_exit_data endpoint=ompt_scope_end
/// CHECK-SAME: task_data=0x{{[0-f]+}} (0x[[ENCOUNTERING_TASK]])
/// CHECK-SAME: target_task_data=0x{{[0-f]+}} (0x[[TARGET_TASK_4]])
/// CHECK-SAME: target_data=0x{{[0-f]+}} (0x[[TARGET_DATA]])

59
offload/test/ompt/target_tool_data_nowait_nodepend.c
View File

@ -1,59 +0,0 @@
// clang-format off
// RUN: env LIBOMP_NUM_HIDDEN_HELPER_THREADS=1 %libomptarget-compile-run-and-check-generic
// REQUIRES: ompt
// clang-format on
#include <inttypes.h>
#include <omp-tools.h>
#include <omp.h>
#include <stdio.h>
#include <string.h>
#include "register_with_host.h"
#define N 1000000
#define M 1000
int main() {
float *x = malloc(N * sizeof(float));
float *y = malloc(N * sizeof(float));
float *a = malloc(N * sizeof(float));
float *b = malloc(N * sizeof(float));
for (int i = 0; i < N; i++) {
x[i] = 1;
y[i] = 1;
a[i] = 1;
b[i] = 1;
}
#pragma omp target teams distribute parallel for nowait map(to : x[0 : N]) \
map(from : y[0 : N])
for (int i = 0; i < N; i++) {
for (int j = 0; j < M; j++) {
y[i] += 3 * x[i];
}
}
#pragma omp target teams distribute parallel for nowait map(to : a[0 : N]) \
map(from : b[0 : N])
for (int i = 0; i < N; i++) {
for (int j = 0; j < M; j++) {
b[i] += 3 * a[i];
}
}
#pragma omp taskwait
printf("%f, %f, %f, %f\n", x[0], y[0], a[0], b[0]);
free(x);
free(y);
free(a);
free(b);
return 0;
}
// clang-format off
/// CHECK-NOT: target_task_data=(nil) (0x0)
/// CHECK-NOT: target_data=(nil) (0x0)

10
openmp/runtime/src/ompt-general.cpp
View File

@ -886,12 +886,10 @@ static ompt_interface_fn_t ompt_fn_lookup(const char *s) {
return NULL;
}
static ompt_data_t *ompt_get_task_data() {
return __ompt_get_generating_task();
}
static ompt_data_t *ompt_get_task_data() { return __ompt_get_task_data(); }
static ompt_task_info_t *ompt_get_task_info_target() {
return __ompt_get_task_info_target();
static ompt_data_t *ompt_get_target_task_data() {
return __ompt_get_target_task_data();
}
/// Lookup function to query libomp callbacks registered by the tool
@ -902,7 +900,7 @@ static ompt_interface_fn_t ompt_libomp_target_fn_lookup(const char *s) {
provide_fn(ompt_get_callback);
provide_fn(ompt_get_task_data);
provide_fn(ompt_get_task_info_target);
provide_fn(ompt_get_target_task_data);
#undef provide_fn
#define ompt_interface_fn(fn, type, code) \

5
openmp/runtime/src/ompt-internal.h
View File

@ -57,11 +57,8 @@ typedef struct ompt_callbacks_active_s {
(info->td_flags.merged_if0 ? ompt_task_mergeable : 0x0)
typedef struct {
// liboffload only uses task_data and target_data. They must be the first
// elements!
ompt_data_t task_data;
ompt_data_t target_data;
ompt_frame_t frame;
ompt_data_t task_data;
struct kmp_taskdata *scheduling_parent;
int thread_num;
ompt_dispatch_chunk_t dispatch_chunk;

26
openmp/runtime/src/ompt-specific.cpp
View File

@ -346,30 +346,14 @@ void __ompt_lw_taskteam_unlink(kmp_info_t *thr) {
// task support
//----------------------------------------------------------
ompt_data_t *__ompt_get_generating_task() {
ompt_data_t *__ompt_get_task_data() {
kmp_info_t *thr = ompt_get_thread();
if (thr) {
kmp_taskdata_t *taskdata = thr->th.th_current_task;
if (taskdata == NULL)
return NULL;
if (taskdata->td_flags.target)
return &(taskdata->td_parent->ompt_task_info.task_data);
else
return &(taskdata->ompt_task_info.task_data);
}
return NULL;
ompt_data_t *task_data = thr ? OMPT_CUR_TASK_DATA(thr) : NULL;
return task_data;
}
ompt_task_info_t *__ompt_get_task_info_target() {
kmp_info_t *thr = ompt_get_thread();
if (thr) {
kmp_taskdata_t *taskdata = thr->th.th_current_task;
if (taskdata == NULL)
return NULL;
if (taskdata->td_flags.target)
return &taskdata->ompt_task_info;
}
return NULL;
ompt_data_t *__ompt_get_target_task_data() {
return &__kmp_threads[__kmp_get_gtid()]->th.ompt_thread_info.target_task_data;
}
int __ompt_get_task_info_internal(int ancestor_level, int *type,

4
openmp/runtime/src/ompt-specific.h
View File

@ -37,9 +37,9 @@ void __ompt_lw_taskteam_unlink(kmp_info_t *thr);
ompt_team_info_t *__ompt_get_teaminfo(int depth, int *size);
ompt_data_t *__ompt_get_generating_task();
ompt_data_t *__ompt_get_task_data();
ompt_task_info_t *__ompt_get_task_info_target();
ompt_data_t *__ompt_get_target_task_data();
ompt_task_info_t *__ompt_get_task_info_object(int depth);

3
openmp/runtime/test/ompt/callback.h
View File

@ -1018,8 +1018,6 @@ static void on_ompt_callback_error(ompt_severity_t severity,
codeptr_ra);
}
#ifndef SKIP_CALLBACK_REGISTRATION
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
ompt_data_t *tool_data) {
ompt_set_callback = (ompt_set_callback_t)lookup("ompt_set_callback");
@ -1096,7 +1094,6 @@ ompt_start_tool_result_t *ompt_start_tool(unsigned int omp_version,
#ifdef __cplusplus
}
#endif
#endif // ifndef SKIP_CALLBACK_REGISTRATION
#endif // ifndef USE_PRIVATE_TOOL
#ifdef _OMPT_TESTS
#undef _OMPT_TESTS