[OpenMP] Add Passing in Original Declaration Names To Mapper API
Summary:
This patch adds support for passing in the original delcaration name in the
source file to the libomptarget runtime. This will allow the runtime to provide
more intelligent debugging messages. This patch takes the original expression
parsed from the OpenMP map / update clause and provides a textual
representation if it was explicitly mapped, otherwise it takes the name of the
variable declaration as a fallback. The information in passed to the runtime in
a global array of strings that matches the existing ident_t source location
strings using ";name;filename;column;row;;". See
clang/test/OpenMP/target_map_names.cpp for an example of the generated output
for a given map clause.
Reviewers: jdoervert
Differential Revision: https://reviews.llvm.org/D89802
GitOrigin-RevId: a87d7b3d448a16e416d1980b9d6aea99e4c9900b
diff --git a/libomptarget/include/omptarget.h b/libomptarget/include/omptarget.h
index 9e7c28b..1c2f596 100644
--- a/libomptarget/include/omptarget.h
+++ b/libomptarget/include/omptarget.h
@@ -164,11 +164,14 @@
void __tgt_target_data_begin_mapper(int64_t device_id, int32_t arg_num,
void **args_base, void **args,
int64_t *arg_sizes, int64_t *arg_types,
- void **arg_mappers);
-void __tgt_target_data_begin_nowait_mapper(
- int64_t device_id, int32_t arg_num, void **args_base, void **args,
- int64_t *arg_sizes, int64_t *arg_types, void **arg_mappers, int32_t depNum,
- void *depList, int32_t noAliasDepNum, void *noAliasDepList);
+ void **arg_names, void **arg_mappers);
+void __tgt_target_data_begin_nowait_mapper(int64_t device_id, int32_t arg_num,
+ void **args_base, void **args,
+ int64_t *arg_sizes,
+ int64_t *arg_types, void **arg_names,
+ void **arg_mappers, int32_t depNum,
+ void *depList, int32_t noAliasDepNum,
+ void *noAliasDepList);
// passes data from the target, release target memory and destroys the
// host-target mapping (top entry from the stack of data maps) created by
@@ -183,12 +186,13 @@
void __tgt_target_data_end_mapper(int64_t device_id, int32_t arg_num,
void **args_base, void **args,
int64_t *arg_sizes, int64_t *arg_types,
- void **arg_mappers);
+ void **arg_names, void **arg_mappers);
void __tgt_target_data_end_nowait_mapper(int64_t device_id, int32_t arg_num,
void **args_base, void **args,
int64_t *arg_sizes, int64_t *arg_types,
- void **arg_mappers, int32_t depNum,
- void *depList, int32_t noAliasDepNum,
+ void **arg_names, void **arg_mappers,
+ int32_t depNum, void *depList,
+ int32_t noAliasDepNum,
void *noAliasDepList);
/// passes data to/from the target
@@ -204,11 +208,12 @@
void __tgt_target_data_update_mapper(int64_t device_id, int32_t arg_num,
void **args_base, void **args,
int64_t *arg_sizes, int64_t *arg_types,
- void **arg_mappers);
+ void **arg_names, void **arg_mappers);
void __tgt_target_data_update_nowait_mapper(
int64_t device_id, int32_t arg_num, void **args_base, void **args,
- int64_t *arg_sizes, int64_t *arg_types, void **arg_mappers, int32_t depNum,
- void *depList, int32_t noAliasDepNum, void *noAliasDepList);
+ int64_t *arg_sizes, int64_t *arg_types, void **arg_names,
+ void **arg_mappers, int32_t depNum, void *depList, int32_t noAliasDepNum,
+ void *noAliasDepList);
// Performs the same actions as data_begin in case arg_num is non-zero
// and initiates run of offloaded region on target platform; if arg_num
@@ -225,13 +230,14 @@
int32_t noAliasDepNum, void *noAliasDepList);
int __tgt_target_mapper(int64_t device_id, void *host_ptr, int32_t arg_num,
void **args_base, void **args, int64_t *arg_sizes,
- int64_t *arg_types, void **arg_mappers);
+ int64_t *arg_types, void **arg_names,
+ void **arg_mappers);
int __tgt_target_nowait_mapper(int64_t device_id, void *host_ptr,
int32_t arg_num, void **args_base, void **args,
int64_t *arg_sizes, int64_t *arg_types,
- void **arg_mappers, int32_t depNum,
- void *depList, int32_t noAliasDepNum,
- void *noAliasDepList);
+ void **arg_names, void **arg_mappers,
+ int32_t depNum, void *depList,
+ int32_t noAliasDepNum, void *noAliasDepList);
int __tgt_target_teams(int64_t device_id, void *host_ptr, int32_t arg_num,
void **args_base, void **args, int64_t *arg_sizes,
@@ -246,13 +252,13 @@
int __tgt_target_teams_mapper(int64_t device_id, void *host_ptr,
int32_t arg_num, void **args_base, void **args,
int64_t *arg_sizes, int64_t *arg_types,
- void **arg_mappers, int32_t num_teams,
- int32_t thread_limit);
+ void **arg_names, void **arg_mappers,
+ int32_t num_teams, int32_t thread_limit);
int __tgt_target_teams_nowait_mapper(
int64_t device_id, void *host_ptr, int32_t arg_num, void **args_base,
- void **args, int64_t *arg_sizes, int64_t *arg_types, void **arg_mappers,
- int32_t num_teams, int32_t thread_limit, int32_t depNum, void *depList,
- int32_t noAliasDepNum, void *noAliasDepList);
+ void **args, int64_t *arg_sizes, int64_t *arg_types, void **arg_names,
+ void **arg_mappers, int32_t num_teams, int32_t thread_limit, int32_t depNum,
+ void *depList, int32_t noAliasDepNum, void *noAliasDepList);
void __kmpc_push_target_tripcount(int64_t device_id, uint64_t loop_tripcount);
diff --git a/libomptarget/src/interface.cpp b/libomptarget/src/interface.cpp
index 76a9e76..41ac6d4 100644
--- a/libomptarget/src/interface.cpp
+++ b/libomptarget/src/interface.cpp
@@ -96,8 +96,8 @@
/// and passes the data to the device.
EXTERN void __tgt_target_data_begin(int64_t device_id, int32_t arg_num,
void **args_base, void **args, int64_t *arg_sizes, int64_t *arg_types) {
- __tgt_target_data_begin_mapper(device_id, arg_num, args_base, args,
- arg_sizes, arg_types, nullptr);
+ __tgt_target_data_begin_mapper(device_id, arg_num, args_base, args, arg_sizes,
+ arg_types, nullptr, nullptr);
}
EXTERN void __tgt_target_data_begin_nowait(int64_t device_id, int32_t arg_num,
@@ -107,13 +107,15 @@
if (depNum + noAliasDepNum > 0)
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
- __tgt_target_data_begin_mapper(device_id, arg_num, args_base, args,
- arg_sizes, arg_types, nullptr);
+ __tgt_target_data_begin_mapper(device_id, arg_num, args_base, args, arg_sizes,
+ arg_types, nullptr, nullptr);
}
EXTERN void __tgt_target_data_begin_mapper(int64_t device_id, int32_t arg_num,
- void **args_base, void **args, int64_t *arg_sizes, int64_t *arg_types,
- void **arg_mappers) {
+ void **args_base, void **args,
+ int64_t *arg_sizes,
+ int64_t *arg_types, void **arg_names,
+ void **arg_mappers) {
if (IsOffloadDisabled()) return;
DP("Entering data begin region for device %" PRId64 " with %d mappings\n",
@@ -146,15 +148,16 @@
HandleTargetOutcome(rc == OFFLOAD_SUCCESS);
}
-EXTERN void __tgt_target_data_begin_nowait_mapper(int64_t device_id,
- int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes,
- int64_t *arg_types, void **arg_mappers, int32_t depNum, void *depList,
- int32_t noAliasDepNum, void *noAliasDepList) {
+EXTERN void __tgt_target_data_begin_nowait_mapper(
+ int64_t device_id, int32_t arg_num, void **args_base, void **args,
+ int64_t *arg_sizes, int64_t *arg_types, void **arg_names,
+ void **arg_mappers, int32_t depNum, void *depList, int32_t noAliasDepNum,
+ void *noAliasDepList) {
if (depNum + noAliasDepNum > 0)
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
- __tgt_target_data_begin_mapper(device_id, arg_num, args_base, args,
- arg_sizes, arg_types, arg_mappers);
+ __tgt_target_data_begin_mapper(device_id, arg_num, args_base, args, arg_sizes,
+ arg_types, arg_names, arg_mappers);
}
/// passes data from the target, releases target memory and destroys
@@ -163,7 +166,7 @@
EXTERN void __tgt_target_data_end(int64_t device_id, int32_t arg_num,
void **args_base, void **args, int64_t *arg_sizes, int64_t *arg_types) {
__tgt_target_data_end_mapper(device_id, arg_num, args_base, args, arg_sizes,
- arg_types, nullptr);
+ arg_types, nullptr, nullptr);
}
EXTERN void __tgt_target_data_end_nowait(int64_t device_id, int32_t arg_num,
@@ -174,12 +177,13 @@
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
__tgt_target_data_end_mapper(device_id, arg_num, args_base, args, arg_sizes,
- arg_types, nullptr);
+ arg_types, nullptr, nullptr);
}
EXTERN void __tgt_target_data_end_mapper(int64_t device_id, int32_t arg_num,
- void **args_base, void **args, int64_t *arg_sizes, int64_t *arg_types,
- void **arg_mappers) {
+ void **args_base, void **args,
+ int64_t *arg_sizes, int64_t *arg_types,
+ void **arg_names, void **arg_mappers) {
if (IsOffloadDisabled()) return;
DP("Entering data end region with %d mappings\n", arg_num);
@@ -217,21 +221,22 @@
HandleTargetOutcome(rc == OFFLOAD_SUCCESS);
}
-EXTERN void __tgt_target_data_end_nowait_mapper(int64_t device_id,
- int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes,
- int64_t *arg_types, void **arg_mappers, int32_t depNum, void *depList,
- int32_t noAliasDepNum, void *noAliasDepList) {
+EXTERN void __tgt_target_data_end_nowait_mapper(
+ int64_t device_id, int32_t arg_num, void **args_base, void **args,
+ int64_t *arg_sizes, int64_t *arg_types, void **arg_names,
+ void **arg_mappers, int32_t depNum, void *depList, int32_t noAliasDepNum,
+ void *noAliasDepList) {
if (depNum + noAliasDepNum > 0)
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
__tgt_target_data_end_mapper(device_id, arg_num, args_base, args, arg_sizes,
- arg_types, arg_mappers);
+ arg_types, arg_names, arg_mappers);
}
EXTERN void __tgt_target_data_update(int64_t device_id, int32_t arg_num,
void **args_base, void **args, int64_t *arg_sizes, int64_t *arg_types) {
__tgt_target_data_update_mapper(device_id, arg_num, args_base, args,
- arg_sizes, arg_types, nullptr);
+ arg_sizes, arg_types, nullptr, nullptr);
}
EXTERN void __tgt_target_data_update_nowait(int64_t device_id, int32_t arg_num,
@@ -242,12 +247,15 @@
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
__tgt_target_data_update_mapper(device_id, arg_num, args_base, args,
- arg_sizes, arg_types, nullptr);
+ arg_sizes, arg_types, nullptr, nullptr);
}
EXTERN void __tgt_target_data_update_mapper(int64_t device_id, int32_t arg_num,
- void **args_base, void **args, int64_t *arg_sizes, int64_t *arg_types,
- void **arg_mappers) {
+ void **args_base, void **args,
+ int64_t *arg_sizes,
+ int64_t *arg_types,
+ void **arg_names,
+ void **arg_mappers) {
if (IsOffloadDisabled()) return;
DP("Entering data update with %d mappings\n", arg_num);
@@ -268,21 +276,22 @@
HandleTargetOutcome(rc == OFFLOAD_SUCCESS);
}
-EXTERN void __tgt_target_data_update_nowait_mapper(int64_t device_id,
- int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes,
- int64_t *arg_types, void **arg_mappers, int32_t depNum, void *depList,
- int32_t noAliasDepNum, void *noAliasDepList) {
+EXTERN void __tgt_target_data_update_nowait_mapper(
+ int64_t device_id, int32_t arg_num, void **args_base, void **args,
+ int64_t *arg_sizes, int64_t *arg_types, void **arg_names,
+ void **arg_mappers, int32_t depNum, void *depList, int32_t noAliasDepNum,
+ void *noAliasDepList) {
if (depNum + noAliasDepNum > 0)
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
__tgt_target_data_update_mapper(device_id, arg_num, args_base, args,
- arg_sizes, arg_types, arg_mappers);
+ arg_sizes, arg_types, arg_names, arg_mappers);
}
EXTERN int __tgt_target(int64_t device_id, void *host_ptr, int32_t arg_num,
void **args_base, void **args, int64_t *arg_sizes, int64_t *arg_types) {
return __tgt_target_mapper(device_id, host_ptr, arg_num, args_base, args,
- arg_sizes, arg_types, nullptr);
+ arg_sizes, arg_types, nullptr, nullptr);
}
EXTERN int __tgt_target_nowait(int64_t device_id, void *host_ptr,
@@ -293,12 +302,13 @@
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
return __tgt_target_mapper(device_id, host_ptr, arg_num, args_base, args,
- arg_sizes, arg_types, nullptr);
+ arg_sizes, arg_types, nullptr, nullptr);
}
EXTERN int __tgt_target_mapper(int64_t device_id, void *host_ptr,
- int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes,
- int64_t *arg_types, void **arg_mappers) {
+ int32_t arg_num, void **args_base, void **args,
+ int64_t *arg_sizes, int64_t *arg_types,
+ void **arg_names, void **arg_mappers) {
if (IsOffloadDisabled()) return OFFLOAD_FAIL;
DP("Entering target region with entry point " DPxMOD " and device Id %"
PRId64 "\n", DPxPTR(host_ptr), device_id);
@@ -328,21 +338,25 @@
}
EXTERN int __tgt_target_nowait_mapper(int64_t device_id, void *host_ptr,
- int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes,
- int64_t *arg_types, void **arg_mappers, int32_t depNum, void *depList,
- int32_t noAliasDepNum, void *noAliasDepList) {
+ int32_t arg_num, void **args_base,
+ void **args, int64_t *arg_sizes,
+ int64_t *arg_types, void **arg_names,
+ void **arg_mappers, int32_t depNum,
+ void *depList, int32_t noAliasDepNum,
+ void *noAliasDepList) {
if (depNum + noAliasDepNum > 0)
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
return __tgt_target_mapper(device_id, host_ptr, arg_num, args_base, args,
- arg_sizes, arg_types, arg_mappers);
+ arg_sizes, arg_types, arg_names, arg_mappers);
}
EXTERN int __tgt_target_teams(int64_t device_id, void *host_ptr,
int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes,
int64_t *arg_types, int32_t team_num, int32_t thread_limit) {
return __tgt_target_teams_mapper(device_id, host_ptr, arg_num, args_base,
- args, arg_sizes, arg_types, nullptr, team_num, thread_limit);
+ args, arg_sizes, arg_types, nullptr, nullptr,
+ team_num, thread_limit);
}
EXTERN int __tgt_target_teams_nowait(int64_t device_id, void *host_ptr,
@@ -353,12 +367,16 @@
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
return __tgt_target_teams_mapper(device_id, host_ptr, arg_num, args_base,
- args, arg_sizes, arg_types, nullptr, team_num, thread_limit);
+ args, arg_sizes, arg_types, nullptr, nullptr,
+ team_num, thread_limit);
}
EXTERN int __tgt_target_teams_mapper(int64_t device_id, void *host_ptr,
- int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes,
- int64_t *arg_types, void **arg_mappers, int32_t team_num, int32_t thread_limit) {
+ int32_t arg_num, void **args_base,
+ void **args, int64_t *arg_sizes,
+ int64_t *arg_types, void **arg_names,
+ void **arg_mappers, int32_t team_num,
+ int32_t thread_limit) {
if (IsOffloadDisabled()) return OFFLOAD_FAIL;
DP("Entering target region with entry point " DPxMOD " and device Id %"
PRId64 "\n", DPxPTR(host_ptr), device_id);
@@ -388,16 +406,17 @@
return rc;
}
-EXTERN int __tgt_target_teams_nowait_mapper(int64_t device_id, void *host_ptr,
- int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes,
- int64_t *arg_types, void **arg_mappers, int32_t team_num,
- int32_t thread_limit, int32_t depNum, void *depList, int32_t noAliasDepNum,
- void *noAliasDepList) {
+EXTERN int __tgt_target_teams_nowait_mapper(
+ int64_t device_id, void *host_ptr, int32_t arg_num, void **args_base,
+ void **args, int64_t *arg_sizes, int64_t *arg_types, void **arg_names,
+ void **arg_mappers, int32_t team_num, int32_t thread_limit, int32_t depNum,
+ void *depList, int32_t noAliasDepNum, void *noAliasDepList) {
if (depNum + noAliasDepNum > 0)
__kmpc_omp_taskwait(NULL, __kmpc_global_thread_num(NULL));
return __tgt_target_teams_mapper(device_id, host_ptr, arg_num, args_base,
- args, arg_sizes, arg_types, arg_mappers, team_num, thread_limit);
+ args, arg_sizes, arg_types, arg_names,
+ arg_mappers, team_num, thread_limit);
}
// Get the current number of components for a user-defined mapper.
