(almost) finish generating definitions for globals

ZuseZ4 · ZuseZ4 · commit fe5aaec02a0a · 2025-06-07T17:58:04.000-07:00
diff --git a/compiler/rustc_codegen_llvm/src/back/lto.rs b/compiler/rustc_codegen_llvm/src/back/lto.rs
@@ -686,19 +686,33 @@ pub(crate) fn run_pass_manager(
             let ti8 = cx.type_i8();
             let tarr = cx.type_array(ti32, 3);
 
+            // coppied from LLVM
+            // typedef struct {
+            //   uint64_t Reserved;
+            //   uint16_t Version;
+            //   uint16_t Kind;
+            //   uint32_t Flags;
+            //   void *Address;
+            //   char *SymbolName;
+            //   uint64_t Size;
+            //   uint64_t Data;
+            //   void *AuxAddr;
+            // } __tgt_offload_entry;
             let entry_elements = vec![ti64, ti16, ti16, ti32, tptr, tptr, ti64, ti64, tptr];
             let kernel_elements = vec![ti32, ti32, tptr, tptr, tptr, tptr, tptr, tptr, ti64, ti64, tarr, tarr, ti32];
 
             cx.set_struct_body(offload_entry_ty, &entry_elements, false);
             cx.set_struct_body(kernel_arguments_ty, &kernel_elements, false);
             let global = cx.declare_global("my_struct_global", offload_entry_ty);
             let global = cx.declare_global("my_struct_global2", kernel_arguments_ty);
+//@my_struct_global = external global %struct.__tgt_offload_entry
+//@my_struct_global2 = external global %struct.__tgt_kernel_arguments
             dbg!(&offload_entry_ty);
             dbg!(&kernel_arguments_ty);
             //LLVMTypeRef elements[9] = {i64Ty, i16Ty, i16Ty, i32Ty, ptrTy, ptrTy, i64Ty, i64Ty, ptrTy};
             //LLVMStructSetBody(structTy, elements, 9, 0);
             dbg!("created struct");
-            for num in 0..5 {
+            for num in 0..9 {
                 if !cx.get_function(&format!("kernel_{num}")).is_some() {
                     continue;
                 }
@@ -711,19 +725,24 @@ pub(crate) fn run_pass_manager(
                         size_val.push(cx.get_const_i64(val));
                     }
                     let initializer = cx.const_array(ti64, &size_val);
-                    add_global(cx, name, initializer, PrivateLinkage)
+                    add_unnamed_global(cx, name, initializer, PrivateLinkage)
                 }
 
                 fn add_global<'ll>(cx: &SimpleCx<'ll>, name: &str, initializer: &'ll llvm::Value, l: Linkage) -> &'ll llvm::Value {
                     let c_name = CString::new(name).unwrap();
                     let llglobal: &'ll llvm::Value = llvm::add_global(cx.llmod, cx.val_ty(initializer), &c_name);
                     llvm::set_global_constant(llglobal, true);
-                    unsafe {llvm::LLVMSetUnnamedAddress(llglobal, llvm::UnnamedAddr::Global)};
                     llvm::set_linkage(llglobal, l);
                     llvm::set_initializer(llglobal, initializer);
                     llglobal
                 }
 
+                fn add_unnamed_global<'ll>(cx: &SimpleCx<'ll>, name: &str, initializer: &'ll llvm::Value, l: Linkage) -> &'ll llvm::Value {
+                    let llglobal = add_global(cx, name, initializer, l);
+                    unsafe {llvm::LLVMSetUnnamedAddress(llglobal, llvm::UnnamedAddr::Global)};
+                    llglobal
+                }
+
                 // We add a pair of sizes and maptypes per offloadable function.
                 // @.offload_maptypes = private unnamed_addr constant [4 x i64] [i64 800, i64 544, i64 547, i64 544]
                 let o_sizes = add_priv_unnamed_arr(&cx, &format!(".offload_sizes.{num}"), &vec![8u64,0,16,0]);
@@ -736,34 +755,42 @@ pub(crate) fn run_pass_manager(
                 // the llvm.rodata entry name, and  the omp_offloading_entries value
 
                 // @.__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7.region_id = weak constant i8 0
+                // @.offloading.entry_name = internal unnamed_addr constant [66 x i8] c"__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7\00", section ".llvm.rodata.offloading", align 1
                 let name = format!(".kernel_{num}.region_id");
                 let initializer = cx.get_const_i8(0);
-                add_global(&cx, &name, initializer, WeakAnyLinkage);
+                let region_id = add_unnamed_global(&cx, &name, initializer, WeakAnyLinkage);
 
-                let entry_name = format!("kernel_{num}");
-                let c_entry_name = CString::new(entry_name).unwrap();
+                let c_entry_name = CString::new(format!("kernel_{num}")).unwrap();
                 let c_val = c_entry_name.as_bytes_with_nul();
                 let foo = format!(".offloading.entry_name.{num}");
 
                 let initializer = crate::common::bytes_in_context(cx.llcx, c_val);
-                let llglobal = add_global(&cx, &foo, initializer, InternalLinkage);
+                let llglobal = add_unnamed_global(&cx, &foo, initializer, InternalLinkage);
                 llvm::set_alignment(llglobal, rustc_abi::Align::ONE);
                 let c_section_name = CString::new(".llvm.rodata.offloading").unwrap();
                 llvm::set_section(llglobal, &c_section_name);
-                // @.offloading.entry_name = internal unnamed_addr constant [66 x i8] c"__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7\00", section ".llvm.rodata.offloading", align 1
+
+
+                // New, TODO: cleanup
+                let name = format!(".offloading.entry.kernel_{num}");
+                let ci64_0 = cx.get_const_i64(0);
+                let ci16_1 = cx.get_const_i16(1);
+                let elems: Vec<&llvm::Value> = vec![ci64_0, ci16_1, ci16_1, cx.get_const_i32(0), region_id, llglobal, ci64_0, ci64_0, cx.const_null(cx.type_ptr())];
+
+                let initializer = crate::common::named_struct(offload_entry_ty, &elems);
+                let c_name = CString::new(name).unwrap();
+                let llglobal = llvm::add_global(cx.llmod, offload_entry_ty, &c_name);
+                llvm::set_global_constant(llglobal, true);
+                llvm::set_linkage(llglobal, WeakAnyLinkage);
+                llvm::set_initializer(llglobal, initializer);
+                llvm::set_alignment(llglobal, rustc_abi::Align::ONE);
+                let c_section_name = CString::new(".omp_offloading_entries").unwrap();
+                llvm::set_section(llglobal, &c_section_name);
+                // rustc
+                // @.offloading.entry.kernel_3 = weak constant %struct.__tgt_offload_entry { i64 0, i16 1, i16 1, i32 0, ptr @.kernel_3.region_id, ptr @.offloading.entry_name.3, i64 0, i64 0, ptr null }, section ".omp_offloading_entries", align 1
+                // clang
                 // @.offloading.entry.__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7 = weak constant %struct.__tgt_offload_entry { i64 0, i16 1, i16 1, i32 0, ptr @.__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7.region_id, ptr @.offloading.entry_name, i64 0, i64 0, ptr null }, section "omp_offloading_entries", align 1
 
-                // typedef struct {
-                //   uint64_t Reserved;
-                //   uint16_t Version;
-                //   uint16_t Kind;
-                //   uint32_t Flags;
-                //   void *Address;
-                //   char *SymbolName;
-                //   uint64_t Size;
-                //   uint64_t Data;
-                //   void *AuxAddr;
-                // } __tgt_offload_entry;
                 //
                 // enum Flags {
                 //   OMP_REGISTER_REQUIRES = 0x10,
@@ -788,29 +815,6 @@ pub(crate) fn run_pass_manager(
                 // 4. @.offloading.entry_name = internal unnamed_addr constant [66 x i8] c"__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7\00", section ".llvm.rodata.offloading", align 1
                 // 5. @.offloading.entry.__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7 = weak constant %struct.__tgt_offload_entry { i64 0, i16 1, i16 1, i32 0, ptr @.__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7.region_id, ptr @.offloading.entry_name, i64 0, i64 0, ptr null }, section "omp_offloading_entries", align 1
             }
-            // @.__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7.region_id = weak constant i8 0
-            // @.offload_sizes = private unnamed_addr constant [4 x i64] [i64 8, i64 0, i64 16, i64 0]
-            // @.offload_maptypes = private unnamed_addr constant [4 x i64] [i64 800, i64 544, i64 547, i64 544]
-            // @.__omp_offloading_86fafab6_c40006a1__Z3barPSt7complexIdES1_S0_m_l13.region_id = weak constant i8 0
-            // @.offload_sizes.1 = private unnamed_addr constant [4 x i64] [i64 8, i64 0, i64 16, i64 0]
-            // @.offload_maptypes.2 = private unnamed_addr constant [4 x i64] [i64 800, i64 544, i64 547, i64 544]
-            // @.__omp_offloading_86fafab6_c40006a1__Z5zaxpyPSt7complexIdES1_S0_m_l19.region_id = weak constant i8 0
-            // @.offload_sizes.3 = private unnamed_addr constant [4 x i64] [i64 8, i64 0, i64 16, i64 0]
-            // @.offload_maptypes.4 = private unnamed_addr constant [4 x i64] [i64 800, i64 544, i64 547, i64 544]
-            // @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 16384, i64 16384]
-            // @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 1, i64 3]
-            // @_ZSt4cout = external global %"class.std::basic_ostream", align 8
-            // @.str = private unnamed_addr constant [3 x i8] c"hi\00", align 1
-            // @.offload_sizes.7 = private unnamed_addr constant [2 x i64] [i64 16384, i64 16384]
-            // @.offload_maptypes.8 = private unnamed_addr constant [2 x i64] [i64 1, i64 3]
-            // @.str.9 = private unnamed_addr constant [3 x i8] c"ho\00", align 1
-            // @.offloading.entry_name = internal unnamed_addr constant [66 x i8] c"__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7\00", section ".llvm.rodata.offloading", align 1
-            // @.offloading.entry.__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7 = weak constant %struct.__tgt_offload_entry { i64 0, i16 1, i16 1, i32 0, ptr @.__omp_offloading_86fafab6_c40006a1__Z3fooPSt7complexIdES1_S0_m_l7.region_id, ptr @.offloading.entry_name, i64 0, i64 0, ptr null }, section "omp_offloading_entries", align 1
-            // @.offloading.entry_name.10 = internal unnamed_addr constant [67 x i8] c"__omp_offloading_86fafab6_c40006a1__Z3barPSt7complexIdES1_S0_m_l13\00", section ".llvm.rodata.offloading", align 1
-            // @.offloading.entry.__omp_offloading_86fafab6_c40006a1__Z3barPSt7complexIdES1_S0_m_l13 = weak constant %struct.__tgt_offload_entry { i64 0, i16 1, i16 1, i32 0, ptr @.__omp_offloading_86fafab6_c40006a1__Z3barPSt7complexIdES1_S0_m_l13.region_id, ptr @.offloading.entry_name.10, i64 0, i64 0, ptr null }, section "omp_offloading_entries", align 1
-            // @.offloading.entry_name.11 = internal unnamed_addr constant [69 x i8] c"__omp_offloading_86fafab6_c40006a1__Z5zaxpyPSt7complexIdES1_S0_m_l19\00", section ".llvm.rodata.offloading", align 1
-            // @.offloading.entry.__omp_offloading_86fafab6_c40006a1__Z5zaxpyPSt7complexIdES1_S0_m_l19 = weak constant %struct.__tgt_offload_entry { i64 0, i16 1, i16 1, i32 0, ptr @.__omp_offloading_86fafab6_c40006a1__Z5zaxpyPSt7complexIdES1_S0_m_l19.region_id, ptr @.offloading.entry_name.11, i64 0, i64 0, ptr null }, section "omp_offloading_entries", align 1
-            // @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @_GLOBAL__sub_I_zaxpy.cpp, ptr null }]
         } else {
             dbg!("no marker found");
         }
diff --git a/compiler/rustc_codegen_llvm/src/common.rs b/compiler/rustc_codegen_llvm/src/common.rs
@@ -119,6 +119,10 @@ impl<'ll, CX: Borrow<SCx<'ll>>> GenericCx<'ll, CX> {
             r
         }
     }
+
+    pub(crate) fn const_null(&self, t: &'ll Type) -> &'ll Value {
+        unsafe { llvm::LLVMConstNull(t) }
+    }
 }
 
 impl<'ll, 'tcx> ConstCodegenMethods for CodegenCx<'ll, 'tcx> {
@@ -373,6 +377,14 @@ pub(crate) fn bytes_in_context<'ll>(llcx: &'ll llvm::Context, bytes: &[u8]) -> &
     }
 }
 
+pub(crate) fn named_struct<'ll>(
+    ty: &'ll Type,
+    elts: &[&'ll Value],
+) -> &'ll Value {
+    let len = c_uint::try_from(elts.len()).expect("LLVMConstStructInContext elements len overflow");
+    unsafe { llvm::LLVMConstNamedStruct(ty, elts.as_ptr(), len) }
+}
+
 fn struct_in_context<'ll>(
     llcx: &'ll llvm::Context,
     elts: &[&'ll Value],
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
@@ -685,6 +685,16 @@ impl<'ll, CX: Borrow<SCx<'ll>>> GenericCx<'ll, CX> {
         unsafe { llvm::LLVMConstInt(ty, n, llvm::False) }
     }
 
+    pub(crate) fn get_const_i32(&self, n: u64) -> &'ll Value {
+        let ty = unsafe { llvm::LLVMInt32TypeInContext(self.llcx()) };
+        unsafe { llvm::LLVMConstInt(ty, n, llvm::False) }
+    }
+
+    pub(crate) fn get_const_i16(&self, n: u64) -> &'ll Value {
+        let ty = unsafe { llvm::LLVMInt16TypeInContext(self.llcx()) };
+        unsafe { llvm::LLVMConstInt(ty, n, llvm::False) }
+    }
+
     pub(crate) fn get_const_i8(&self, n: u64) -> &'ll Value {
         let ty = unsafe { llvm::LLVMInt8TypeInContext(self.llcx()) };
         unsafe { llvm::LLVMConstInt(ty, n, llvm::False) }
diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs
@@ -1139,6 +1139,11 @@ unsafe extern "C" {
         Count: c_uint,
         Packed: Bool,
     ) -> &'a Value;
+    pub(crate) fn LLVMConstNamedStruct<'a>(
+        StructTy: &'a Type,
+        ConstantVals: *const &'a Value,
+        Count: c_uint,
+    ) -> &'a Value;
     pub(crate) fn LLVMConstVector(ScalarConstantVals: *const &Value, Size: c_uint) -> &Value;
 
     // Constant expressions

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,10 @@ impl<'ll, CX: Borrow<SCx<'ll>>> GenericCx<'ll, CX> {`
`119`	`119`	`r`
`120`	`120`	`}`
`121`	`121`	`}`
	`122`	`+`
	`123`	`+ pub(crate) fn const_null(&self, t: &'ll Type) -> &'ll Value {`
	`124`	`+ unsafe { llvm::LLVMConstNull(t) }`
	`125`	`+ }`
`122`	`126`	`}`
`123`	`127`
`124`	`128`	`impl<'ll, 'tcx> ConstCodegenMethods for CodegenCx<'ll, 'tcx> {`
`@@ -373,6 +377,14 @@ pub(crate) fn bytes_in_context<'ll>(llcx: &'ll llvm::Context, bytes: &[u8]) -> &`
`373`	`377`	`}`
`374`	`378`	`}`
`375`	`379`
	`380`	`+pub(crate) fn named_struct<'ll>(`
	`381`	`+ ty: &'ll Type,`
	`382`	`+ elts: &[&'ll Value],`
	`383`	`+) -> &'ll Value {`
	`384`	`+ let len = c_uint::try_from(elts.len()).expect("LLVMConstStructInContext elements len overflow");`
	`385`	`+ unsafe { llvm::LLVMConstNamedStruct(ty, elts.as_ptr(), len) }`
	`386`	`+}`
	`387`	`+`
`376`	`388`	`fn struct_in_context<'ll>(`
`377`	`389`	`llcx: &'ll llvm::Context,`
`378`	`390`	`elts: &[&'ll Value],`