This introduces LipoProteinLipase (lpl), a simple tool for creating fat binaries. It represents a direct replacement of the creaky hccgenco.sh script, which had various issues. The format it uses is that of a code object bundle, generated by the Clang Offload Bundler. The output is always suffixed with the ".adipose" extension. It is shared with HCC. The hipcc script and associated tests are modified to use lpl. Help can be obtained by invoking lpl --help. A more computer-sciency / corporate friendly name is likely to be beneficial, which is a reason for choosing easily searchable/replaceable names such as lpl or adipose.

[ROCm/hip commit: b842394957]

projects/hip/src/code_object_bundle.cpp

@@ -2,22 +2,26 @@
 
 #include <hsa/hsa.h>
 
+#include <algorithm>
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <vector>
 
+using namespace std;
+
 hsa_isa_t hip_impl::triple_to_hsa_isa(const std::string& triple)
 {
     static constexpr const char prefix[] = "hcc-amdgcn--amdhsa-gfx";
-    static constexpr std::size_t prefix_sz = sizeof(prefix) - 1;
+    static constexpr size_t prefix_sz = sizeof(prefix) - 1;
 
     hsa_isa_t r = {};
 
     auto idx = triple.find(prefix);
 
-    if (idx != std::string::npos) {
+    if (idx != string::npos) {
         idx += prefix_sz;
-        std::string tmp = "AMD:AMDGPU";
+        string tmp = "AMD:AMDGPU";
         while (idx != triple.size()) {
             tmp.push_back(':');
             tmp.push_back(triple[idx++]);
@@ -33,7 +37,31 @@ hsa_isa_t hip_impl::triple_to_hsa_isa(const std::string& triple)
 constexpr const char hip_impl::Bundled_code_header::magic_string_[];
 
 // CREATORS
-hip_impl::Bundled_code_header::Bundled_code_header(
-    const std::vector<std::uint8_t>& x)
+hip_impl::Bundled_code_header::Bundled_code_header(const vector<char>& x)
     : Bundled_code_header{x.cbegin(), x.cend()}
-{}
+{}
+
+hip_impl::Bundled_code_header::Bundled_code_header(const void* p)
+{   // This is a pretty terrible interface, useful only because
+    // hipLoadModuleData is so poorly specified (for no fault of its own).
+    if (!p) return;
+
+    auto ph = static_cast<const Header_*>(p);
+
+    if (!equal(
+        magic_string_,
+        magic_string_ + magic_string_sz_,
+        ph->bundler_magic_string_)) {
+        return;
+    }
+
+    size_t sz = sizeof(Header_) + ph->bundle_cnt_ * sizeof(Bundled_code::Header);
+    auto pb = static_cast<const char*>(p) + sizeof(Header_);
+    auto n = ph->bundle_cnt_;
+    while (n--) {
+        sz += reinterpret_cast<const Bundled_code::Header*>(pb)->bundle_sz;
+        pb += sizeof(Bundled_code::Header);
+    }
+
+    read(static_cast<const char*>(p), static_cast<const char*>(p) + sz, *this);
+}