Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on May 28, 2025. It is now read-only.
/rustPublic archive
forked fromrust-lang/rust

Commit3099876

Browse files
committed
Auto merge ofrust-lang#130679 - saethlin:inline-usually, r=<try>
Add inline(usually)I'm looking into what kind of things could recover the perf improvement detected inrust-lang#121417 (comment). I think it's worth spending quite a bit of effort to figure out how to capture a 45% incr-patched improvement.As far as I can tell, the root cause of the problem is that we have taken very deliberate steps in the compiler to ensure that `#[inline(always)]` causes inlining where possible, even when all optimizations are disabled. Some of the reasons that was done are now outdated or were misguided. I think the only remaining use case is where the inlined body even without optimizations is cheaper to codegen or call, for example SIMD intrinsics may require a lot of code to put their arguments on the stack, which is slow to compile and run.I'm quite sure that the majority of users applied this attribute believing it does not cause inlining in unoptimized builds, or didn't appreciate the build time regressions that implies and would prefer it didn't if they knew. (if that's you, put a heart on this or say something elsewhere, don't reply on this PR)I am going to _try_ to use the existing benchmark suite to evaluate a number of different approaches and take notes here, and hopefully I can collect enough data to shape any conversation about what we can do to help users.The core of this PR is `InlineAttr::Usually` (name doesn't matter) which ensures that when optimizations are enabled that the function is inlined (usual exceptions like recursion apply). I think most users believe this is what `#[inline(always)]` does.rust-lang#130685 (comment) Replaced `#[inline(always)]` with `#[inline(usually)]` in the standard library, and did not recover the same 45% incr-patched improvement in regex. It's a tidy net positive though, and I suspect that perf improvement would normally be big enough to motivate merging a change. I think that means the standard library's use of `#[inline(always)]` is imposing marginal compile time overhead on the ecosystem, but the bigger opportunities are probably in third-party crates.rust-lang#130679 (comment) Treats `#[inline(always)]` as `#[inline(usually)]` literally everywhere; this gets the desired incr-patched improvement but suffers quite a few check and doc regressions. I think that means that `alwaysinline` is more powerful than `function-inline-cost=0` in LLVM.rust-lang#130679 (comment) Treats `#[inline(always)]` as `#[inline(usually)]` when `-Copt-level=0`, which looks basically the same asrust-lang#121417 (comment) (omit `alwaysinline` when doing `-Copt-level=0` codegen).rust-lang#130679 (comment) replaces `alwaysinline` with a very negative inline cost, and it still has check and doc regressions. More investigation required on what the different inlining decision is.rust-lang#130679 (comment) is a likely explanation of this, with some interesting implications; adding `inline(always)` to a function that was going to be inlined anyway can change change optimizations (usually it seems to improve things?).TODO: stm32f4 and to a lesser extent bitmaps seem to compile slower and to larger binaries when we treat `inline(always)` as `inline(usually)`. Is that because of this?https://github.com/rust-lang/rust/blob/9e394f551c050ff03c6fc57f190e0761cf0be6e8/compiler/rustc_middle/src/mir/mono.rs#L141 If it's not, what happens if we infer `alwaysinline` for extremely small functions like most of those in stm32f4?
2 parents4428a05 +8caf221 commit3099876

File tree

8 files changed

+12
-4
lines changed

8 files changed

+12
-4
lines changed

‎compiler/rustc_attr/src/builtin.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ pub enum InlineAttr {
4646
Hint,
4747
Always,
4848
Never,
49+
Usually,
4950
}
5051

5152
#[derive(Clone,Encodable,Decodable,Debug,PartialEq,Eq,HashStable_Generic)]

‎compiler/rustc_codegen_gcc/src/attributes.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ fn inline_attr<'gcc, 'tcx>(
3030
None
3131
}
3232
}
33+
InlineAttr::Usually =>Some(FnAttribute::Inline),
3334
InlineAttr::None =>None,
3435
}
3536
}

‎compiler/rustc_codegen_llvm/src/attributes.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ fn inline_attr<'ll>(cx: &CodegenCx<'ll, '_>, inline: InlineAttr) -> Option<&'ll
4747
}
4848
}
4949
InlineAttr::None =>None,
50+
InlineAttr::Usually =>{
51+
Some(llvm::CreateAttrStringValue(cx.llcx,"function-inline-cost","0"))
52+
}
5053
}
5154
}
5255

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,11 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
525525
.emit();
526526
InlineAttr::None
527527
}elseiflist_contains_name(items, sym::always){
528-
InlineAttr::Always
528+
InlineAttr::Usually
529529
}elseiflist_contains_name(items, sym::never){
530530
InlineAttr::Never
531+
}elseiflist_contains_name(items, sym::usually){
532+
InlineAttr::Usually
531533
}else{
532534
struct_span_code_err!(tcx.dcx(), items[0].span(),E0535,"invalid argument")
533535
.with_help("valid inline arguments are `always` and `never`")

‎compiler/rustc_middle/src/mir/mono.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl<'tcx> MonoItem<'tcx> {
138138
// conflict with upstream crates as it could be an exported
139139
// symbol.
140140
match tcx.codegen_fn_attrs(instance.def_id()).inline{
141-
InlineAttr::Always =>InstantiationMode::LocalCopy,
141+
InlineAttr::Always|InlineAttr::Usually=>InstantiationMode::LocalCopy,
142142
_ =>InstantiationMode::GloballyShared{may_conflict:true},
143143
}
144144
}

‎compiler/rustc_mir_transform/src/cross_crate_inline.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fn cross_crate_inlinable(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
4646
// #[inline(never)] to force code generation.
4747
match codegen_fn_attrs.inline{
4848
InlineAttr::Never =>returnfalse,
49-
InlineAttr::Hint |InlineAttr::Always =>returntrue,
49+
InlineAttr::Hint |InlineAttr::Always|InlineAttr::Usually=>returntrue,
5050
_ =>{}
5151
}
5252

‎compiler/rustc_mir_transform/src/inline.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fn inline<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) -> bool {
106106
changed:false,
107107
caller_is_inline_forwarder:matches!(
108108
codegen_fn_attrs.inline,
109-
InlineAttr::Hint |InlineAttr::Always
109+
InlineAttr::Hint |InlineAttr::Always |InlineAttr::Usually
110110
) &&body_is_forwarder(body),
111111
};
112112
let blocks =START_BLOCK..body.basic_blocks.next_index();

‎compiler/rustc_span/src/symbol.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2102,6 +2102,7 @@ symbols! {
21022102
usize_legacy_fn_max_value,
21032103
usize_legacy_fn_min_value,
21042104
usize_legacy_mod,
2105+
usually,
21052106
va_arg,
21062107
va_copy,
21072108
va_end,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp