imprv

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/back/write.rs

@@ -779,19 +779,17 @@ pub(crate) unsafe fn llvm_optimize(
         let out_obj_c = CString::new("/p/lustre1/drehwald1/prog/offload/r/host.o").unwrap();
 
         unsafe {
-            llvm::LLVMRustBundleImages(
-                module.module_llvm.llmod(),
-                module.module_llvm.tm.raw(),
-                host_out_c.as_ptr(),
-            );
-        }
-        unsafe {
+            //let buf = llvm::LLVMRustModuleBufferFromFile(lib_bc_c.as_ptr()).unwrap();
+            let buf = llvm::LLVMRustModuleBufferCreate(module.module_llvm.llmod());
+
+            let ok =
+                llvm::LLVMRustBundleImages(buf, module.module_llvm.tm.raw(), host_out_c.as_ptr());
             // 1) Bundle device module into offload image host.out (device TM)
-            let ok = llvm::LLVMRustBundleImages(
-                module.module_llvm.llmod(),
-                module.module_llvm.tm.raw(),
-                host_out_c.as_ptr(),
-            );
+            //let ok = llvm::LLVMRustBundleImages(
+            //    module.module_llvm.llmod(),
+            //    module.module_llvm.tm.raw(),
+            //    host_out_c.as_ptr(),
+            //);
             assert!(ok, "LLVMRustBundleImages (device -> host.out) failed");
 
             // 2) Finalize host: lib.bc + host.out -> host.offload.o (host TM created in C++)

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -1723,7 +1723,8 @@ mod Offload {
     unsafe extern "C" {
         /// Processes the module and writes it in an offload compatible way into a "host.out" file.
         pub(crate) fn LLVMRustBundleImages<'a>(
-            M: &'a Module,
+            p: &ModuleBuffer,
+            //M: &'a Module,
             TM: &'a TargetMachine,
             host_out: *const c_char,
         ) -> bool;
@@ -1733,6 +1734,11 @@ mod Offload {
             out_obj_path: *const c_char,
         ) -> bool;
         pub(crate) fn LLVMRustOffloadMapper<'a>(OldFn: &'a Value, NewFn: &'a Value);
+        //pub(crate) fn LLVMCreateMemoryBufferWithContentsOfFile(
+        //    path: *const c_char,
+        //    buf: &mut ModuleBuffer,
+        //    msg: *mut c_char,
+        //);
     }
 }
 
@@ -2500,6 +2506,9 @@ unsafe extern "C" {
     pub(crate) fn LLVMRustSetModulePIELevel(M: &Module);
     pub(crate) fn LLVMRustSetModuleCodeModel(M: &Module, Model: CodeModel);
     pub(crate) fn LLVMRustModuleBufferCreate(M: &Module) -> &'static mut ModuleBuffer;
+    pub(crate) fn LLVMRustModuleBufferFromFile(
+        path: *const c_char,
+    ) -> Option<&'static mut ModuleBuffer>;
     pub(crate) fn LLVMRustModuleBufferPtr(p: &ModuleBuffer) -> *const u8;
     pub(crate) fn LLVMRustModuleBufferLen(p: &ModuleBuffer) -> usize;
     pub(crate) fn LLVMRustModuleBufferFree(p: &'static mut ModuleBuffer);