Skip to content

Commit bbb9f6c

Browse files
committed
remove noinline attribute and add alwaysinline after AD pass
1 parent 9bc0401 commit bbb9f6c

File tree

6 files changed

+97
-4
lines changed

6 files changed

+97
-4
lines changed

compiler/rustc_codegen_llvm/src/attributes.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
//! Set and unset common attributes on LLVM values.
22
3+
use std::ffi::c_char;
4+
35
use rustc_attr_parsing::{InlineAttr, InstructionSetAttr, OptimizeAttr};
46
use rustc_codegen_ssa::traits::*;
57
use rustc_hir::def_id::DefId;
@@ -32,15 +34,15 @@ pub(crate) fn has_attr(llfn: &Value, idx: AttributePlace, attr: AttributeKind) -
3234
llvm::HasAttributeAtIndex(llfn, idx, attr)
3335
}
3436

35-
pub(crate) fn has_string_attr(llfn: &Value, name: *const i8) -> bool {
37+
pub(crate) fn has_string_attr(llfn: &Value, name: *const c_char) -> bool {
3638
llvm::HasStringAttribute(llfn, name)
3739
}
3840

3941
pub(crate) fn remove_from_llfn(llfn: &Value, place: AttributePlace, kind: AttributeKind) {
4042
llvm::RemoveRustEnumAttributeAtIndex(llfn, place, kind);
4143
}
4244

43-
pub(crate) fn remove_string_attr_from_llfn(llfn: &Value, name: *const i8) {
45+
pub(crate) fn remove_string_attr_from_llfn(llfn: &Value, name: *const c_char) {
4446
llvm::RemoveStringAttrFromFn(llfn, name);
4547
}
4648

compiler/rustc_codegen_llvm/src/back/lto.rs

+29-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ use crate::back::write::{
2828
use crate::errors::{
2929
DynamicLinkingWithLTO, LlvmError, LtoBitcodeFromRlib, LtoDisallowed, LtoDylib, LtoProcMacro,
3030
};
31+
use crate::llvm::AttributePlace::Function;
3132
use crate::llvm::{self, build_string};
32-
use crate::{LlvmCodegenBackend, ModuleLlvm};
33+
use crate::{LlvmCodegenBackend, ModuleLlvm, SimpleCx, attributes};
3334

3435
/// We keep track of the computed LTO cache keys from the previous
3536
/// session to determine which CGUs we can reuse.
@@ -666,6 +667,33 @@ pub(crate) fn run_pass_manager(
666667
}
667668

668669
if cfg!(llvm_enzyme) && enable_ad && !thin {
670+
let cx =
671+
SimpleCx::new(module.module_llvm.llmod(), &module.module_llvm.llcx, cgcx.pointer_size);
672+
673+
for function in cx.get_functions() {
674+
let enzyme_marker = CString::new("enzyme_marker").unwrap();
675+
let marker_ptr = enzyme_marker.as_ptr();
676+
677+
if attributes::has_string_attr(function, marker_ptr) {
678+
// Sanity check: Ensure 'noinline' is present before replacing it.
679+
assert!(
680+
!attributes::has_attr(function, Function, llvm::AttributeKind::NoInline),
681+
"Expected __enzyme function to have 'noinline' before adding 'alwaysinline'"
682+
);
683+
684+
attributes::remove_from_llfn(function, Function, llvm::AttributeKind::NoInline);
685+
attributes::remove_string_attr_from_llfn(function, marker_ptr);
686+
687+
assert!(
688+
!attributes::has_string_attr(function, marker_ptr),
689+
"Expected function to not have 'enzyme_marker'"
690+
);
691+
692+
let always_inline = llvm::AttributeKind::AlwaysInline.create_attr(cx.llcx);
693+
attributes::apply_to_llfn(function, Function, &[always_inline]);
694+
}
695+
}
696+
669697
let opt_stage = llvm::OptStage::FatLTO;
670698
let stage = write::AutodiffStage::PostAD;
671699
if !config.autodiff.contains(&config::AutoDiff::NoPostopt) {

compiler/rustc_codegen_llvm/src/context.rs

+10
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,16 @@ impl<'ll, CX: Borrow<SCx<'ll>>> GenericCx<'ll, CX> {
698698
llvm::LLVMMDStringInContext2(self.llcx(), name.as_ptr() as *const c_char, name.len())
699699
})
700700
}
701+
702+
pub(crate) fn get_functions(&self) -> Vec<&'ll Value> {
703+
let mut functions = vec![];
704+
let mut func = unsafe { llvm::LLVMGetFirstFunction(self.llmod()) };
705+
while let Some(f) = func {
706+
functions.push(f);
707+
func = unsafe { llvm::LLVMGetNextFunction(f) }
708+
}
709+
functions
710+
}
701711
}
702712

703713
impl<'ll, 'tcx> MiscCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> {

compiler/rustc_codegen_llvm/src/llvm/mod.rs

+27-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![allow(non_snake_case)]
22

3-
use std::ffi::{CStr, CString};
3+
use std::ffi::{CStr, CString, c_char};
44
use std::ptr;
55
use std::str::FromStr;
66
use std::string::FromUtf8Error;
@@ -41,6 +41,32 @@ pub(crate) fn AddFunctionAttributes<'ll>(
4141
}
4242
}
4343

44+
pub(crate) fn HasAttributeAtIndex<'ll>(
45+
llfn: &'ll Value,
46+
idx: AttributePlace,
47+
kind: AttributeKind,
48+
) -> bool {
49+
unsafe { LLVMRustHasAttributeAtIndex(llfn, idx.as_uint(), kind) }
50+
}
51+
52+
pub(crate) fn HasStringAttribute<'ll>(llfn: &'ll Value, name: *const c_char) -> bool {
53+
unsafe { LLVMRustHasFnAttribute(llfn, name) }
54+
}
55+
56+
pub(crate) fn RemoveStringAttrFromFn<'ll>(llfn: &'ll Value, name: *const c_char) {
57+
unsafe { LLVMRustRemoveFnAttribute(llfn, name) }
58+
}
59+
60+
pub(crate) fn RemoveRustEnumAttributeAtIndex(
61+
llfn: &Value,
62+
place: AttributePlace,
63+
kind: AttributeKind,
64+
) {
65+
unsafe {
66+
LLVMRustRemoveEnumAttributeAtIndex(llfn, place.as_uint(), kind);
67+
}
68+
}
69+
4470
pub(crate) fn AddCallSiteAttributes<'ll>(
4571
callsite: &'ll Value,
4672
idx: AttributePlace,

compiler/rustc_codegen_llvm/src/type_.rs

+4
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ impl<'ll, CX: Borrow<SCx<'ll>>> GenericCx<'ll, CX> {
128128
(**self).borrow().llcx
129129
}
130130

131+
pub(crate) fn llmod(&self) -> &'ll llvm::Module {
132+
(**self).borrow().llmod
133+
}
134+
131135
pub(crate) fn isize_ty(&self) -> &'ll Type {
132136
(**self).borrow().isize_ty
133137
}

tests/codegen/autodiff/inline.rs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
//@ compile-flags: -Zautodiff=Enable -C opt-level=3 -Clto=fat -Zautodiff=NoPostopt
2+
//@ no-prefer-dynamic
3+
//@ needs-enzyme
4+
5+
#![feature(autodiff)]
6+
7+
use std::autodiff::autodiff;
8+
9+
#[autodiff(d_square, Reverse, Duplicated, Active)]
10+
fn square(x: &f64) -> f64 {
11+
x * x
12+
}
13+
14+
// CHECK: ; inline::d_square
15+
// CHECK-NEXT: ; Function Attrs: alwaysinline
16+
// CHECK-NOT: noinline
17+
// CHECK-NEXT: define internal fastcc void @_ZN6inline8d_square17h021c74e92c259cdeE
18+
fn main() {
19+
let x = std::hint::black_box(3.0);
20+
let mut dx1 = std::hint::black_box(1.0);
21+
let _ = d_square(&x, &mut dx1, 1.0);
22+
assert_eq!(dx1, 6.0);
23+
}

0 commit comments

Comments
 (0)