wip, all missing changes

Author: ZuseZ4

Cargo.lock

@@ -4148,6 +4148,7 @@ dependencies = [
 name = "rustc_monomorphize"
 version = "0.0.0"
 dependencies = [
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_fluent_macro",
@@ -4156,6 +4157,7 @@ dependencies = [
  "rustc_middle",
  "rustc_session",
  "rustc_span",
+ "rustc_symbol_mangling",
  "rustc_target",
  "serde",
  "serde_json",

compiler/rustc_ast/src/ast.rs

@@ -2729,6 +2729,13 @@ impl FnRetTy {
             FnRetTy::Ty(ty) => ty.span,
         }
     }
+
+    pub fn has_ret(&self) -> bool {
+        match self {
+            FnRetTy::Default(_) => false,
+            FnRetTy::Ty(_) => true,
+        }
+    }
 }
 
 #[derive(Clone, Copy, PartialEq, Encodable, Decodable, Debug)]

compiler/rustc_ast/src/expand/autodiff_attrs.rs

@@ -8,7 +8,6 @@ use crate::expand::HashStable_Generic;
 use crate::expand::Encodable;
 use crate::expand::Decodable;
 
-#[allow(dead_code)]
 #[derive(Clone, Copy, Eq, PartialEq, Encodable, Decodable, Debug, HashStable_Generic)]
 pub enum DiffMode {
     Inactive,

compiler/rustc_builtin_macros/src/errors.rs

@@ -145,51 +145,51 @@ pub(crate) struct AllocMustStatics {
     pub(crate) span: Span,
 }
 
-//#[derive(Diagnostic)]
-//#[diag(builtin_macros_autodiff_unknown_activity)]
-//pub(crate) struct AutoDiffUnknownActivity {
-//    #[primary_span]
-//    pub(crate) span: Span,
-//    pub(crate) act: String,
-//}
-//#[derive(Diagnostic)]
-//#[diag(builtin_macros_autodiff_ty_activity)]
-//pub(crate) struct AutoDiffInvalidTypeForActivity {
-//    #[primary_span]
-//    pub(crate) span: Span,
-//    pub(crate) act: String,
-//}
-//#[derive(Diagnostic)]
-//#[diag(builtin_macros_autodiff_number_activities)]
-//pub(crate) struct AutoDiffInvalidNumberActivities {
-//    #[primary_span]
-//    pub(crate) span: Span,
-//    pub(crate) expected: usize,
-//    pub(crate) found: usize,
-//}
-//#[derive(Diagnostic)]
-//#[diag(builtin_macros_autodiff_mode_activity)]
-//pub(crate) struct AutoDiffInvalidApplicationModeAct {
-//    #[primary_span]
-//    pub(crate) span: Span,
-//    pub(crate) mode: String,
-//    pub(crate) act: String,
-//}
-//
-//#[derive(Diagnostic)]
-//#[diag(builtin_macros_autodiff_mode)]
-//pub(crate) struct AutoDiffInvalidMode {
-//    #[primary_span]
-//    pub(crate) span: Span,
-//    pub(crate) mode: String,
-//}
-//
-//#[derive(Diagnostic)]
-//#[diag(builtin_macros_autodiff)]
-//pub(crate) struct AutoDiffInvalidApplication {
-//    #[primary_span]
-//    pub(crate) span: Span,
-//}
+#[derive(Diagnostic)]
+#[diag(builtin_macros_autodiff_unknown_activity)]
+pub(crate) struct AutoDiffUnknownActivity {
+    #[primary_span]
+    pub(crate) span: Span,
+    pub(crate) act: String,
+}
+#[derive(Diagnostic)]
+#[diag(builtin_macros_autodiff_ty_activity)]
+pub(crate) struct AutoDiffInvalidTypeForActivity {
+    #[primary_span]
+    pub(crate) span: Span,
+    pub(crate) act: String,
+}
+#[derive(Diagnostic)]
+#[diag(builtin_macros_autodiff_number_activities)]
+pub(crate) struct AutoDiffInvalidNumberActivities {
+    #[primary_span]
+    pub(crate) span: Span,
+    pub(crate) expected: usize,
+    pub(crate) found: usize,
+}
+#[derive(Diagnostic)]
+#[diag(builtin_macros_autodiff_mode_activity)]
+pub(crate) struct AutoDiffInvalidApplicationModeAct {
+    #[primary_span]
+    pub(crate) span: Span,
+    pub(crate) mode: String,
+    pub(crate) act: String,
+}
+
+#[derive(Diagnostic)]
+#[diag(builtin_macros_autodiff_mode)]
+pub(crate) struct AutoDiffInvalidMode {
+    #[primary_span]
+    pub(crate) span: Span,
+    pub(crate) mode: String,
+}
+
+#[derive(Diagnostic)]
+#[diag(builtin_macros_autodiff)]
+pub(crate) struct AutoDiffInvalidApplication {
+    #[primary_span]
+    pub(crate) span: Span,
+}
 
 #[derive(Diagnostic)]
 #[diag(builtin_macros_autodiff_not_build)]

compiler/rustc_codegen_llvm/messages.ftl

@@ -57,6 +57,10 @@ codegen_llvm_prepare_thin_lto_module_with_llvm_err = failed to prepare thin LTO
 codegen_llvm_run_passes = failed to run LLVM passes
 codegen_llvm_run_passes_with_llvm_err = failed to run LLVM passes: {$llvm_err}
 
+codegen_llvm_prepare_autodiff = failed to prepare AutoDiff: src: {$src}, target: {$target}, {$error}
+codegen_llvm_prepare_autodiff_with_llvm_err = failed to prepare AutoDiff: {$llvm_err}, src: {$src}, target: {$target}, {$error}
+codegen_llvm_autodiff_without_lto = using the autodiff feature requires using fat-lto
+
 codegen_llvm_sanitizer_memtag_requires_mte =
     `-Zsanitizer=memtag` requires `-Ctarget-feature=+mte`
 

compiler/rustc_codegen_llvm/src/abi.rs

@@ -242,6 +242,7 @@ impl<'ll, 'tcx> ArgAbiExt<'ll, 'tcx> for ArgAbi<'tcx, Ty<'tcx>> {
                     scratch_align,
                     bx.const_usize(copy_bytes),
                     MemFlags::empty(),
+                    None,
                 );
                 bx.lifetime_end(llscratch, scratch_size);
             }

compiler/rustc_codegen_llvm/src/attributes.rs

@@ -1,5 +1,6 @@
 //! Set and unset common attributes on LLVM values.
 
+use rustc_ast::expand::autodiff_attrs::AutoDiffAttrs;
 pub use rustc_attr::{InlineAttr, InstructionSetAttr, OptimizeAttr};
 use rustc_codegen_ssa::traits::*;
 use rustc_hir::def_id::DefId;
@@ -333,6 +334,7 @@ pub fn llfn_attrs_from_instance<'ll, 'tcx>(
     instance: ty::Instance<'tcx>,
 ) {
     let codegen_fn_attrs = cx.tcx.codegen_fn_attrs(instance.def_id());
+    let autodiff_attrs: &AutoDiffAttrs = cx.tcx.autodiff_attrs(instance.def_id());
 
     let mut to_add = SmallVec::<[_; 16]>::new();
 
@@ -350,6 +352,8 @@ pub fn llfn_attrs_from_instance<'ll, 'tcx>(
     let inline =
         if codegen_fn_attrs.inline == InlineAttr::None && instance.def.requires_inline(cx.tcx) {
             InlineAttr::Hint
+        } else if autodiff_attrs.is_active() {
+            InlineAttr::Never
         } else {
             codegen_fn_attrs.inline
         };

compiler/rustc_codegen_llvm/src/back/lto.rs

@@ -622,7 +622,12 @@ pub(crate) fn run_pass_manager(
         }
         let opt_stage = if thin { llvm::OptStage::ThinLTO } else { llvm::OptStage::FatLTO };
         let opt_level = config.opt_level.unwrap_or(config::OptLevel::No);
-        write::llvm_optimize(cgcx, dcx, module, config, opt_level, opt_stage)?;
+
+        // We will run this again with different values in the context of automatic differentiation.
+        let first_run = true;
+        let noop = false;
+        debug!("running llvm pm opt pipeline");
+        write::llvm_optimize(cgcx, dcx, module, config, opt_level, opt_stage, first_run, noop)?;
     }
     debug!("lto done");
     Ok(())
@@ -729,7 +734,12 @@ pub unsafe fn optimize_thin_module(
     let llcx = unsafe { llvm::LLVMRustContextCreate(cgcx.fewer_names) };
     let llmod_raw = parse_module(llcx, module_name, thin_module.data(), dcx)? as *const _;
     let mut module = ModuleCodegen {
-        module_llvm: ModuleLlvm { llmod_raw, llcx, tm: ManuallyDrop::new(tm) },
+        module_llvm: ModuleLlvm {
+            llmod_raw,
+            llcx,
+            tm: ManuallyDrop::new(tm),
+            typetrees: Default::default(),
+        },
         name: thin_module.name().to_string(),
         kind: ModuleKind::Regular,
     };