Skip to content

Commit aac4020

Browse files
saethlinsaethlin
committed
Attempt
1 parent cdca82c commit aac4020

23 files changed

+381
-157
lines changed

‎compiler/rustc_interface/src/tests.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,7 @@ fn test_unstable_options_tracking_hash() {
769769
);
770770
tracked!(codegen_backend, Some("abc".to_string()));
771771
tracked!(crate_attr, vec!["abc".to_string()]);
772+
tracked!(cross_crate_inline_threshold, Some(200));
772773
tracked!(debug_info_for_profiling, true);
773774
tracked!(debug_macros, true);
774775
tracked!(dep_info_omit_d_target, true);

‎compiler/rustc_metadata/src/rmeta/decoder.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,6 +1273,15 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
12731273
self.root.tables.optimized_mir.get(self, id).is_some()
12741274
}
12751275

1276+
fn cross_crate_inlinable(self, tcx: TyCtxt<'tcx>, id: DefIndex) -> bool {
1277+
self.root
1278+
.tables
1279+
.cross_crate_inlinable
1280+
.get(self, id)
1281+
.map(|v| v.decode((self, tcx.sess)))
1282+
.unwrap_or(false)
1283+
}
1284+
12761285
fn get_fn_has_self_parameter(self, id: DefIndex, sess: &'a Session) -> bool {
12771286
self.root
12781287
.tables

‎compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ provide! { tcx, def_id, other, cdata,
287287
item_attrs => { tcx.arena.alloc_from_iter(cdata.get_item_attrs(def_id.index, tcx.sess)) }
288288
is_mir_available => { cdata.is_item_mir_available(def_id.index) }
289289
is_ctfe_mir_available => { cdata.is_ctfe_mir_available(def_id.index) }
290+
cross_crate_inlinable => { cdata.cross_crate_inlinable(tcx, def_id.index) }
290291

291292
dylib_dependency_formats => { cdata.get_dylib_dependency_formats(tcx) }
292293
is_private_dep => {

‎compiler/rustc_metadata/src/rmeta/encoder.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ fn should_encode_mir(
10461046
|| (tcx.sess.opts.output_types.should_codegen()
10471047
&& reachable_set.contains(&def_id)
10481048
&& (generics.requires_monomorphization(tcx)
1049-
|| tcx.codegen_fn_attrs(def_id).requests_inline()));
1049+
|| tcx.cross_crate_inlinable(def_id)));
10501050
// The function has a `const` modifier or is in a `#[const_trait]`.
10511051
let is_const_fn = tcx.is_const_fn_raw(def_id.to_def_id())
10521052
|| tcx.is_const_default_method(def_id.to_def_id());
@@ -1612,6 +1612,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
16121612
debug!("EntryBuilder::encode_mir({:?})", def_id);
16131613
if encode_opt {
16141614
record!(self.tables.optimized_mir[def_id.to_def_id()] <- tcx.optimized_mir(def_id));
1615+
record!(self.tables.cross_crate_inlinable[def_id.to_def_id()] <- self.tcx.cross_crate_inlinable(def_id));
16151616
record!(self.tables.closure_saved_names_of_captured_variables[def_id.to_def_id()]
16161617
<- tcx.closure_saved_names_of_captured_variables(def_id));
16171618

‎compiler/rustc_metadata/src/rmeta/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ define_tables! {
427427
object_lifetime_default: Table<DefIndex, LazyValue<ObjectLifetimeDefault>>,
428428
optimized_mir: Table<DefIndex, LazyValue<mir::Body<'static>>>,
429429
mir_for_ctfe: Table<DefIndex, LazyValue<mir::Body<'static>>>,
430+
cross_crate_inlinable: Table<DefIndex, LazyValue<bool>>,
430431
closure_saved_names_of_captured_variables: Table<DefIndex, LazyValue<IndexVec<FieldIdx, Symbol>>>,
431432
mir_generator_witnesses: Table<DefIndex, LazyValue<mir::GeneratorLayout<'static>>>,
432433
promoted_mir: Table<DefIndex, LazyValue<IndexVec<mir::Promoted, mir::Body<'static>>>>,

‎compiler/rustc_metadata/src/rmeta/table.rs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,29 @@ impl FixedSizeEncoding for bool {
299299
}
300300
}
301301

302+
impl FixedSizeEncoding for Option<bool> {
303+
type ByteArray = [u8; 1];
304+
305+
#[inline]
306+
fn from_bytes(b: &[u8; 1]) -> Self {
307+
match b[0] {
308+
0 => Some(false),
309+
1 => Some(true),
310+
_ => None,
311+
}
312+
}
313+
314+
#[inline]
315+
fn write_to_bytes(self, b: &mut [u8; 1]) {
316+
debug_assert!(!self.is_default());
317+
b[0] = match self {
318+
Some(false) => 0,
319+
Some(true) => 1,
320+
None => 2,
321+
};
322+
}
323+
}
324+
302325
impl FixedSizeEncoding for UnusedGenericParams {
303326
type ByteArray = [u8; 4];
304327

‎compiler/rustc_middle/src/query/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2202,6 +2202,11 @@ rustc_queries! {
22022202
query generics_require_sized_self(def_id: DefId) -> bool {
22032203
desc { "check whether the item has a `where Self: Sized` bound" }
22042204
}
2205+
2206+
query cross_crate_inlinable(def_id: DefId) -> bool {
2207+
desc { "whether the item should be made inlinable across crates" }
2208+
separate_provide_extern
2209+
}
22052210
}
22062211

22072212
rustc_query_append! { define_callbacks! }

‎compiler/rustc_middle/src/ty/instance.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,16 +245,15 @@ impl<'tcx> InstanceDef<'tcx> {
245245
// drops of `Option::None` before LTO. We also respect the intent of
246246
// `#[inline]` on `Drop::drop` implementations.
247247
return ty.ty_adt_def().map_or(true, |adt_def| {
248-
adt_def.destructor(tcx).map_or_else(
249-
|| adt_def.is_enum(),
250-
|dtor| tcx.codegen_fn_attrs(dtor.did).requests_inline(),
251-
)
248+
adt_def
249+
.destructor(tcx)
250+
.map_or_else(|| adt_def.is_enum(), |dtor| tcx.cross_crate_inlinable(dtor.did))
252251
});
253252
}
254253
if let ty::InstanceDef::ThreadLocalShim(..) = *self {
255254
return false;
256255
}
257-
tcx.codegen_fn_attrs(self.def_id()).requests_inline()
256+
tcx.cross_crate_inlinable(self.def_id())
258257
}
259258

260259
pub fn requires_caller_location(&self, tcx: TyCtxt<'_>) -> bool {

‎compiler/rustc_mir_transform/src/cross_crate_inline.rs

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
use rustc_attr::InlineAttr;
2+
use rustc_hir::def_id::LocalDefId;
3+
use rustc_middle::query::Providers;
4+
use rustc_middle::ty::TyCtxt;
5+
use rustc_session::config::OptLevel;
6+
7+
pub fn provide(providers: &mut Providers) {
8+
providers.cross_crate_inlinable = cross_crate_inlinable;
9+
}
10+
11+
fn cross_crate_inlinable(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
12+
if tcx.sess.opts.incremental.is_some() {
13+
return false;
14+
}
15+
16+
match tcx.codegen_fn_attrs(def_id).inline {
17+
InlineAttr::Never => return false,
18+
InlineAttr::Hint | InlineAttr::Always => return true,
19+
_ => {}
20+
}
21+
22+
if matches!(tcx.sess.opts.optimize, OptLevel::No | OptLevel::Default) {
23+
return false;
24+
}
25+
26+
match tcx.hir().body_const_context(def_id) {
27+
Some(rustc_hir::ConstContext::ConstFn) | None => {}
28+
_ => return false,
29+
}
30+
31+
if tcx.lang_items().iter().any(|(_, lang_def_id)| lang_def_id == def_id.into()) {
32+
return false;
33+
}
34+
35+
let mir = tcx.optimized_mir(def_id);
36+
let mut checker = CostChecker { tcx, cost: 0, callee_body: mir };
37+
checker.visit_body(mir);
38+
checker.cost <= tcx.sess.opts.unstable_opts.cross_crate_inline_threshold.unwrap_or(100)
39+
}
40+
41+
use rustc_middle::mir::visit::Visitor;
42+
use rustc_middle::mir::*;
43+
44+
const INSTR_COST: usize = 5;
45+
const CALL_PENALTY: usize = 25;
46+
const LANDINGPAD_PENALTY: usize = 50;
47+
const RESUME_PENALTY: usize = 45;
48+
49+
struct CostChecker<'b, 'tcx> {
50+
tcx: TyCtxt<'tcx>,
51+
cost: usize,
52+
callee_body: &'b Body<'tcx>,
53+
}
54+
55+
impl<'tcx> Visitor<'tcx> for CostChecker<'_, 'tcx> {
56+
fn visit_statement(&mut self, statement: &Statement<'tcx>, _: Location) {
57+
// Don't count StorageLive/StorageDead in the inlining cost.
58+
match statement.kind {
59+
StatementKind::StorageLive(_)
60+
| StatementKind::StorageDead(_)
61+
| StatementKind::Deinit(_)
62+
| StatementKind::Nop => {}
63+
_ => self.cost += INSTR_COST,
64+
}
65+
}
66+
67+
fn visit_terminator(&mut self, terminator: &Terminator<'tcx>, _: Location) {
68+
let tcx = self.tcx;
69+
match terminator.kind {
70+
TerminatorKind::Drop { ref place, unwind, .. } => {
71+
let ty = place.ty(self.callee_body, tcx).ty;
72+
if !ty.is_trivially_pure_clone_copy() {
73+
self.cost += CALL_PENALTY;
74+
if let UnwindAction::Cleanup(_) = unwind {
75+
self.cost += LANDINGPAD_PENALTY;
76+
}
77+
}
78+
}
79+
TerminatorKind::Call { unwind, .. } => {
80+
self.cost += CALL_PENALTY;
81+
if let UnwindAction::Cleanup(_) = unwind {
82+
self.cost += LANDINGPAD_PENALTY;
83+
}
84+
}
85+
TerminatorKind::Assert { unwind, .. } => {
86+
self.cost += CALL_PENALTY;
87+
if let UnwindAction::Cleanup(_) = unwind {
88+
self.cost += LANDINGPAD_PENALTY;
89+
}
90+
}
91+
TerminatorKind::UnwindResume => self.cost += RESUME_PENALTY,
92+
TerminatorKind::InlineAsm { unwind, .. } => {
93+
self.cost += INSTR_COST;
94+
if let UnwindAction::Cleanup(_) = unwind {
95+
self.cost += LANDINGPAD_PENALTY;
96+
}
97+
}
98+
_ => self.cost += INSTR_COST,
99+
}
100+
}
101+
}

‎compiler/rustc_mir_transform/src/inline.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,13 @@ impl<'tcx> Inliner<'tcx> {
170170
callsite: &CallSite<'tcx>,
171171
) -> Result<std::ops::Range<BasicBlock>, &'static str> {
172172
let callee_attrs = self.tcx.codegen_fn_attrs(callsite.callee.def_id());
173-
self.check_codegen_attributes(callsite, callee_attrs)?;
173+
let cross_crate_inlinable = if callsite.callee.def_id().is_local() {
174+
// Avoid a query cycle, cross_crate_inlinable is based on optimized_mir
175+
callee_attrs.requests_inline()
176+
} else {
177+
self.tcx.cross_crate_inlinable(callsite.callee.def_id())
178+
};
179+
self.check_codegen_attributes(callsite, callee_attrs, cross_crate_inlinable)?;
174180

175181
let terminator = caller_body[callsite.block].terminator.as_ref().unwrap();
176182
let TerminatorKind::Call { args, destination, .. } = &terminator.kind else { bug!() };
@@ -185,7 +191,7 @@ impl<'tcx> Inliner<'tcx> {
185191

186192
self.check_mir_is_available(caller_body, &callsite.callee)?;
187193
let callee_body = try_instance_mir(self.tcx, callsite.callee.def)?;
188-
self.check_mir_body(callsite, callee_body, callee_attrs)?;
194+
self.check_mir_body(callsite, callee_body, callee_attrs, cross_crate_inlinable)?;
189195

190196
if !self.tcx.consider_optimizing(|| {
191197
format!("Inline {:?} into {:?}", callsite.callee, caller_body.source)
@@ -401,6 +407,7 @@ impl<'tcx> Inliner<'tcx> {
401407
&self,
402408
callsite: &CallSite<'tcx>,
403409
callee_attrs: &CodegenFnAttrs,
410+
cross_crate_inlinable: bool,
404411
) -> Result<(), &'static str> {
405412
if let InlineAttr::Never = callee_attrs.inline {
406413
return Err("never inline hint");
@@ -414,7 +421,7 @@ impl<'tcx> Inliner<'tcx> {
414421
.non_erasable_generics(self.tcx, callsite.callee.def_id())
415422
.next()
416423
.is_some();
417-
if !is_generic && !callee_attrs.requests_inline() {
424+
if !is_generic && !cross_crate_inlinable {
418425
return Err("not exported");
419426
}
420427

@@ -456,10 +463,11 @@ impl<'tcx> Inliner<'tcx> {
456463
callsite: &CallSite<'tcx>,
457464
callee_body: &Body<'tcx>,
458465
callee_attrs: &CodegenFnAttrs,
466+
cross_crate_inlinable: bool,
459467
) -> Result<(), &'static str> {
460468
let tcx = self.tcx;
461469

462-
let mut threshold = if callee_attrs.requests_inline() {
470+
let mut threshold = if cross_crate_inlinable {
463471
self.tcx.sess.opts.unstable_opts.inline_mir_hint_threshold.unwrap_or(100)
464472
} else {
465473
self.tcx.sess.opts.unstable_opts.inline_mir_threshold.unwrap_or(50)

‎compiler/rustc_mir_transform/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ mod const_prop;
6262
mod const_prop_lint;
6363
mod copy_prop;
6464
mod coverage;
65+
mod cross_crate_inline;
6566
mod ctfe_limit;
6667
mod dataflow_const_prop;
6768
mod dead_store_elimination;
@@ -123,6 +124,7 @@ pub fn provide(providers: &mut Providers) {
123124
coverage::query::provide(providers);
124125
ffi_unwind_calls::provide(providers);
125126
shim::provide(providers);
127+
cross_crate_inline::provide(providers);
126128
*providers = Providers {
127129
mir_keys,
128130
mir_const,

‎compiler/rustc_passes/src/reachable.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ use rustc_target::spec::abi::Abi;
2121
// Returns true if the given item must be inlined because it may be
2222
// monomorphized or it was marked with `#[inline]`. This will only return
2323
// true for functions.
24-
fn item_might_be_inlined(tcx: TyCtxt<'_>, item: &hir::Item<'_>, attrs: &CodegenFnAttrs) -> bool {
25-
if attrs.requests_inline() {
24+
fn item_might_be_inlined(tcx: TyCtxt<'_>, item: &hir::Item<'_>, inlinable: bool) -> bool {
25+
if inlinable {
2626
return true;
2727
}
2828

@@ -41,9 +41,9 @@ fn method_might_be_inlined(
4141
impl_item: &hir::ImplItem<'_>,
4242
impl_src: LocalDefId,
4343
) -> bool {
44-
let codegen_fn_attrs = tcx.codegen_fn_attrs(impl_item.hir_id().owner.to_def_id());
44+
let inlinable = tcx.cross_crate_inlinable(impl_item.hir_id().owner.to_def_id());
4545
let generics = tcx.generics_of(impl_item.owner_id);
46-
if codegen_fn_attrs.requests_inline() || generics.requires_monomorphization(tcx) {
46+
if inlinable || generics.requires_monomorphization(tcx) {
4747
return true;
4848
}
4949
if let hir::ImplItemKind::Fn(method_sig, _) = &impl_item.kind {
@@ -52,7 +52,7 @@ fn method_might_be_inlined(
5252
}
5353
}
5454
match tcx.hir().find_by_def_id(impl_src) {
55-
Some(Node::Item(item)) => item_might_be_inlined(tcx, &item, codegen_fn_attrs),
55+
Some(Node::Item(item)) => item_might_be_inlined(tcx, &item, inlinable),
5656
Some(..) | None => span_bug!(impl_item.span, "impl did is not an item"),
5757
}
5858
}
@@ -149,7 +149,7 @@ impl<'tcx> ReachableContext<'tcx> {
149149
match self.tcx.hir().find_by_def_id(def_id) {
150150
Some(Node::Item(item)) => match item.kind {
151151
hir::ItemKind::Fn(..) => {
152-
item_might_be_inlined(self.tcx, &item, self.tcx.codegen_fn_attrs(def_id))
152+
item_might_be_inlined(self.tcx, &item, self.tcx.cross_crate_inlinable(def_id))
153153
}
154154
_ => false,
155155
},
@@ -227,7 +227,7 @@ impl<'tcx> ReachableContext<'tcx> {
227227
if item_might_be_inlined(
228228
self.tcx,
229229
&item,
230-
self.tcx.codegen_fn_attrs(item.owner_id),
230+
self.tcx.cross_crate_inlinable(item.owner_id),
231231
) {
232232
self.visit_nested_body(body);
233233
}

‎compiler/rustc_session/src/options.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,8 @@ options! {
14411441
"combine CGUs into a single one"),
14421442
crate_attr: Vec<String> = (Vec::new(), parse_string_push, [TRACKED],
14431443
"inject the given attribute in the crate"),
1444+
cross_crate_inline_threshold: Option<usize> = (None, parse_opt_number, [TRACKED],
1445+
"threshold to allow cross crate inlining of functions"),
14441446
debug_info_for_profiling: bool = (false, parse_bool, [TRACKED],
14451447
"emit discriminators and other data necessary for AutoFDO"),
14461448
debug_macros: bool = (false, parse_bool, [TRACKED],

‎library/alloc/src/raw_vec.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@ fn alloc_guard(alloc_size: usize) -> Result<(), TryReserveError> {
530530
// ensure that the code generation related to these panics is minimal as there's
531531
// only one location which panics rather than a bunch throughout the module.
532532
#[cfg(not(no_global_oom_handling))]
533+
#[inline(never)]
533534
fn capacity_overflow() -> ! {
534535
panic!("capacity overflow");
535536
}

‎tests/mir-opt/enum_opt.cand.EnumSizeOpt.32bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
+ }
6868
+
69-
+ alloc15 (size: 8, align: 4) {
69+
+ alloc14 (size: 8, align: 4) {
7070
+ 02 00 00 00 05 20 00 00 │ ..... ..
7171
}
7272

‎tests/mir-opt/enum_opt.cand.EnumSizeOpt.64bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
+ }
6868
+
69-
+ alloc15 (size: 16, align: 8) {
69+
+ alloc14 (size: 16, align: 8) {
7070
+ 02 00 00 00 00 00 00 00 05 20 00 00 00 00 00 00 │ ......... ......
7171
}
7272

‎tests/mir-opt/enum_opt.unin.EnumSizeOpt.32bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
+ }
6868
+
69-
+ alloc14 (size: 8, align: 4) {
69+
+ alloc15 (size: 8, align: 4) {
7070
+ 05 20 00 00 01 00 00 00 │ . ......
7171
}
7272

‎tests/mir-opt/enum_opt.unin.EnumSizeOpt.64bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
+ }
6868
+
69-
+ alloc14 (size: 16, align: 8) {
69+
+ alloc15 (size: 16, align: 8) {
7070
+ 05 20 00 00 00 00 00 00 01 00 00 00 00 00 00 00 │ . ..............
7171
}
7272

0 commit comments

Comments
 (0)