[Openmp-commits] [openmp] 542d9c2 - [libomptarget] Load images in order of registration
Simon Moll via Openmp-commits
openmp-commits at lists.llvm.org
Wed Feb 24 09:15:49 PST 2021
Author: Manoel Roemmer
Date: 2021-02-24T18:15:41+01:00
New Revision: 542d9c21541d64da7e1c63a67563aa93ebc93446
URL: https://github.com/llvm/llvm-project/commit/542d9c21541d64da7e1c63a67563aa93ebc93446
DIFF: https://github.com/llvm/llvm-project/commit/542d9c21541d64da7e1c63a67563aa93ebc93446.diff
LOG: [libomptarget] Load images in order of registration
This makes sure that images are loaded in the order in which they are registered with libomptarget.
If a target can load multiple images and these images depend on each other (for example if one image contains the programs target regions and one image contains library code), then the order in which images are loaded can be important for symbol resolution (for example, in the VE plugin).
In this case: because the same code exist in the host binaries, the order in which the host linker loads them (which is also the order in which images are registered with libomptarget) is the order in which the images have to be loaded onto the device.
Reviewed By: JonChesterfield
Differential Revision: https://reviews.llvm.org/D95530
Added:
Modified:
openmp/libomptarget/include/omptargetplugin.h
openmp/libomptarget/plugins/exports
openmp/libomptarget/plugins/ve/src/rtl.cpp
openmp/libomptarget/src/device.h
openmp/libomptarget/src/omptarget.cpp
openmp/libomptarget/src/rtl.cpp
openmp/libomptarget/src/rtl.h
Removed:
################################################################################
diff --git a/openmp/libomptarget/include/omptargetplugin.h b/openmp/libomptarget/include/omptargetplugin.h
index 6785e77edbb4..b67a4411ce75 100644
--- a/openmp/libomptarget/include/omptargetplugin.h
+++ b/openmp/libomptarget/include/omptargetplugin.h
@@ -36,6 +36,11 @@ int32_t __tgt_rtl_is_valid_binary(__tgt_device_image *Image);
// function to move data from source device to destination device directly.
int32_t __tgt_rtl_is_data_exchangable(int32_t SrcDevId, int32_t DstDevId);
+// Return an integer other than zero if the plugin can handle images which do
+// not contain target regions and global variables (but can contain other
+// functions)
+int32_t __tgt_rtl_supports_empty_images();
+
// Initialize the requires flags for the device.
int64_t __tgt_rtl_init_requires(int64_t RequiresFlags);
diff --git a/openmp/libomptarget/plugins/exports b/openmp/libomptarget/plugins/exports
index 48f81c088200..63042a03b7f5 100644
--- a/openmp/libomptarget/plugins/exports
+++ b/openmp/libomptarget/plugins/exports
@@ -21,6 +21,7 @@ VERS1.0 {
__tgt_rtl_synchronize;
__tgt_rtl_register_lib;
__tgt_rtl_unregister_lib;
+ __tgt_rtl_supports_empty_images;
local:
*;
};
diff --git a/openmp/libomptarget/plugins/ve/src/rtl.cpp b/openmp/libomptarget/plugins/ve/src/rtl.cpp
index 186247db20ec..a77cd31e4867 100644
--- a/openmp/libomptarget/plugins/ve/src/rtl.cpp
+++ b/openmp/libomptarget/plugins/ve/src/rtl.cpp
@@ -444,3 +444,5 @@ int32_t __tgt_rtl_run_target_region(int32_t ID, void *Entry, void **Args,
return __tgt_rtl_run_target_team_region(ID, Entry, Args, Offsets, NumArgs, 1,
1, 0);
}
+
+int32_t __tgt_rtl_supports_empty_images() { return 1; }
diff --git a/openmp/libomptarget/src/device.h b/openmp/libomptarget/src/device.h
index 84a0987e30fe..bdd269e36378 100644
--- a/openmp/libomptarget/src/device.h
+++ b/openmp/libomptarget/src/device.h
@@ -241,6 +241,8 @@ struct PluginManager {
/// Translation table retreived from the binary
HostEntriesBeginToTransTableTy HostEntriesBeginToTransTable;
std::mutex TrlTblMtx; ///< For Translation Table
+ /// Host offload entries in order of image registration
+ std::vector<__tgt_offload_entry *> HostEntriesBeginRegistrationOrder;
/// Map from ptrs on the host to an entry in the Translation Table
HostPtrToTableMapTy HostPtrToTableMap;
diff --git a/openmp/libomptarget/src/omptarget.cpp b/openmp/libomptarget/src/omptarget.cpp
index 3d218ab35299..f273b6618e1a 100644
--- a/openmp/libomptarget/src/omptarget.cpp
+++ b/openmp/libomptarget/src/omptarget.cpp
@@ -75,18 +75,21 @@ static int InitLibrary(DeviceTy &Device) {
*/
int32_t device_id = Device.DeviceID;
int rc = OFFLOAD_SUCCESS;
+ bool supportsEmptyImages = Device.RTL->supports_empty_images &&
+ Device.RTL->supports_empty_images() > 0;
Device.PendingGlobalsMtx.lock();
PM->TrlTblMtx.lock();
- for (HostEntriesBeginToTransTableTy::iterator entry_it =
- PM->HostEntriesBeginToTransTable.begin();
- entry_it != PM->HostEntriesBeginToTransTable.end(); ++entry_it) {
- TranslationTable *TransTable = &entry_it->second;
+ for (auto *HostEntriesBegin : PM->HostEntriesBeginRegistrationOrder) {
+ TranslationTable *TransTable =
+ &PM->HostEntriesBeginToTransTable[HostEntriesBegin];
if (TransTable->HostTable.EntriesBegin ==
- TransTable->HostTable.EntriesEnd) {
+ TransTable->HostTable.EntriesEnd &&
+ !supportsEmptyImages) {
// No host entry so no need to proceed
continue;
}
+
if (TransTable->TargetsTable[device_id] != 0) {
// Library entries have already been processed
continue;
diff --git a/openmp/libomptarget/src/rtl.cpp b/openmp/libomptarget/src/rtl.cpp
index 60f3d4983069..7bf4f9b2b420 100644
--- a/openmp/libomptarget/src/rtl.cpp
+++ b/openmp/libomptarget/src/rtl.cpp
@@ -173,6 +173,8 @@ void RTLsTy::LoadRTLs() {
dlsym(dynlib_handle, "__tgt_rtl_register_lib");
*((void **)&R.unregister_lib) =
dlsym(dynlib_handle, "__tgt_rtl_unregister_lib");
+ *((void **)&R.supports_empty_images) =
+ dlsym(dynlib_handle, "__tgt_rtl_supports_empty_images");
}
DP("RTLs loaded!\n");
@@ -334,6 +336,7 @@ void RTLsTy::RegisterLib(__tgt_bin_desc *desc) {
// Initialize (if necessary) translation table for this library.
PM->TrlTblMtx.lock();
if (!PM->HostEntriesBeginToTransTable.count(desc->HostEntriesBegin)) {
+ PM->HostEntriesBeginRegistrationOrder.push_back(desc->HostEntriesBegin);
TranslationTable &TransTable =
(PM->HostEntriesBeginToTransTable)[desc->HostEntriesBegin];
TransTable.HostTable.EntriesBegin = desc->HostEntriesBegin;
diff --git a/openmp/libomptarget/src/rtl.h b/openmp/libomptarget/src/rtl.h
index 8daafe1c9734..a67b8682a0f4 100644
--- a/openmp/libomptarget/src/rtl.h
+++ b/openmp/libomptarget/src/rtl.h
@@ -54,6 +54,7 @@ struct RTLInfoTy {
typedef int64_t(init_requires_ty)(int64_t);
typedef int64_t(synchronize_ty)(int32_t, __tgt_async_info *);
typedef int32_t (*register_lib_ty)(__tgt_bin_desc *);
+ typedef int32_t(supports_empty_images_ty)();
int32_t Idx = -1; // RTL index, index is the number of devices
// of other RTLs that were registered before,
@@ -89,6 +90,7 @@ struct RTLInfoTy {
synchronize_ty *synchronize = nullptr;
register_lib_ty register_lib = nullptr;
register_lib_ty unregister_lib = nullptr;
+ supports_empty_images_ty *supports_empty_images = nullptr;
// Are there images associated with this RTL.
bool isUsed = false;
More information about the Openmp-commits
mailing list