[llvm] [NFC][OMPT] Use `unique_id` entry point for tests (PR #202228)
Jan André Reuter via llvm-commits
llvm-commits at lists.llvm.org
Sun Jun 7 12:15:40 PDT 2026
https://github.com/Thyre created https://github.com/llvm/llvm-project/pull/202228
The OMPT tests currently use an incrementing ID for the host_op_id. However, this value is not incremented for `submit_emi` callbacks, and uses a global integer that is incremented on callback invocation. This can lead to race conditions when e.g., `target nowait` is used.
Hence, replace the global integer by the `unique_id` entry point, properly yielding unique and thread-safe IDs.
>From 967a34a6ac56c1c653d93d5a4a2ac2b8de9bdb50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Andr=C3=A9=20Reuter?= <j.reuter at fz-juelich.de>
Date: Fri, 5 Jun 2026 23:53:10 +0200
Subject: [PATCH] [NFC][OMPT] Use `unique_id` entry point for tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The OMPT tests currently use an incrementing ID for the host_op_id.
However, this value is not incremented for `submit_emi` callbacks, and uses
a global integer that is incremented on callback invocation.
This can lead to race conditions when e.g., `target nowait` is used.
Hence, replace the global integer by the `unique_id` entry point,
properly yielding unique and thread-safe IDs.
Signed-off-by: Jan André Reuter <j.reuter at fz-juelich.de>
---
offload/test/ompt/callbacks.h | 11 +++++++----
offload/test/ompt/register_both.h | 5 +++++
offload/test/ompt/register_emi.h | 5 +++++
offload/test/ompt/register_emi_map.h | 5 +++++
offload/test/ompt/register_no_device_init.h | 5 +++++
offload/test/ompt/register_non_emi.h | 5 +++++
offload/test/ompt/register_non_emi_map.h | 5 +++++
offload/test/ompt/register_wrong_return.h | 5 +++++
8 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/offload/test/ompt/callbacks.h b/offload/test/ompt/callbacks.h
index 3da5c263b6e68..6185333a79f21 100644
--- a/offload/test/ompt/callbacks.h
+++ b/offload/test/ompt/callbacks.h
@@ -51,8 +51,9 @@ static const char *ompt_target_t_values[] = {"",
"ompt_target_exit_data_nowait",
"ompt_target_update_nowait"};
-// For EMI callbacks
-ompt_id_t next_op_id = 0x8000000000000001;
+// OMPT entry points
+
+extern ompt_get_unique_id_t ompt_get_unique_id;
// OMPT callbacks
@@ -127,7 +128,7 @@ static void on_ompt_callback_target_data_op_emi(
const void *codeptr_ra) {
assert(codeptr_ra != 0 && "Unexpected null codeptr");
if (endpoint == ompt_scope_begin)
- *host_op_id = next_op_id++;
+ *host_op_id = ompt_get_unique_id();
// target_task_data may be null, avoid dereferencing it
uint64_t target_task_data_value =
(target_task_data) ? target_task_data->value : 0;
@@ -150,7 +151,7 @@ static void on_ompt_callback_target_emi(ompt_target_t kind,
const void *codeptr_ra) {
assert(codeptr_ra != 0 && "Unexpected null codeptr");
if (endpoint == ompt_scope_begin)
- target_data->value = next_op_id++;
+ target_data->value = ompt_get_unique_id();
printf("Callback Target EMI: kind=%s endpoint=%s device_num=%d task_data=%p "
"(0x%lx) target_task_data=%p (0x%lx) target_data=%p (0x%lx) code=%p\n",
ompt_target_t_values[kind], ompt_scope_endpoint_t_values[endpoint],
@@ -162,6 +163,8 @@ static void on_ompt_callback_target_emi(ompt_target_t kind,
static void on_ompt_callback_target_submit_emi(
ompt_scope_endpoint_t endpoint, ompt_data_t *target_data,
ompt_id_t *host_op_id, unsigned int requested_num_teams) {
+ if (endpoint == ompt_scope_begin)
+ *host_op_id = ompt_get_unique_id();
printf(" Callback Submit EMI: endpoint=%s req_num_teams=%d target_data=%p "
"(0x%lx) host_op_id=%p (0x%lx)\n",
ompt_scope_endpoint_t_values[endpoint], requested_num_teams,
diff --git a/offload/test/ompt/register_both.h b/offload/test/ompt/register_both.h
index afdf094bb4eff..77cb430aa1f97 100644
--- a/offload/test/ompt/register_both.h
+++ b/offload/test/ompt/register_both.h
@@ -12,6 +12,7 @@
// OMPT entry point handles
static ompt_set_callback_t ompt_set_callback = 0;
+ompt_get_unique_id_t ompt_get_unique_id = 0;
// Init functions
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
@@ -21,6 +22,10 @@ int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
if (!ompt_set_callback)
return 0; // failed
+ ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
+ if (!ompt_get_unique_id)
+ return 0; // failed
+
register_ompt_callback(ompt_callback_device_initialize);
register_ompt_callback(ompt_callback_device_finalize);
register_ompt_callback(ompt_callback_device_load);
diff --git a/offload/test/ompt/register_emi.h b/offload/test/ompt/register_emi.h
index 2c70c16424bcc..a4c7629d34a8d 100644
--- a/offload/test/ompt/register_emi.h
+++ b/offload/test/ompt/register_emi.h
@@ -12,6 +12,7 @@
// OMPT entry point handles
static ompt_set_callback_t ompt_set_callback = 0;
+ompt_get_unique_id_t ompt_get_unique_id = 0;
// Init functions
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
@@ -21,6 +22,10 @@ int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
if (!ompt_set_callback)
return 0; // failed
+ ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
+ if (!ompt_get_unique_id)
+ return 0; // failed
+
register_ompt_callback(ompt_callback_device_initialize);
register_ompt_callback(ompt_callback_device_finalize);
register_ompt_callback(ompt_callback_device_load);
diff --git a/offload/test/ompt/register_emi_map.h b/offload/test/ompt/register_emi_map.h
index ccf65914cff18..859fd9bbf4896 100644
--- a/offload/test/ompt/register_emi_map.h
+++ b/offload/test/ompt/register_emi_map.h
@@ -12,6 +12,7 @@
// OMPT entry point handles
static ompt_set_callback_t ompt_set_callback = 0;
+ompt_get_unique_id_t ompt_get_unique_id = 0;
// Init functions
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
@@ -21,6 +22,10 @@ int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
if (!ompt_set_callback)
return 0; // failed
+ ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
+ if (!ompt_get_unique_id)
+ return 0; // failed
+
register_ompt_callback(ompt_callback_device_initialize);
register_ompt_callback(ompt_callback_device_finalize);
register_ompt_callback(ompt_callback_device_load);
diff --git a/offload/test/ompt/register_no_device_init.h b/offload/test/ompt/register_no_device_init.h
index 874e3d399fad8..54ad782022e7d 100644
--- a/offload/test/ompt/register_no_device_init.h
+++ b/offload/test/ompt/register_no_device_init.h
@@ -12,6 +12,7 @@
// OMPT entry point handles
static ompt_set_callback_t ompt_set_callback = 0;
+ompt_get_unique_id_t ompt_get_unique_id = 0;
// Init functions
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
@@ -21,6 +22,10 @@ int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
if (!ompt_set_callback)
return 0; // failed
+ ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
+ if (!ompt_get_unique_id)
+ return 0; // failed
+
// If no device init callback is registered, the other callbacks won't be
// activated.
register_ompt_callback(ompt_callback_device_load);
diff --git a/offload/test/ompt/register_non_emi.h b/offload/test/ompt/register_non_emi.h
index 66c8aaaafd193..229426303a010 100644
--- a/offload/test/ompt/register_non_emi.h
+++ b/offload/test/ompt/register_non_emi.h
@@ -12,6 +12,7 @@
// OMPT entry point handles
static ompt_set_callback_t ompt_set_callback = 0;
+ompt_get_unique_id_t ompt_get_unique_id = 0;
// Init functions
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
@@ -21,6 +22,10 @@ int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
if (!ompt_set_callback)
return 0; // failed
+ ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
+ if (!ompt_get_unique_id)
+ return 0; // failed
+
register_ompt_callback(ompt_callback_device_initialize);
register_ompt_callback(ompt_callback_device_finalize);
register_ompt_callback(ompt_callback_device_load);
diff --git a/offload/test/ompt/register_non_emi_map.h b/offload/test/ompt/register_non_emi_map.h
index b5c663410d55a..f8e2076eb31a5 100644
--- a/offload/test/ompt/register_non_emi_map.h
+++ b/offload/test/ompt/register_non_emi_map.h
@@ -12,6 +12,7 @@
// OMPT entry point handles
static ompt_set_callback_t ompt_set_callback = 0;
+ompt_get_unique_id_t ompt_get_unique_id = 0;
// Init functions
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
@@ -21,6 +22,10 @@ int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
if (!ompt_set_callback)
return 0; // failed
+ ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
+ if (!ompt_get_unique_id)
+ return 0; // failed
+
register_ompt_callback(ompt_callback_device_initialize);
register_ompt_callback(ompt_callback_device_finalize);
register_ompt_callback(ompt_callback_device_load);
diff --git a/offload/test/ompt/register_wrong_return.h b/offload/test/ompt/register_wrong_return.h
index 7de3feef7dc92..c9928df8406ff 100644
--- a/offload/test/ompt/register_wrong_return.h
+++ b/offload/test/ompt/register_wrong_return.h
@@ -12,6 +12,7 @@
// OMPT entry point handles
static ompt_set_callback_t ompt_set_callback = 0;
+ompt_get_unique_id_t ompt_get_unique_id = 0;
// Init functions
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
@@ -21,6 +22,10 @@ int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
if (!ompt_set_callback)
return 1; // failed but wrongly returning 1
+ ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
+ if (!ompt_get_unique_id)
+ return 1; // failed but wrongly returning 1
+
register_ompt_callback(ompt_callback_device_initialize);
register_ompt_callback(ompt_callback_device_finalize);
register_ompt_callback(ompt_callback_device_load);
More information about the llvm-commits
mailing list