return mapper empty??

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/builder/gpu_offload.rs

@@ -446,6 +446,7 @@ pub(crate) fn gen_define_handling<'ll>(
     let valid_begin_mappings = MappingFlags::TO | MappingFlags::LITERAL | MappingFlags::IMPLICIT;
     let transfer_to: Vec<u64> =
         transfer.iter().map(|m| m.intersection(valid_begin_mappings).bits()).collect();
+    dbg!(&transfer);
     let transfer_from: Vec<u64> =
         transfer.iter().map(|m| m.intersection(MappingFlags::FROM).bits()).collect();
     let valid_kernel_mappings = MappingFlags::LITERAL | MappingFlags::IMPLICIT;
@@ -469,6 +470,7 @@ pub(crate) fn gen_define_handling<'ll>(
         add_priv_unnamed_arr(&cx, &format!(".offload_maptypes.{symbol}.begin"), &transfer_to);
     let memtransfer_kernel =
         add_priv_unnamed_arr(&cx, &format!(".offload_maptypes.{symbol}.kernel"), &transfer_kernel);
+    dbg!(&transfer_from);
     let memtransfer_end =
         add_priv_unnamed_arr(&cx, &format!(".offload_maptypes.{symbol}.end"), &transfer_from);
 

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -19,7 +19,7 @@ use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_hir::find_attr;
 use rustc_middle::mir::BinOp;
 use rustc_middle::ty::layout::{FnAbiOf, HasTyCtxt, HasTypingEnv, LayoutOf};
-use rustc_middle::ty::offload_meta::OffloadMetadata;
+use rustc_middle::ty::offload_meta::{MappingFlags, OffloadMetadata};
 use rustc_middle::ty::{self, GenericArgsRef, Instance, SimdAlign, Ty, TyCtxt, TypingEnv};
 use rustc_middle::{bug, span_bug};
 use rustc_session::config::CrateType;
@@ -1943,7 +1943,9 @@ fn codegen_offload_preload_mut_drop<'ll, 'tcx>(
 
     // Load field 0: `cpu_ptr: *mut T`.
     let cpu_ptr_place = place.project_field(bx, 0);
+    dbg!(&cpu_ptr_place);
     let cpu_ptr_operand = bx.load_operand(cpu_ptr_place);
+    dbg!(&cpu_ptr_operand);
 
     let args: Vec<&'ll Value> = match cpu_ptr_operand.val {
         OperandValue::Immediate(ptr) => vec![ptr],
@@ -1953,7 +1955,9 @@ fn codegen_offload_preload_mut_drop<'ll, 'tcx>(
         _ => bug!("unexpected PreloadMut cpu_ptr operand"),
     };
 
-    let meta = OffloadMetadata::from_ty(tcx, pointee_ty);
+    let mut meta = OffloadMetadata::from_ty(tcx, pointee_ty);
+    meta.mode |= MappingFlags::FROM;
+    dbg!(&meta);
     let metadata: &[OffloadMetadata; 1] = &[meta];
 
     let types: &Type = cx.layout_of(pointee_ty).llvm_type(cx);
@@ -1969,6 +1973,27 @@ fn codegen_offload_preload_mut_drop<'ll, 'tcx>(
 
     let target_symbol = cx.generate_local_symbol_name("");
     dbg!("done for now");
+    let offload_data = gen_define_handling(&cx, metadata, target_symbol, offload_globals);
+    let has_dynamic = metadata.iter().any(|m| !matches!(m.payload_size, OffloadSize::Static(_)));
+    let (ty, ty2, a1, a2, a4) = crate::builder::gpu_helper::preper_datatransfers(
+        bx,
+        &args,
+        &[types],
+        offload_data.offload_sizes,
+        metadata,
+        has_dynamic,
+    );
+    let geps = crate::builder::gpu_helper::get_geps(bx, ty, ty2, a1, a2, a4, has_dynamic);
+
+    crate::builder::gpu_helper::generate_mapper_call(
+        bx,
+        geps,
+        offload_data.memtransfer_end,
+        offload_globals.end_mapper,
+        offload_globals.mapper_fn_ty,
+        1,
+        offload_globals.ident_t_global,
+    );
 }
 
 // For each PreLoad *call*, we now use some of our previous declared globals to move data to the gpu.