reduce warnings, re-add partial enzyme flags support

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/back/write.rs

@@ -6,7 +6,7 @@ use std::{fs, slice, str};
 
 use libc::{c_char, c_int, c_uint, c_void, size_t};
 use llvm::{
-    IntPredicate, LLVMRustLLVMHasZlibCompressionForDebugSymbols,
+    LLVMRustLLVMHasZlibCompressionForDebugSymbols,
     LLVMRustLLVMHasZstdCompressionForDebugSymbols,
 };
 use rustc_ast::expand::autodiff_attrs::AutoDiffItem;
@@ -44,19 +44,14 @@ use crate::errors::{
 use crate::llvm::diagnostic::OptimizationDiagnosticKind::*;
 use crate::llvm::{
     self, AttributeKind, DiagnosticInfo,
-    LLVMAppendBasicBlockInContext, LLVMBuildCall2,
-    LLVMBuildCondBr, LLVMBuildExtractValue, LLVMBuildICmp, LLVMBuildRet, LLVMBuildRetVoid,
-    LLVMCountParams, LLVMCountStructElementTypes, LLVMCreateBuilderInContext,
-    LLVMCreateStringAttribute, LLVMDisposeBuilder, LLVMDumpModule, LLVMGetFirstBasicBlock,
-    LLVMGetFirstFunction, LLVMGetNextFunction, LLVMGetParams, LLVMGetReturnType,
-    LLVMGetStringAttributeAtIndex, LLVMGlobalGetValueType, LLVMIsEnumAttribute,
-    LLVMIsStringAttribute, LLVMMetadataAsValue, LLVMPositionBuilderAtEnd,
+    LLVMCreateStringAttribute, LLVMDumpModule,
+    LLVMGetFirstFunction, LLVMGetNextFunction,
+    LLVMGetStringAttributeAtIndex, LLVMIsEnumAttribute,
+    LLVMIsStringAttribute,
     LLVMRemoveStringAttributeAtIndex, LLVMRustAddEnumAttributeAtIndex,
-    LLVMRustAddFunctionAttributes, LLVMRustDIGetInstMetadata, LLVMRustEraseInstBefore,
-    LLVMRustEraseInstFromParent, LLVMRustGetEnumAttributeAtIndex, LLVMRustGetFunctionType,
-    LLVMRustGetLastInstruction, LLVMRustGetTerminator, LLVMRustHasMetadata,
-    LLVMRustRemoveEnumAttributeAtIndex, LLVMVerifyFunction, LLVMVoidTypeInContext, PassManager,
-    Value,
+    LLVMRustAddFunctionAttributes,
+    LLVMRustGetEnumAttributeAtIndex,
+    LLVMRustRemoveEnumAttributeAtIndex, PassManager,
 };
 use crate::type_::Type;
 use crate::{LlvmCodegenBackend, ModuleLlvm, base, common, llvm_util};
@@ -652,6 +647,14 @@ pub(crate) unsafe fn llvm_optimize(
     result.into_result().map_err(|()| llvm_err(dcx, LlvmError::RunLlvmPasses))
 }
 
+#[allow(non_snake_case)]
+unsafe fn EnzymeSetCLBool(ptr: *mut c_int, val: u8) {
+    unsafe {
+        //let ptr = ptr as *mut c_int;
+        *ptr = val as c_int;
+    }
+}
+
 pub(crate) fn differentiate(
     module: &ModuleCodegen<ModuleLlvm>,
     cgcx: &CodegenContext<LlvmCodegenBackend>,
@@ -672,8 +675,13 @@ pub(crate) fn differentiate(
 
     if ad.contains(&AutoDiff::LooseTypes) {
         dbg!("Setting loose types to true");
-        //llvm::set_loose_types(true);
-        todo!();
+        //extern "C" {
+            #[allow(non_upper_case_globals)]
+            static mut looseTypeAnalysis: c_int = 0;
+        //}
+        unsafe {
+            EnzymeSetCLBool(std::ptr::addr_of_mut!(looseTypeAnalysis), true as u8);
+        }
     }
 
     // Before dumping the module, we want all the tt to become part of the module.
@@ -702,20 +710,13 @@ pub(crate) fn differentiate(
             })),
         };
 
-        // Before dumping the module, we also might want to add dummy functions,  which will
-        // trigger the LLVMEnzyme pass to run on them, if we invoke the opt binary.
-        // This is super helpfull if we want to create a MWE bug reproducer, e.g. to run in
-        // Enzyme's compiler explorer.
-        if ad.contains(&AutoDiff::OPT2) {
-            dbg!("Enable extra debug helper to debug Enzyme through the opt plugin");
-            crate::builder::add_opt_dbg_helper2(
-                llmod,
-                llcx,
-                fn_def,
-                fn_target,
-                item.attrs.clone(),
-            );
-        }
+        crate::builder::add_opt_dbg_helper2(
+            llmod,
+            llcx,
+            fn_def,
+            fn_target,
+            item.attrs.clone(),
+        );
     }
 
     if ad.contains(&AutoDiff::PrintModBefore) || ad.contains(&AutoDiff::OPT) {
@@ -725,36 +726,17 @@ pub(crate) fn differentiate(
     }
 
     if ad.contains(&AutoDiff::Inline) {
-        dbg!("Setting inline to true");
-        //llvm::set_inline(true);
-        todo!();
-    }
-
-    if ad.contains(&AutoDiff::RuntimeActivity) {
-        dbg!("Setting runtime activity check to true");
-        //llvm::set_runtime_activity_check(true);
-        todo!();
-    }
-
-    for val in ad {
-        match &val {
-            AutoDiff::TTDepth(depth) => {
-                assert!(*depth >= 1);
-                //llvm::set_max_int_offset(*depth);
-                todo!();
-            }
-            AutoDiff::TTWidth(width) => {
-                assert!(*width >= 1);
-                todo!();
-                //llvm::set_max_type_offset(*width);
-            }
-            _ => {}
+        trace!("Setting Enzyme inline to true");
+        //extern "C" {
+        //    static mut EnzymeInline: c_void;
+        //}
+            #[allow(non_upper_case_globals)]
+            static mut EnzymeInline: c_int = 0;
+        unsafe {
+            EnzymeSetCLBool(std::ptr::addr_of_mut!(EnzymeInline), true as u8);
         }
     }
 
-    let differentiate = !diff_items.is_empty();
-    let _fnc_opt = ad.contains(&AutoDiff::EnableFncOpt);
-
     unsafe {
         let mut f = LLVMGetFirstFunction(llmod);
         loop {
@@ -787,9 +769,6 @@ pub(crate) fn differentiate(
         }
     }
 
-    //if ad.contains(&AutoDiff::NoModOptAfter) || !differentiate {
-    //    trace!("Skipping module optimization after automatic differentiation");
-    //} else {
     if let Some(opt_level) = config.opt_level {
         let opt_stage = match cgcx.lto {
             Lto::Fat => llvm::OptStage::PreLinkFatLTO,

compiler/rustc_codegen_llvm/src/lib.rs

@@ -37,7 +37,7 @@ use rustc_codegen_ssa::back::write::{
 };
 use rustc_codegen_ssa::traits::*;
 use rustc_codegen_ssa::{CodegenResults, CompiledModule, ModuleCodegen};
-use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
+use rustc_data_structures::fx::FxIndexMap;
 use rustc_errors::{DiagCtxtHandle, ErrorGuaranteed, FatalError};
 use rustc_metadata::EncodedMetadata;
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};

compiler/rustc_codegen_ssa/src/back/lto.rs

@@ -2,7 +2,6 @@ use std::ffi::CString;
 use std::sync::Arc;
 
 use rustc_ast::expand::autodiff_attrs::AutoDiffItem;
-use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::memmap::Mmap;
 use rustc_errors::FatalError;
 

compiler/rustc_codegen_ssa/src/back/write.rs

@@ -1613,7 +1613,7 @@ fn start_executing_work<B: ExtraBackendMethods>(
                     }
                 }
 
-                Message::CodegenDone { mut llvm_work_item, cost } => {
+                Message::CodegenDone { llvm_work_item, cost } => {
                     // We keep the queue sorted by estimated processing cost,
                     // so that more expensive items are processed earlier. This
                     // is good for throughput as it gives the main thread more

compiler/rustc_codegen_ssa/src/traits/builder.rs

@@ -1,7 +1,6 @@
 use std::assert_matches::assert_matches;
 use std::ops::Deref;
 
-use rustc_ast::expand::typetree::FncTree;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrs;
 use rustc_middle::ty::layout::{FnAbiOf, LayoutOf, TyAndLayout};
 use rustc_middle::ty::{Instance, Ty};

compiler/rustc_codegen_ssa/src/traits/write.rs

@@ -1,5 +1,4 @@
 use rustc_ast::expand::autodiff_attrs::AutoDiffItem;
-use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::{DiagCtxtHandle, FatalError};
 use rustc_middle::dep_graph::WorkProduct;