imprv

Author: ZuseZ4

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -80,31 +80,42 @@ static Error writeFile(StringRef Filename, StringRef Data) {
   return Error::success();
 }
 
-extern "C" bool rustBundleImages() {
+extern "C" bool rustBundleImages(LLVMModuleRef M, StringRef triple, StringRef arch) {
+  Module *Mptr = unwrap(M);
+  std::string Storage;
+  llvm::raw_string_ostream OS1(Storage);
+  Mptr->print(OS1, nullptr);
+  OS1.flush();
+  auto MB = llvm::MemoryBuffer::getMemBufferCopy(Storage, "module.ll");
+
   SmallVector<char, 1024> BinaryData;
   raw_svector_ostream OS(BinaryData);
   BumpPtrAllocator Alloc;
   StringSaver Saver(Alloc);
 
   DenseMap<StringRef, StringRef> Args;
-  Args["triple"] = "amdgcn-amd-amdhsa"; // required
-  Args["arch"]   = "gfx90a"; // optional, but from rustc?
+  //Args["triple"] = "amdgcn-amd-amdhsa"; // required
+  //Args["arch"]   = "gfx90a"; // optional, but from rustc?
 
   {
     OffloadBinary::OffloadingImage ImageBinary{};
 
-    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> ObjectOrErr =
-        llvm::MemoryBuffer::getFileOrSTDIN("device.bc");
-    if (std::error_code EC = ObjectOrErr.getError())
-      return false;
+
+    //llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> ObjectOrErr =
+    //    llvm::MemoryBuffer::getFileOrSTDIN("device.bc");
+    //if (std::error_code EC = ObjectOrErr.getError())
+    //  return false;
 
     // Clang uses the '.o' suffix for LTO bitcode.
     ImageBinary.TheImageKind = object::IMG_Bitcode;
-    ImageBinary.Image = std::move(*ObjectOrErr);
+    ImageBinary.Image = std::move(MB);
+    //ImageBinary.Image = std::move(*ObjectOrErr);
     ImageBinary.TheOffloadKind = object::OFK_OpenMP;
-    for (const auto &[Key, Value] : Args) {
-      ImageBinary.StringData[Key] = Value;
-    }
+    ImageBinary.StringData["triple"] = triple;
+    ImageBinary.StringData["arch"] = arch;
+    //for (const auto &[Key, Value] : Args) {
+    //  ImageBinary.StringData[Key] = Value;
+    //}
     llvm::SmallString<0> Buffer = OffloadBinary::write(ImageBinary);
     if (Buffer.size() % OffloadBinary::getAlignment() != 0)
       // "Offload binary has invalid size alignment");