wip

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/builder/gpu_offload.rs

@@ -58,7 +58,7 @@ impl<'ll> OffloadGlobals<'ll> {
     }
 }
 
-pub fn generate_mapper_call<'ll, 'tcx>(
+pub(crate) fn generate_mapper_call<'ll, 'tcx>(
     builder: &mut Builder<'_, 'll, 'tcx>,
     geps: [&'ll Value; 3],
     o_type: &'ll Value,
@@ -586,7 +586,7 @@ fn get_runtime_size<'ll, 'tcx>(
 
 // For now we have a very simplistic indexing scheme into our
 // offload_{baseptrs,ptrs,sizes}. We will probably improve this along with our gpu frontend pr.
-pub fn get_geps<'ll, 'tcx>(
+pub(crate) fn get_geps<'ll, 'tcx>(
     builder: &mut Builder<'_, 'll, 'tcx>,
     ty: &'ll Type,
     ty2: &'ll Type,
@@ -604,7 +604,7 @@ pub fn get_geps<'ll, 'tcx>(
     [gep1, gep2, gep3]
 }
 
-pub fn preper_datatransfers<'ll, 'tcx>(
+pub(crate) fn preper_datatransfers<'ll, 'tcx>(
     cx: &SimpleCx<'ll>,
     builder: &mut Builder<'_, 'll, 'tcx>,
     args: &[&'ll Value],
@@ -792,6 +792,7 @@ pub(crate) fn gen_call_handling<'ll, 'tcx>(
 
     // Step 3)
     // Here we fill the KernelArgsTy, see the documentation above
+    let i32_0 = cx.get_const_i32(0);
     for (i, value) in values.iter().enumerate() {
         let ptr = builder.inbounds_gep(tgt_kernel_decl, a5, &[i32_0, cx.get_const_i32(i as u64)]);
         let name = std::ffi::CString::new(value.1).unwrap();

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -1943,7 +1943,12 @@ fn codegen_offload_preload<'ll, 'tcx>(
 
     //let a = OffloadMetadata::from_ty(tcx, arg_ty);
 
-    let arg = &args[0];
+    let arg: &OperandRef<'_, &'ll Value> = &args[0];
+    let args = match arg.val {
+        OperandValue::Immediate(val) => vec![val],
+        _ => bug!("asdf"),
+    };
+    //let args = get_args_from_tuple(bx, args[4], fn_target);
 
     let arg_ty = arg.layout.ty;
 
@@ -1969,7 +1974,7 @@ fn codegen_offload_preload<'ll, 'tcx>(
     let (ty, ty2, a1, a2, a4) = preper_datatransfers(
         cx,
         bx,
-        &[arg],
+        &args,
         &[types],
         offload_data.offload_sizes,
         metadata,
@@ -1981,8 +1986,8 @@ fn codegen_offload_preload<'ll, 'tcx>(
         bx,
         geps,
         offload_data.memtransfer_begin,
-        offload_globals.mapper_fn_ty,
         offload_globals.begin_mapper,
+        offload_globals.mapper_fn_ty,
         1,
         offload_globals.ident_t_global,
     );