bootstrap: add split-debuginfo config by davidtwco · Pull Request #95612 · rust-lang/rust

davidtwco · 2022-04-03T06:53:43Z

Replace run-dysutil option with more general split-debuginfo option that works on all platforms.

r? @Mark-Simulacrum

src/bootstrap/builder.rs

Mark-Simulacrum · 2022-04-10T14:22:16Z

Looks like CI is failing as well, but generally this looks good to me.

Mark-Simulacrum · 2022-04-12T15:31:13Z

@bors r+ rollup

bors · 2022-04-12T15:31:15Z

📌 Commit f648caa198bcb1545d3b988beea5494c1124715c has been approved by Mark-Simulacrum

Mark-Simulacrum · 2022-04-12T15:31:22Z

@bors rollup=iffy

bors · 2022-04-14T09:34:35Z

⌛ Testing commit f648caa198bcb1545d3b988beea5494c1124715c with merge 2477118c9a94097ef32a5181a3370c74beae5c13...

bors · 2022-04-14T09:43:13Z

💔 Test failed - checks-actions

Mark-Simulacrum · 2022-04-16T17:55:27Z

@bors r+ rollup=iffy

bors · 2022-04-16T17:55:28Z

📌 Commit 51bb4d1bb1f2aabf3b1c19fcd3230465343f78b8 has been approved by Mark-Simulacrum

Replace `run-dysutil` option with more general `split-debuginfo` option that works on all platforms. Signed-off-by: David Wood <david.wood@huawei.com>

bors · 2022-04-18T09:49:34Z

⌛ Testing commit b786345 with merge 7e20ed6533bdc845c311e5cfb5849e5346f74f9a...

bors · 2022-04-18T09:58:16Z

💔 Test failed - checks-actions

davidtwco · 2022-04-19T01:45:32Z

Replacing is_like_msvc with is_like_windows won't be present in the bootstrap compiler, which prevents changing it in this PR from making a difference. I guess I'll change this so that I don't set -Csplit-debuginfo on Windows for now, since there's only one sensible option for it to have anyway.

src/bootstrap/builder.rs

Temporarily, only enable split debuginfo on Windows if not building with the boostrap compiler as there is a bug that isn't fixed in the bootstrap compiler which would result in `thorin` being run on Windows. Signed-off-by: David Wood <david.wood@huawei.com>

Mark-Simulacrum · 2022-04-20T02:44:49Z

@bors r+

bors · 2022-04-20T02:44:51Z

📌 Commit 65cc0ad has been approved by Mark-Simulacrum

bors · 2022-04-21T05:24:50Z

⌛ Testing commit 65cc0ad with merge 5176945...

bors · 2022-04-21T07:43:54Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 5176945 to master...

rust-timer · 2022-04-21T08:58:24Z

Finished benchmarking commit (5176945): comparison url.

Summary:

Primary benchmarks: 🎉 relevant improvements found
Secondary benchmarks: no relevant changes found

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	0	2	0	2
mean²	N/A	N/A	-2.0%	N/A	-2.0%
max	N/A	N/A	-3.2%	N/A	-3.2%

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

number of relevant changes ↩
the arithmetic mean of the percent change ↩

semarie · 2022-04-30T18:58:48Z

src/bootstrap/builder.rs

+        // FIXME(davidtwco): #[cfg(not(bootstrap))] - #95612 needs to be in the bootstrap compiler
+        // for this conditional to be removed.
+        if !target.contains("windows") || compiler.stage >= 1 {
+            if target.contains("linux") || target.contains("windows") {


the condition "linux" or "windows" is way too restrictive: all others unix needs -Zunstable-options too.

Currently, i am unable to build nightly on OpenBSD due to that:

running: "/data/semarie/build-rust/install_dir/beta/bin/cargo" "build" "--target" "x86_64-unknown-openbsd" "-Zbinary-dep-depinfo" "-j" "4" "-v" "--release" "--frozen" "--manifest-path" "/data/semarie/build-rust/build_dir/rustc-nightly-src/src/tools/unstable-book-gen/Cargo.toml" "--message-format" "json-render-diagnostics" error: failed to run `rustc` to learn about target-specific information Caused by: process didn't exit successfully: `/data/semarie/build-rust/build_dir/build/bootstrap/debug/rustc - --crate-name ___ --print=file-names --cfg=bootstrap -Csymbol-mangling-version=v0 -Zmacro-backtrace -Clink-args=-Wl,-z,origin '-Clink-args=-Wl,-rpath,$ORIGIN/../lib' -Csplit-debuginfo=off -Ztls-model=initial-exec --target x86_64-unknown-openbsd --crate-type bin --crate-type rlib --crate-type dylib --crate-type cdylib --crate-type staticlib --crate-type proc-macro --print=sysroot --print=cfg` (exit status: 1) --- stdout Did not run successfully: exit status: 1 "/data/semarie/build-rust/install_dir/beta/bin/rustc" "-" "--crate-name" "___" "--print=file-names" "--cfg=bootstrap" "-Csymbol-mangling-version=v0" "-Zmacro-backtrace" "-Clink-args=-Wl,-z,origin" "-Clink-args=-Wl,-rpath,$ORIGIN/../lib" "-Csplit-debuginfo=off" "-Ztls-model=initial-exec" "--target" "x86_64-unknown-openbsd" "--crate-type" "bin" "--crate-type" "rlib" "--crate-type" "dylib" "--crate-type" "cdylib" "--crate-type" "staticlib" "--crate-type" "proc-macro" "--print=sysroot" "--print=cfg" "-Wrust_2018_idioms" "-Wunused_lifetimes" "-Wsemicolon_in_expressions_from_macros" "-Dwarnings" "--sysroot" "/data/semarie/build-rust/install_dir/beta" ------------- --- stderr error: `-Csplit-debuginfo` is unstable on this platform

Adding || target.contains("openbsd") makes the build to continue.

I wonder if ! target.contains("apple") would be the right conditionnal.

after rust-lang#95612, only linux and windows target are build with -Zunstable-options, but others platforms might use -Csplit-debuginfo add "openbsd" target in the list of platforms using it.

…idtwco,Mark-Simulacrum openbsd: unbreak build on native platform after rust-lang#95612, only linux and windows target are build with `-Zunstable-options`, but others platforms might use `-Csplit-debuginfo` currently, without this PR, the build of rustc on OpenBSD fails with: ``` Building stage0 tool unstable-book-gen (x86_64-unknown-openbsd) running: "/data/semarie/build-rust/install_dir/beta/bin/cargo" "build" "--target" "x86_64-unknown-openbsd" "-Zbinary-dep-depinfo" "-j" "4" "-v" "--release" "--frozen" "--manifest-path" "/data/semarie/build-rust/build_dir/rustc-nightly-src/src/tools/unstable-book-gen/Cargo.toml" "--message-format" "json-render-diagnostics" error: failed to run `rustc` to learn about target-specific information Caused by: process didn't exit successfully: `/data/semarie/build-rust/build_dir/build/bootstrap/debug/rustc - --crate-name ___ --print=file-names --cfg=bootstrap -Csymbol-mangling-version=v0 -Zmacro-backtrace -Clink-args=-Wl,-z,origin '-Clink-args=-Wl,-rpath,$ORIGIN/../lib' -Csplit-debuginfo=off -Ztls-model=initial-exec --target x86_64-unknown-openbsd --crate-type bin --crate-type rlib --crate-type dylib --crate-type cdylib --crate-type staticlib --crate-type proc-macro --print=sysroot --print=cfg` (exit status: 1) --- stdout Did not run successfully: exit status: 1 "/data/semarie/build-rust/install_dir/beta/bin/rustc" "-" "--crate-name" "___" "--print=file-names" "--cfg=bootstrap" "-Csymbol-mangling-version=v0" "-Zmacro-backtrace" "-Clink-args=-Wl,-z,origin" "-Clink-args=-Wl,-rpath,$ORIGIN/../lib" "-Csplit-debuginfo=off" "-Ztls-model=initial-exec" "--target" "x86_64-unknown-openbsd" "--crate-type" "bin" "--crate-type" "rlib" "--crate-type" "dylib" "--crate-type" "cdylib" "--crate-type" "staticlib" "--crate-type" "proc-macro" "--print=sysroot" "--print=cfg" "-Wrust_2018_idioms" "-Wunused_lifetimes" "-Wsemicolon_in_expressions_from_macros" "-Dwarnings" "--sysroot" "/data/semarie/build-rust/install_dir/beta" ------------- --- stderr error: `-Csplit-debuginfo` is unstable on this platform command did not execute successfully: "/data/semarie/build-rust/install_dir/beta/bin/cargo.bin" "build" "--target" "x86_64-unknown-openbsd" "-Zbinary-dep-depinfo" "-j" "4" "-v" "--release" "--frozen" "--manifest-path" ``` I am suspecting that all unix might be affected, but I am unsure about the right conditional to use. so I only added "openbsd" target inside it as I am able to test it. rustc nightly built correctly with this PR on openbsd.

rust-highfive assigned Mark-Simulacrum Apr 3, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 3, 2022

Mark-Simulacrum reviewed Apr 10, 2022

View reviewed changes

src/bootstrap/builder.rs Outdated Show resolved Hide resolved

Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 10, 2022

davidtwco force-pushed the split-debuginfo-in-bootstrap branch from 4f6615d to f648caa Compare April 12, 2022 09:29

davidtwco added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2022

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 Apr 12, 2022

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

This comment was marked as resolved.

Sign in to view

davidtwco force-pushed the split-debuginfo-in-bootstrap branch from f648caa to 51bb4d1 Compare April 14, 2022 10:48

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 14, 2022

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 Apr 16, 2022

This comment was marked as resolved.

Sign in to view

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 17, 2022

bootstrap: add split-debuginfo config

7593c50

Replace `run-dysutil` option with more general `split-debuginfo` option that works on all platforms. Signed-off-by: David Wood <david.wood@huawei.com>

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 18, 2022

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

This comment was marked as resolved.

Sign in to view

Mark-Simulacrum reviewed Apr 19, 2022

View reviewed changes

src/bootstrap/builder.rs Outdated Show resolved Hide resolved

davidtwco force-pushed the split-debuginfo-in-bootstrap branch from b8e24ab to 65cc0ad Compare April 20, 2022 01:56

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 Apr 20, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 21, 2022

bors merged commit 5176945 into rust-lang:master Apr 21, 2022

rustbot added this to the 1.62.0 milestone Apr 21, 2022

davidtwco deleted the split-debuginfo-in-bootstrap branch April 21, 2022 08:14

semarie reviewed Apr 30, 2022

View reviewed changes

semarie mentioned this pull request May 1, 2022

openbsd: unbreak build on native platform #96597

Merged

davidtwco mentioned this pull request Jun 13, 2022

session: stabilize split debuginfo on linux #98051

Merged

ehuss mentioned this pull request Jul 13, 2022

1.62.0 build on Solaris fails with - error: -Csplit-debuginfo is unstable on this platfor #99208

Closed

Uh oh!

Conversation

davidtwco commented Apr 3, 2022

Uh oh!

Uh oh!

Mark-Simulacrum commented Apr 10, 2022

Uh oh!

Mark-Simulacrum commented Apr 12, 2022

Uh oh!

bors commented Apr 12, 2022

Uh oh!

Mark-Simulacrum commented Apr 12, 2022

Uh oh!

bors commented Apr 14, 2022

Uh oh!

bors commented Apr 14, 2022

Uh oh!

This comment was marked as resolved.

Mark-Simulacrum commented Apr 16, 2022

Uh oh!

bors commented Apr 16, 2022

Uh oh!

This comment was marked as resolved.

bors commented Apr 18, 2022

Uh oh!

bors commented Apr 18, 2022

Uh oh!

This comment was marked as resolved.

davidtwco commented Apr 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Mark-Simulacrum commented Apr 20, 2022

Uh oh!

bors commented Apr 20, 2022

Uh oh!

bors commented Apr 21, 2022

Uh oh!

bors commented Apr 21, 2022

Uh oh!

rust-timer commented Apr 21, 2022

Footnotes

Uh oh!

semarie Apr 30, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

davidtwco commented Apr 19, 2022 •

edited

Loading