Don't force rustc to do codegen for LTO builds #8192

alexcrichton · 2020-05-01T15:28:01Z

This commit updates Cargo's implementation of LTO builds to do less work
and hopefully be faster when doing a cold build. Additionaly this should
save space on disk! The general idea is that the compiler does not need
object files if it's only going to perform LTO with some artifacts. In
this case all rustc needs to do is load bitcode from dependencies. This
means that if you're doing an LTO build generating object code for
intermediate dependencies is just wasted time!

Here Cargo is updated with more intrusive knowledge about LTO. Cargo
will now analyze the dependency graph to figure out which crates are
being compiled with LTO, and then it will figure out which dependencies
only need to have bitcode in them. Pure-bitcode artifacts are emitted
with the -Clinker-plugin-lto flag. Some artifacts are still used in
multiple scenarios (such as those shared between build scripts and final
artifacts), so those are not compiled with -Clinker-plugin-lto since
the linker is not guaranteed to know how to perform LTO.

This functionality was recently implemented in rust-lang/rust#71528
where rustc is now capable of reading bitcode from -Clinker-plugin-lto
rlibs. Previously rustc would only read its own format of bitcode, but
this has now been extended! This support is now on nightly, hence this
PR.

rust-highfive · 2020-05-01T15:28:05Z

r? @Eh2406

(rust_highfive has picked a reviewer for you, use r? to override)

alexcrichton · 2020-05-01T15:29:09Z

src/cargo/core/compiler/build_context/target_info.rs

-        let supports_bitcode_in_rlib = match kind {
-            CompileKind::Host => Some(rustc.cached_output(&bitcode_in_rlib_test).is_ok()),
+        let mut embed_bitcode_test = process.clone();
+        embed_bitcode_test.arg("-Cbitcode-in-rlib");


Note that the naming here is intentionally a bit odd. This is being renamed in rust-lang/rust#71716 (and will get backported to beta). The naming here is intended to represent what should be the final state of things while also working with today's nightly.

Eh2406 · 2020-05-01T15:55:23Z

I don't know this well enough to know it works from a review, but it looks good to me. So r+ it when you and CI are happy.

alexcrichton · 2020-05-01T17:06:36Z

r? @ehuss

ehuss

I think it might be good to add public functions to all the deps in the complicated test, and call them from main.rs, to ensure the linker is able to actually pull the symbols in and use them.

There is one edge case that seems to break. Setting lto = "off" (or n or no) causes Cargo to behave as-if LTO is enabled, and linking fails because there is no object code (the linker crashes for me on macos). Perhaps that case should be handled? I'm uncertain about the exact use cases, but I know it is sometimes used to disable thin-local LTO.

src/cargo/core/compiler/context/mod.rs

tests/testsuite/lto.rs

alexcrichton · 2020-05-01T20:59:14Z

There is one edge case that seems to break

Wow I had no idea that worked or was possible!

In any case, should be updated now. Thanks for taking a look!

ehuss

I just want to double check. Because the computed Lto value is not in the fingerprint, artifacts can end up with different results based on the order of commands. Is that OK?

For example, cargo build --release --lib will build the lib with -Cbitcode-in-rlib=no, and then cargo build --release --bin test will link with that lib missing the bitcode. That seems ok, unless you are doing cross-lang LTO, right?

I dunno, I'm just feeling like it might be safer to include the Lto value in the fingerprint, just so that if the order of commands changes things it will rebuild. Or maybe the Lto computation could be more conservative and assume if lto is set in the profile that it should use Lto::EmbedBitcode instead of Lto::None if require_bitcode is false.

Or, maybe if lto is set in the profile, maybe it should assume require_bitcode is true for all the (non-host) roots? That way, I think the order of commands would never change things.

ehuss · 2020-05-01T21:41:40Z

src/cargo/core/compiler/lto.rs

+        assert!(!require_bitcode); // can't depend on binaries/staticlib/etc
+        match unit.profile.lto {
+            profiles::Lto::Named(s) => match s.as_str() {
+                "n" | "no" | "off" => (Lto::None, false),


I think this changes the semantics so that lto="off" is changed to be thin-local LTO (by not passing the lto flag). I suspect to properly handle it will require another enum variant.

I continue to learn more about what this flag does every day.

Hm so I'll switch this to keep passing -Clto=off, but tbh that probably isn't what you want configuring lto="off". You'd probably also want to do that for dependencies but we don't even do that today

alexcrichton · 2020-05-04T17:44:41Z

Hm no that is not ok. That's quite subtle and pretty unfortunate that what I thought was a natural way to implement this doesn't actually work out. We'll definitely need to include it in the fingerprint.

FWIW the main purpose of this PR is to not do bitcode embedding (save on compile time), so I think we don't want to overapproximate what needs to be done (like we do today).

alexcrichton · 2020-05-04T17:54:17Z

Ok I've updated with a test to ensure fingerprints are handled correctly and passing through -Clto=off as well.

bors · 2020-05-04T18:57:53Z

☔ The latest upstream changes (presumably #8204) made this pull request unmergeable. Please resolve the merge conflicts.

ehuss · 2020-05-04T19:30:26Z

src/cargo/core/compiler/build_context/target_info.rs

@@ -40,8 +40,8 @@ pub struct TargetInfo {
    pub rustflags: Vec<String>,
    /// Extra flags to pass to `rustdoc`, see `env_args`.
    pub rustdocflags: Vec<String>,
-    /// Remove this when it hits stable (1.44)
-    pub supports_bitcode_in_rlib: Option<bool>,
+    /// Remove this when it hits stable (1.45)


If rust-lang/rust#71716 is backported to beta, shouldn't this still be 1.44?

It's unfortunately a bit confusing, but this flag is also being used as a proxy for "rustc can read its own -Clinker-plugin-lto object files", which is functionality on nightly that is not being backported. Only the option rename is being backported to beta.

Er actually turns out that the backport isn't necessary becuase -Cbitcode-in-rlib isn't even on beta.

ehuss · 2020-05-04T19:45:12Z

r=me with conflicts resolved

I'm not 100% confident this won't end up causing unwanted rebuilds. But the only scenario I can think of is build --lib then build --bin, and that seems like it would be very rare.

This commit updates Cargo's implementation of LTO builds to do less work and hopefully be faster when doing a cold build. Additionaly this should save space on disk! The general idea is that the compiler does not need object files if it's only going to perform LTO with some artifacts. In this case all rustc needs to do is load bitcode from dependencies. This means that if you're doing an LTO build generating object code for intermediate dependencies is just wasted time! Here Cargo is updated with more intrusive knowledge about LTO. Cargo will now analyze the dependency graph to figure out which crates are being compiled with LTO, and then it will figure out which dependencies only need to have bitcode in them. Pure-bitcode artifacts are emitted with the `-Clinker-plugin-lto` flag. Some artifacts are still used in multiple scenarios (such as those shared between build scripts and final artifacts), so those are not compiled with `-Clinker-plugin-lto` since the linker is not guaranteed to know how to perform LTO. This functionality was recently implemented in rust-lang/rust#71528 where rustc is now capable of reading bitcode from `-Clinker-plugin-lto` rlibs. Previously rustc would only read its own format of bitcode, but this has now been extended! This support is now on nightly, hence this PR.

alexcrichton · 2020-05-04T21:16:29Z

@bors: r=ehuss

bors · 2020-05-04T21:16:30Z

📌 Commit e221925 has been approved by ehuss

bors · 2020-05-04T21:49:33Z

⌛ Testing commit e221925 with merge 91dc1e1...

bors · 2020-05-04T22:26:39Z

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing 91dc1e1 to master...

Update cargo 7 commits in 258c89644c4587273a3ed3ee9522d2640facba43..f534844c25cacc5e004404cea835ac85e35ca3fd 2020-04-30 21:48:21 +0000 to 2020-05-06 14:39:10 +0000 - Avoid testing git-specific error messages (rust-lang/cargo#8212) - features: allow activated_features_unverified to communicate not-present (rust-lang/cargo#8194) - Don't force rustc to do codegen for LTO builds (rust-lang/cargo#8192) - Hint git-fetch-with-cli on git errors (rust-lang/cargo#8166) - ¬∃x. ¬y => ∀x. y (rust-lang/cargo#8205) - clippy fixes (rust-lang/cargo#8189) - Rename bitcode-in-rlib flag to embed-bitcode (rust-lang/cargo#8204)

Some LTO fixes. This reworks the LTO computation a little to address a few issues: - `cargo build` in a project with both a lib and bin would not engage the optimization introduced in #8192 where the lib *should* be compiled with `-C linker-plugin-lto` (bitcode only). This happened because the old code was starting root units as `Lto::None`. The solution here is to conditionally choose the starting Lto for roots. - A project with a dylib dependency would fail to build. It was building the dylib with `-C linker-plugin-lto` which is not valid. - A project with a bin/lib would build the lib differently based on whether or not it was selected. This changes it so that the lib is built the same. See `lto::between_builds`, where the second build the lib is now fresh. - Tests/benchmarks of a `lib` target will now support LTO. - Treats example libs a little more consistently as regular libs. I scattered some comments throughout, hopefully it's not too difficult to follow. Closes #8337

rust-highfive assigned Eh2406 May 1, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 1, 2020

alexcrichton commented May 1, 2020

View reviewed changes

rust-highfive assigned ehuss and unassigned Eh2406 May 1, 2020

alexcrichton force-pushed the lto-optimizations branch from f653d7a to 61fa693 Compare May 1, 2020 17:06

ehuss reviewed May 1, 2020

View reviewed changes

src/cargo/core/compiler/context/mod.rs Outdated Show resolved Hide resolved

tests/testsuite/lto.rs Show resolved Hide resolved

alexcrichton force-pushed the lto-optimizations branch from 61fa693 to caf2997 Compare May 1, 2020 20:58

ehuss reviewed May 1, 2020

View reviewed changes

alexcrichton force-pushed the lto-optimizations branch from caf2997 to 2163894 Compare May 4, 2020 17:52

ehuss reviewed May 4, 2020

View reviewed changes

alexcrichton force-pushed the lto-optimizations branch from 2163894 to e221925 Compare May 4, 2020 21:15

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 4, 2020

ehuss mentioned this pull request May 4, 2020

Rename bitcode-in-rlib option to embed-bitcode rust-lang/rust#71716

Merged

bors merged commit 91dc1e1 into rust-lang:master May 4, 2020

ehuss mentioned this pull request May 5, 2020

Update cargo rust-lang/rust#71925

Merged

tlambertz mentioned this pull request May 7, 2020

LTO doesn't work with rust nightlies after 2020-04-29 hermit-os/hermit-rs#15

Closed

matthiaskrgr mentioned this pull request May 8, 2020

thread 'main' panicked at 'assertion failed: !require_bitcode', src/tools/cargo/src/cargo/core/compiler/lto.rs:49:9 #8223

Closed

This was referenced May 11, 2020

error: failed to get bitcode from object file for LTO rust-osdev/cargo-xbuild#69

Closed

Cannot compile flipper contract use-ink/ink#391

Closed

ehuss mentioned this pull request Jun 5, 2020

LTO behavior depends on root targets #8337

Closed

alexcrichton mentioned this pull request Jun 8, 2020

LTO status pollutes the metadata for dependencies #8343

Open

ehuss mentioned this pull request Jun 10, 2020

Some LTO fixes. #8349

Merged

alexcrichton deleted the lto-optimizations branch July 29, 2020 17:48

briansmith mentioned this pull request Aug 26, 2020

Regression: lto = true in build.rs causes cargo test --release --doc to fail to link #8654

Closed

ehuss mentioned this pull request Sep 1, 2020

lto = true causes dependency rebuilds when alternating cargo build and cargo build --tests #8669

Closed

Aaron1011 mentioned this pull request Sep 23, 2020

rust-analyser segfault with lto=thin, linker=lld-link rust-lang/rust#71504

Closed

ehuss added this to the 1.45.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't force rustc to do codegen for LTO builds #8192

Don't force rustc to do codegen for LTO builds #8192

alexcrichton commented May 1, 2020

rust-highfive commented May 1, 2020

alexcrichton May 1, 2020

Eh2406 commented May 1, 2020

alexcrichton commented May 1, 2020

ehuss left a comment

alexcrichton commented May 1, 2020

ehuss left a comment

ehuss May 1, 2020

alexcrichton May 4, 2020

alexcrichton May 4, 2020

alexcrichton commented May 4, 2020

alexcrichton commented May 4, 2020

bors commented May 4, 2020

ehuss May 4, 2020

alexcrichton May 4, 2020

alexcrichton May 4, 2020

ehuss commented May 4, 2020

alexcrichton commented May 4, 2020

bors commented May 4, 2020

bors commented May 4, 2020

bors commented May 4, 2020

Don't force rustc to do codegen for LTO builds #8192

Don't force rustc to do codegen for LTO builds #8192

Conversation

alexcrichton commented May 1, 2020

rust-highfive commented May 1, 2020

alexcrichton May 1, 2020

Choose a reason for hiding this comment

Eh2406 commented May 1, 2020

alexcrichton commented May 1, 2020

ehuss left a comment

Choose a reason for hiding this comment

alexcrichton commented May 1, 2020

ehuss left a comment

Choose a reason for hiding this comment

ehuss May 1, 2020

Choose a reason for hiding this comment

alexcrichton May 4, 2020

Choose a reason for hiding this comment

alexcrichton May 4, 2020

Choose a reason for hiding this comment

alexcrichton commented May 4, 2020

alexcrichton commented May 4, 2020

bors commented May 4, 2020

ehuss May 4, 2020

Choose a reason for hiding this comment

alexcrichton May 4, 2020

Choose a reason for hiding this comment

alexcrichton May 4, 2020

Choose a reason for hiding this comment

ehuss commented May 4, 2020

alexcrichton commented May 4, 2020

bors commented May 4, 2020

bors commented May 4, 2020

bors commented May 4, 2020