single commit with new opt2 impl

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs

@@ -1,24 +1,34 @@
 #![allow(non_camel_case_types)]
 
 use libc::{c_char, c_uint, size_t};
-use rustc_ast::expand::autodiff_attrs::DiffActivity;
-use tracing::trace;
-
 use super::ffi::*;
 
 extern "C" {
     // Enzyme
     pub fn LLVMRustAddFncParamAttr<'a>(F: &'a Value, index: c_uint, Attr: &'a Attribute);
-
     pub fn LLVMRustAddRetFncAttr(F: &Value, attr: &Attribute);
     pub fn LLVMRustHasMetadata(I: &Value, KindID: c_uint) -> bool;
     pub fn LLVMRustEraseInstBefore(BB: &BasicBlock, I: &Value);
     pub fn LLVMRustGetLastInstruction<'a>(BB: &BasicBlock) -> Option<&'a Value>;
     pub fn LLVMRustDIGetInstMetadata(I: &Value) -> &Metadata;
     pub fn LLVMRustEraseInstFromParent(V: &Value);
     pub fn LLVMRustGetTerminator<'a>(B: &BasicBlock) -> &'a Value;
+    pub fn LLVMRustAddEnumAttributeAtIndex(
+        C: &Context,
+        V: &Value,
+        index: c_uint,
+        attr: AttributeKind,
+    );
+    pub fn LLVMRustRemoveEnumAttributeAtIndex(V: &Value, index: c_uint, attr: AttributeKind);
+    pub fn LLVMRustGetEnumAttributeAtIndex(
+        V: &Value,
+        index: c_uint,
+        attr: AttributeKind,
+    ) -> &Attribute;
+    pub fn LLVMRustAddParamAttr<'a>(Instr: &'a Value, index: c_uint, Attr: &'a Attribute);
+
+
     pub fn LLVMGetReturnType(T: &Type) -> &Type;
-    pub fn LLVMRustIsStructType(T: &Type) -> bool;
     pub fn LLVMDumpModule(M: &Module);
     pub fn LLVMCountStructElementTypes(T: &Type) -> c_uint;
     pub fn LLVMVerifyFunction(V: &Value, action: LLVMVerifierFailureAction) -> bool;
@@ -34,7 +44,6 @@ extern "C" {
     pub fn LLVMGetFirstFunction(M: &Module) -> Option<&Value>;
     pub fn LLVMGetNextFunction(V: &Value) -> Option<&Value>;
     pub fn LLVMGetNamedFunction(M: &Module, Name: *const c_char) -> Option<&Value>;
-    //pub fn LLVMGlobalGetValueType(val: &Value) -> &Type;
     pub fn LLVMRustGetFunctionType(fnc: &Value) -> &Type;
 
     pub fn LLVMRemoveStringAttributeAtIndex(F: &Value, Idx: c_uint, K: *const c_char, KLen: c_uint);
@@ -46,20 +55,6 @@ extern "C" {
     ) -> &Attribute;
     pub fn LLVMIsEnumAttribute(A: &Attribute) -> bool;
     pub fn LLVMIsStringAttribute(A: &Attribute) -> bool;
-    pub fn LLVMRustAddEnumAttributeAtIndex(
-        C: &Context,
-        V: &Value,
-        index: c_uint,
-        attr: AttributeKind,
-    );
-    pub fn LLVMRustRemoveEnumAttributeAtIndex(V: &Value, index: c_uint, attr: AttributeKind);
-    pub fn LLVMRustGetEnumAttributeAtIndex(
-        V: &Value,
-        index: c_uint,
-        attr: AttributeKind,
-    ) -> &Attribute;
-
-    pub fn LLVMRustAddParamAttr<'a>(Instr: &'a Value, index: c_uint, Attr: &'a Attribute);
 
 }
 

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -336,10 +336,6 @@ extern "C" void LLVMRustAddFunctionAttributes(LLVMValueRef Fn, unsigned Index,
   AddAttributes(F, Index, Attrs, AttrsLen);
 }
 
-extern "C" bool LLVMRustIsStructType(LLVMTypeRef Ty) {
-  return unwrap(Ty)->isStructTy();
-}
-
 extern "C" void LLVMRustAddCallSiteAttributes(LLVMValueRef Instr,
                                               unsigned Index,
                                               LLVMAttributeRef *Attrs,
@@ -963,13 +959,6 @@ extern "C" LLVMMetadataRef LLVMRustDIGetInstMetadata(LLVMValueRef x) {
   return nullptr;
 }
 
-extern "C" void LLVMRustAddParamAttr(LLVMValueRef call, unsigned i,
-                                     LLVMAttributeRef RustAttr) {
-  if (auto *CI = dyn_cast<CallInst>(unwrap<Value>(call))) {
-    CI->addParamAttr(i, unwrap(RustAttr));
-  }
-}
-
 extern "C" void LLVMRustGlobalAddMetadata(LLVMValueRef Global, unsigned Kind,
                                           LLVMMetadataRef MD) {
   unwrap<GlobalObject>(Global)->addMetadata(Kind, *unwrap<MDNode>(MD));

compiler/rustc_middle/src/ty/mod.rs

@@ -48,7 +48,7 @@ pub use rustc_session::lint::RegisteredTools;
 use rustc_span::hygiene::MacroKind;
 use rustc_span::symbol::{Ident, Symbol, kw, sym};
 use rustc_span::{ExpnId, ExpnKind, Span};
-use rustc_target::abi::{Align, FieldIdx, FieldsShape, Integer, IntegerType, VariantIdx};
+use rustc_target::abi::{Align, FieldIdx, Integer, IntegerType, VariantIdx};
 pub use rustc_target::abi::{ReprFlags, ReprOptions};
 pub use rustc_type_ir::ConstKind::{
     Bound as BoundCt, Error as ErrorCt, Expr as ExprCt, Infer as InferCt, Param as ParamCt,