[Openmp-commits] [openmp] fbcb1ee - [Libomptarget] Add support for offloading binaries in libomptarget
Joseph Huber via Openmp-commits
openmp-commits at lists.llvm.org
Thu Jul 21 10:20:17 PDT 2022
Author: Joseph Huber
Date: 2022-07-21T13:20:04-04:00
New Revision: fbcb1ee7f3648c0b3f326db32a7ae0772b962e06
URL: https://github.com/llvm/llvm-project/commit/fbcb1ee7f3648c0b3f326db32a7ae0772b962e06
DIFF: https://github.com/llvm/llvm-project/commit/fbcb1ee7f3648c0b3f326db32a7ae0772b962e06.diff
LOG: [Libomptarget] Add support for offloading binaries in libomptarget
The previous path changed the linker wrapper to embed the offloading
binary format inside the target image instead. This will allow us to
more generically bundle metadata with these images, such as requires
clauses or the target architecture it was compiled for.
I wasn't sure how to handle this best, so I introduced a new type that
replaces the old `__tgt_device_image` struct that we can expand inside
the runtime library. I made the new `__tgt_device_binary` struct pretty
much the same for now. In the future we could change this struct to
pretty much be the `OffloadBinary` class in the future.
Reviewed By: JonChesterfield
Differential Revision: https://reviews.llvm.org/D127432
Added:
Modified:
openmp/libomptarget/include/device.h
openmp/libomptarget/include/omptarget.h
openmp/libomptarget/include/omptargetplugin.h
openmp/libomptarget/include/rtl.h
openmp/libomptarget/src/rtl.cpp
Removed:
################################################################################
diff --git a/openmp/libomptarget/include/device.h b/openmp/libomptarget/include/device.h
index 95007e85a637d..e81934f083705 100644
--- a/openmp/libomptarget/include/device.h
+++ b/openmp/libomptarget/include/device.h
@@ -479,6 +479,10 @@ struct PluginManager {
/// RTLs identified on the host
RTLsTy RTLs;
+ /// Executable images and information extracted from the input images passed
+ /// to the runtime.
+ std::list<std::pair<__tgt_device_image, __tgt_image_info>> Images;
+
/// Devices associated with RTLs
std::vector<std::unique_ptr<DeviceTy>> Devices;
std::mutex RTLsMtx; ///< For RTLs and Devices
diff --git a/openmp/libomptarget/include/omptarget.h b/openmp/libomptarget/include/omptarget.h
index 935a815702463..8d4adc7a0d0ac 100644
--- a/openmp/libomptarget/include/omptarget.h
+++ b/openmp/libomptarget/include/omptarget.h
@@ -143,6 +143,11 @@ struct __tgt_device_image {
__tgt_offload_entry *EntriesEnd; // End of table (non inclusive)
};
+/// This struct contains information about a given image.
+struct __tgt_image_info {
+ const char *Arch;
+};
+
/// This struct is a record of all the host code that may be offloaded to a
/// target.
struct __tgt_bin_desc {
diff --git a/openmp/libomptarget/include/omptargetplugin.h b/openmp/libomptarget/include/omptargetplugin.h
index 6472a145b37d8..631678c9e4518 100644
--- a/openmp/libomptarget/include/omptargetplugin.h
+++ b/openmp/libomptarget/include/omptargetplugin.h
@@ -31,6 +31,12 @@ int32_t __tgt_rtl_number_of_devices(void);
// having to load the library, which can be expensive.
int32_t __tgt_rtl_is_valid_binary(__tgt_device_image *Image);
+// This provides the same functionality as __tgt_rtl_is_valid_binary except we
+// also use additional information to determine if the image is valid. This
+// allows us to determine if an image has a compatible architecture.
+int32_t __tgt_rtl_is_valid_binary_info(__tgt_device_image *Image,
+ __tgt_image_info *Info);
+
// Return an integer other than zero if the data can be exchaned from SrcDevId
// to DstDevId. If it is data exchangable, the device plugin should provide
// function to move data from source device to destination device directly.
diff --git a/openmp/libomptarget/include/rtl.h b/openmp/libomptarget/include/rtl.h
index 54542a47507e8..f2833a13d026d 100644
--- a/openmp/libomptarget/include/rtl.h
+++ b/openmp/libomptarget/include/rtl.h
@@ -26,6 +26,7 @@ struct __tgt_bin_desc;
struct RTLInfoTy {
typedef int32_t(is_valid_binary_ty)(void *);
+ typedef int32_t(is_valid_binary_info_ty)(void *, void *);
typedef int32_t(is_data_exchangable_ty)(int32_t, int32_t);
typedef int32_t(number_of_devices_ty)();
typedef int32_t(init_device_ty)(int32_t);
@@ -82,6 +83,7 @@ struct RTLInfoTy {
// Functions implemented in the RTL.
is_valid_binary_ty *is_valid_binary = nullptr;
+ is_valid_binary_info_ty *is_valid_binary_info = nullptr;
is_data_exchangable_ty *is_data_exchangable = nullptr;
number_of_devices_ty *number_of_devices = nullptr;
init_device_ty *init_device = nullptr;
diff --git a/openmp/libomptarget/src/rtl.cpp b/openmp/libomptarget/src/rtl.cpp
index 7337854c5d1f9..9d10712c9b334 100644
--- a/openmp/libomptarget/src/rtl.cpp
+++ b/openmp/libomptarget/src/rtl.cpp
@@ -14,6 +14,8 @@
#include "device.h"
#include "private.h"
+#include "llvm/Object/OffloadBinary.h"
+
#include <cassert>
#include <cstdlib>
#include <cstring>
@@ -165,6 +167,8 @@ void RTLsTy::loadRTLs() {
R.NumberOfDevices);
// Optional functions
+ *((void **)&R.is_valid_binary_info) =
+ dlsym(DynlibHandle, "__tgt_rtl_is_valid_binary_info");
*((void **)&R.deinit_device) =
dlsym(DynlibHandle, "__tgt_rtl_deinit_device");
*((void **)&R.init_requires) =
@@ -275,6 +279,39 @@ static void registerGlobalCtorsDtorsForImage(__tgt_bin_desc *Desc,
}
}
+static __tgt_device_image getExecutableImage(__tgt_device_image *Image) {
+ llvm::StringRef ImageStr(static_cast<char *>(Image->ImageStart),
+ static_cast<char *>(Image->ImageEnd) -
+ static_cast<char *>(Image->ImageStart));
+ auto BinaryOrErr =
+ llvm::object::OffloadBinary::create(llvm::MemoryBufferRef(ImageStr, ""));
+ if (!BinaryOrErr) {
+ llvm::consumeError(BinaryOrErr.takeError());
+ return *Image;
+ }
+
+ void *Begin = const_cast<void *>(
+ static_cast<const void *>((*BinaryOrErr)->getImage().bytes_begin()));
+ void *End = const_cast<void *>(
+ static_cast<const void *>((*BinaryOrErr)->getImage().bytes_end()));
+
+ return {Begin, End, Image->EntriesBegin, Image->EntriesEnd};
+}
+
+static __tgt_image_info getImageInfo(__tgt_device_image *Image) {
+ llvm::StringRef ImageStr(static_cast<char *>(Image->ImageStart),
+ static_cast<char *>(Image->ImageEnd) -
+ static_cast<char *>(Image->ImageStart));
+ auto BinaryOrErr =
+ llvm::object::OffloadBinary::create(llvm::MemoryBufferRef(ImageStr, ""));
+ if (!BinaryOrErr) {
+ llvm::consumeError(BinaryOrErr.takeError());
+ return __tgt_image_info{};
+ }
+
+ return __tgt_image_info{(*BinaryOrErr)->getArch().data()};
+}
+
void RTLsTy::registerRequires(int64_t Flags) {
// TODO: add more elaborate check.
// Minimal check: only set requires flags if previous value
@@ -350,17 +387,30 @@ void RTLsTy::initAllRTLs() {
void RTLsTy::registerLib(__tgt_bin_desc *Desc) {
PM->RTLsMtx.lock();
+
+ // Extract the exectuable image and extra information if availible.
+ for (int32_t i = 0; i < Desc->NumDeviceImages; ++i)
+ PM->Images.emplace_back(getExecutableImage(&Desc->DeviceImages[i]),
+ getImageInfo(&Desc->DeviceImages[i]));
+
// Register the images with the RTLs that understand them, if any.
- for (int32_t I = 0; I < Desc->NumDeviceImages; ++I) {
- // Obtain the image.
- __tgt_device_image *Img = &Desc->DeviceImages[I];
+ for (auto &ImageAndInfo : PM->Images) {
+ // Obtain the image and information that was previously extracted.
+ __tgt_device_image *Img = &ImageAndInfo.first;
+ __tgt_image_info *Info = &ImageAndInfo.second;
RTLInfoTy *FoundRTL = nullptr;
// Scan the RTLs that have associated images until we find one that supports
// the current image.
for (auto &R : AllRTLs) {
- if (!R.is_valid_binary(Img)) {
+ if (R.is_valid_binary_info) {
+ if (!R.is_valid_binary_info(Img, Info)) {
+ DP("Image " DPxMOD " is NOT compatible with RTL %s!\n",
+ DPxPTR(Img->ImageStart), R.RTLName.c_str());
+ continue;
+ }
+ } else if (!R.is_valid_binary(Img)) {
DP("Image " DPxMOD " is NOT compatible with RTL %s!\n",
DPxPTR(Img->ImageStart), R.RTLName.c_str());
continue;
@@ -412,9 +462,10 @@ void RTLsTy::unregisterLib(__tgt_bin_desc *Desc) {
PM->RTLsMtx.lock();
// Find which RTL understands each image, if any.
- for (int32_t I = 0; I < Desc->NumDeviceImages; ++I) {
- // Obtain the image.
- __tgt_device_image *Img = &Desc->DeviceImages[I];
+ for (auto &ImageAndInfo : PM->Images) {
+ // Obtain the image and information that was previously extracted.
+ __tgt_device_image *Img = &ImageAndInfo.first;
+ __tgt_image_info *Info = &ImageAndInfo.second;
RTLInfoTy *FoundRTL = NULL;
@@ -424,9 +475,15 @@ void RTLsTy::unregisterLib(__tgt_bin_desc *Desc) {
assert(R->IsUsed && "Expecting used RTLs.");
- if (!R->is_valid_binary(Img)) {
- DP("Image " DPxMOD " is NOT compatible with RTL " DPxMOD "!\n",
- DPxPTR(Img->ImageStart), DPxPTR(R->LibraryHandler));
+ if (R->is_valid_binary_info) {
+ if (!R->is_valid_binary_info(Img, Info)) {
+ DP("Image " DPxMOD " is NOT compatible with RTL %s!\n",
+ DPxPTR(Img->ImageStart), R->RTLName.c_str());
+ continue;
+ }
+ } else if (!R->is_valid_binary(Img)) {
+ DP("Image " DPxMOD " is NOT compatible with RTL %s!\n",
+ DPxPTR(Img->ImageStart), R->RTLName.c_str());
continue;
}
More information about the Openmp-commits
mailing list