Skip to content

Commit d137783

Browse files
committed
Auto merge of rust-lang#102900 - abrachet:master, r=bjorn3
Don't internalize __llvm_profile_counter_bias Currently, LLVM profiling runtime counter relocation cannot be used by rust during LTO because symbols are being internalized before all symbol information is known. This mode makes LLVM emit a __llvm_profile_counter_bias symbol which is referenced by the profiling initialization, which itself is pulled in by the rust driver here [1]. It is enabled with -Cllvm-args=-runtime-counter-relocation for platforms which are opt-in to this mode like Linux. On these platforms there will be no link error, rather just surprising behavior for a user which request runtime counter relocation. The profiling runtime will not see that symbol go on as if it were never there. On Fuchsia, the profiling runtime must have this symbol which will cause a hard link error. As an aside, I don't have enough context as to why rust's LTO model is how it is. AFAICT, the internalize pass is only safe to run at link time when all symbol information is actually known, this being an example as to why. I think special casing this symbol as a known one that LLVM can emit which should not have it's visbility de-escalated should be fine given how seldom this pattern of defining an undefined symbol to get initilization code pulled in is. From a quick grep, __llvm_profile_runtime is the only symbol that rustc does this for. [1] https://github.com/rust-lang/rust/blob/0265a3e93bf1b89d97cae113ed214954d5c35e22/compiler/rustc_codegen_ssa/src/back/linker.rs#L598
2 parents 4de4d60 + 5d88d36 commit d137783

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

compiler/rustc_codegen_llvm/src/back/lto.rs

+4
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ fn prepare_lto(
133133
}
134134
}
135135

136+
// __llvm_profile_counter_bias is pulled in at link time by an undefined reference to
137+
// __llvm_profile_runtime, therefore we won't know until link time if this symbol
138+
// should have default visibility.
139+
symbols_below_threshold.push(CString::new("__llvm_profile_counter_bias").unwrap());
136140
Ok((symbols_below_threshold, upstream_modules))
137141
}
138142

src/test/codegen/pgo-counter-bias.rs

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Test that __llvm_profile_counter_bias does not get internalized by lto.
2+
3+
// ignore-macos -runtime-counter-relocation not honored on Mach-O
4+
// compile-flags: -Cprofile-generate -Cllvm-args=-runtime-counter-relocation -Clto=fat
5+
// needs-profiler-support
6+
// no-prefer-dynamic
7+
8+
// CHECK: @__llvm_profile_counter_bias = {{.*}}global
9+
10+
pub fn main() {}

0 commit comments

Comments
 (0)