asdf

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/callee.rs

@@ -31,6 +31,11 @@ pub(crate) fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'t
     debug!("get_fn({:?}: {:?}) => {}", instance, instance.ty(cx.tcx(), cx.typing_env()), sym);
 
     let fn_abi = cx.fn_abi_of_instance(instance, ty::List::empty());
+    if fn_abi.conv == rustc_abi::CanonAbi::GpuKernel {
+        dbg!("found gpu fn2!");
+    } else {
+        dbg!("asdf2!");
+    }
 
     let llfn = if let Some(llfn) = cx.get_declared_value(sym) {
         llfn
@@ -69,6 +74,11 @@ pub(crate) fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'t
             llvm::set_dllimport_storage_class(llfn);
             llfn
         } else {
+            //if Some(fn_abi) = fn_abi {
+                if fn_abi.conv == rustc_abi::CanonAbi::GpuKernel {
+                    dbg!("found gpu fn!");
+                }
+            //}
             cx.declare_fn(sym, fn_abi, Some(instance))
         };
         debug!("get_fn: not casting pointer!");

compiler/rustc_codegen_llvm/src/mono_item.rs

@@ -5,16 +5,28 @@ use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_middle::bug;
 use rustc_middle::mir::mono::Visibility;
 use rustc_middle::ty::layout::{FnAbiOf, HasTypingEnv, LayoutOf};
-use rustc_middle::ty::{self, Instance, TypeVisitableExt};
+use rustc_middle::ty::{self, Ty, TyCtxt,Instance, TypeVisitableExt};
 use rustc_session::config::CrateType;
 use rustc_target::spec::RelocModel;
 use tracing::debug;
 
+use rustc_target::callconv::FnAbi;
+
 use crate::context::CodegenCx;
 use crate::errors::SymbolAlreadyDefined;
 use crate::type_of::LayoutLlvmExt;
 use crate::{base, llvm};
 
+fn my_fn_abi<'tcx>(abi: &FnAbi<'tcx, Ty<'tcx>> ) -> FnAbi<'tcx, Ty<'tcx>> {
+    let mut myABI = abi.clone();
+    dbg!(&myABI.args);
+    let val = myABI.clone().args[0].clone();
+    myABI.args = Box::new([val.clone(), val.clone()]);
+    dbg!(&myABI.args);
+    myABI
+}
+
+
 impl<'tcx> PreDefineCodegenMethods<'tcx> for CodegenCx<'_, 'tcx> {
     fn predefine_static(
         &mut self,
@@ -54,7 +66,14 @@ impl<'tcx> PreDefineCodegenMethods<'tcx> for CodegenCx<'_, 'tcx> {
         assert!(!instance.args.has_infer());
 
         let fn_abi = self.fn_abi_of_instance(instance, ty::List::empty());
-        let lldecl = self.declare_fn(symbol_name, fn_abi, Some(instance));
+        let fn_abi = if fn_abi.conv == rustc_abi::CanonAbi::GpuKernel {
+            dbg!("found gpu fn!");
+            my_fn_abi(fn_abi)
+        } else {
+            dbg!("asdf!");
+            fn_abi.clone()
+        };
+        let lldecl = self.declare_fn(symbol_name, &fn_abi, Some(instance));
         llvm::set_linkage(lldecl, base::linkage_to_llvm(linkage));
         let attrs = self.tcx.codegen_instance_attrs(instance.def);
         base::set_link_section(lldecl, &attrs);

compiler/rustc_target/src/callconv/mod.rs

@@ -577,6 +577,7 @@ impl RiscvInterruptKind {
 ///
 /// The signature represented by this type may not match the MIR function signature.
 /// Certain attributes, like `#[track_caller]` can introduce additional arguments, which are present in [`FnAbi`], but not in `FnSig`.
+/// The std::offload module also adds an addition dyn_ptr argument to the GpuKernel ABI. 
 /// While this difference is rarely relevant, it should still be kept in mind.
 ///
 /// I will do my best to describe this structure, but these