remove noline and add always inline

Author: Shourya742

compiler/rustc_codegen_llvm/src/attributes.rs

@@ -28,12 +28,12 @@ pub(crate) fn apply_to_callsite(callsite: &Value, idx: AttributePlace, attrs: &[
     }
 }
 
-pub(crate) fn has_attr(llfn: &Value, idx: u32, attr: AttributeKind) -> bool {
+pub(crate) fn has_attr(llfn: &Value, idx: AttributePlace, attr: AttributeKind) -> bool {
     llvm::HasAttributeAtIndex(llfn, idx, attr)
 }
 
 pub(crate) fn remove_from_llfn(llfn: &Value, place: AttributePlace, kind: AttributeKind) {
-    llvm::RemoveEnumAttributeAtIndex(llfn, place, kind);
+    llvm::RemoveRustEnumAttributeAtIndex(llfn, place, kind);
 }
 
 /// Get LLVM attribute for the provided inline heuristic.

compiler/rustc_codegen_llvm/src/back/lto.rs

@@ -677,11 +677,11 @@ pub(crate) fn run_pass_manager(
                 // This is not strictly necessary for correctness, but serves as a sanity check
                 // in case the autodiff pass stops injecting `noinline` in the future.
                 assert!(
-                    !attributes::has_attr(function, 0, llvm::AttributeKind::NoInline),
+                    !attributes::has_attr(function, Function, llvm::AttributeKind::NoInline),
                     "Expected __enzyme function to have 'noinline' before adding 'alwaysinline'"
                 );
 
-                // Removing no-inline from function.
+                // Removing inline from function.
                 attributes::remove_from_llfn(function, Function, llvm::AttributeKind::NoInline);
 
                 let attr = llvm::AttributeKind::AlwaysInline.create_attr(cx.llcx);

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -1160,7 +1160,7 @@ unsafe extern "C" {
 
     pub(crate) fn LLVMGetFirstFunction(M: &Module) -> Option<&Value>;
     pub(crate) fn LLVMGetNextFunction(Fn: &Value) -> Option<&Value>;
-    pub(crate) fn LLVMRemoveEnumAttributeAtIndex(Fn: &Value, index: c_uint, kind: AttributeKind);
+    pub(crate) fn LLVMRustRemoveEnumAttributeAtIndex(Fn: &Value, index: c_uint, kind: AttributeKind);
 
     pub(crate) fn LLVMDeleteGlobal(GlobalVar: &Value);
     pub(crate) fn LLVMGetInitializer(GlobalVar: &Value) -> Option<&Value>;

compiler/rustc_codegen_llvm/src/llvm/mod.rs

@@ -41,13 +41,13 @@ pub(crate) fn AddFunctionAttributes<'ll>(
     }
 }
 
-pub(crate) fn HasAttributeAtIndex<'ll>(llfn: &'ll Value, idx: u32, kind: AttributeKind) -> bool {
-    unsafe { LLVMRustHasAttributeAtIndex(llfn, idx, kind) }
+pub(crate) fn HasAttributeAtIndex<'ll>(llfn: &'ll Value, idx: AttributePlace, kind: AttributeKind) -> bool {
+    unsafe { LLVMRustHasAttributeAtIndex(llfn, idx.as_uint(), kind) }
 }
 
-pub(crate) fn RemoveEnumAttributeAtIndex(llfn: &Value, place: AttributePlace, kind: AttributeKind) {
+pub(crate) fn RemoveRustEnumAttributeAtIndex(llfn: &Value, place: AttributePlace, kind: AttributeKind) {
     unsafe {
-        LLVMRemoveEnumAttributeAtIndex(llfn, place.as_uint(), kind);
+        LLVMRustRemoveEnumAttributeAtIndex(llfn, place.as_uint(), kind);
     }
 }
 

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -973,6 +973,12 @@ extern "C" LLVMMetadataRef LLVMRustDIGetInstMetadata(LLVMValueRef x) {
   return nullptr;
 }
 
+
+extern "C" void LLVMRustRemoveEnumAttributeAtIndex(LLVMValueRef F, size_t index,
+                                                   LLVMRustAttributeKind RustAttr) {
+  LLVMRemoveEnumAttributeAtIndex(F, index, fromRust(RustAttr));
+}
+
 extern "C" void LLVMRustGlobalAddMetadata(LLVMValueRef Global, unsigned Kind,
                                           LLVMMetadataRef MD) {
   unwrap<GlobalObject>(Global)->addMetadata(Kind, *unwrap<MDNode>(MD));

tests/codegen/autodiff/inline.rs

@@ -1,4 +1,4 @@
-//@ compile-flags: -Zautodiff=Enable -Zautodiff=NoPostopt -C opt-level=3  -Clto=fat
+//@ compile-flags: -Zautodiff=Enable -C opt-level=3  -Clto=fat -Zautodiff=NoPostopt
 //@ no-prefer-dynamic
 //@ needs-enzyme
 
@@ -10,11 +10,15 @@ use std::autodiff::autodiff;
 fn square(x: &f64) -> f64 {
     x * x
 }
-// CHECK: ; Function Attrs: alwaysinline noinline
-// CHECK-NEXT: declare double @__enzyme_autodiff_ZN6inline8d_square17h021c74e92c259cdeE(...) local_unnamed_addr #8
+
+
+// CHECK: ; inline::d_square
+// CHECK-NEXT: ; Function Attrs: alwaysinline
+// CHECK-NOT: noinline
+// CHECK-NEXT: define internal fastcc void @_ZN6inline8d_square17h021c74e92c259cdeE
 fn main() {
     let x = std::hint::black_box(3.0);
     let mut dx1 = std::hint::black_box(1.0);
     let _ = d_square(&x, &mut dx1, 1.0);
     assert_eq!(dx1, 6.0);
-}
+}