improve host/cross target checking #136767

onur-ozkan · 2025-02-09T09:07:00Z

Using an invalid equality operator on builder.config.build !=/== can be hard to detect in reviews (which is quite dangerous). Replaced them with is_host_target, which is much clearer as it explicitly states what it does.

rustbot · 2025-02-09T09:07:09Z

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-02-09T09:07:11Z

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

albertlarsan68

LGTM, r=me when CI green :)

albertlarsan68 · 2025-02-09T10:03:11Z

@bors r+ rollup

bors · 2025-02-09T10:03:14Z

📌 Commit 5a8ac04 has been approved by albertlarsan68

It is now in the queue for this repository.

src/bootstrap/src/lib.rs

src/bootstrap/src/core/build_steps/compile.rs

jieyouxu · 2025-02-09T10:19:06Z

Sorry, it's entirely possible that I am confused, but I have a naming question
@bors r-

onur-ozkan · 2025-02-10T08:26:58Z

@rustbot ready

jieyouxu

Thanks!

jieyouxu · 2025-02-10T09:13:04Z

@bors r=albertlarsan68,jieyouxu

bors · 2025-02-10T09:13:10Z

📌 Commit c3856e9 has been approved by albertlarsan68,jieyouxu

It is now in the queue for this repository.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#136419 (adding autodiff tests) - rust-lang#136628 (ci: upgrade to crosstool-ng 1.27.0) - rust-lang#136681 (resolve `llvm-config` path properly on cross builds) - rust-lang#136714 (Update `compiler-builtins` to 0.1.146) - rust-lang#136731 (rustc_middle: parallel: TyCtxt: remove "unsafe impl DynSend/DynSync") - rust-lang#136791 (Disable DWARF in linker options for i686-unknown-uefi) Failed merges: - rust-lang#136767 (improve host/cross target checking) r? `@ghost` `@rustbot` modify labels: rollup

…tlarsan68,jieyouxu improve host/cross target checking Using an invalid equality operator on `builder.config.build !=/==` can be hard to detect in reviews (which is quite dangerous). Replaced them with `is_host_target`, which is much clearer as it explicitly states what it does.

workingjubilee · 2025-02-10T21:15:14Z

needs rebase
@bors r-

bors · 2025-02-11T13:41:44Z

📌 Commit cba9ddd has been approved by albertlarsan68,jieyouxu

It is now in the queue for this repository.

onur-ozkan · 2025-02-11T15:40:05Z

The job x86_64-gnu-llvm-18 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

#21 exporting to docker image format
#21 sending tarball 28.0s done
#21 DONE 41.4s
##[endgroup]
Setting extra environment values for docker:  --env ENABLE_GCC_CODEGEN=1 --env GCC_EXEC_PREFIX=/usr/lib/gcc/
[CI_JOB_NAME=x86_64-gnu-llvm-18]
debug: `DISABLE_CI_RUSTC_IF_INCOMPATIBLE` configured.
---
sccache: Starting the server...
##[group]Configure the build
configure: processing command line
configure: 
configure: build.configure-args := ['--build=x86_64-unknown-linux-gnu', '--llvm-root=/usr/lib/llvm-18', '--enable-llvm-link-shared', '--set', 'rust.randomize-layout=true', '--set', 'rust.thin-lto-import-instr-limit=10', '--enable-verbose-configure', '--enable-sccache', '--disable-manage-submodules', '--enable-locked-deps', '--enable-cargo-native-static', '--set', 'rust.codegen-units-std=1', '--set', 'dist.compression-profile=balanced', '--dist-compression-formats=xz', '--set', 'rust.lld=false', '--disable-dist-src', '--release-channel=nightly', '--enable-debug-assertions', '--enable-overflow-checks', '--enable-llvm-assertions', '--set', 'rust.verify-llvm-ir', '--set', 'rust.codegen-backends=llvm,cranelift,gcc', '--set', 'llvm.static-libstdcpp', '--enable-new-symbol-mangling']
configure: target.x86_64-unknown-linux-gnu.llvm-config := /usr/lib/llvm-18/bin/llvm-config
configure: llvm.link-shared     := True
configure: rust.randomize-layout := True
configure: rust.thin-lto-import-instr-limit := 10
---
  Downloaded boml v0.3.1
   Compiling boml v0.3.1
   Compiling y v0.1.0 (/checkout/compiler/rustc_codegen_gcc/build_system)
    Finished `release` profile [optimized] target(s) in 3.95s
     Running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-codegen/x86_64-unknown-linux-gnu/release/y test --use-system-gcc --use-backend gcc --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/cg_gcc --release --mini-tests --std-tests`
Using system GCC
warning: target feature `x87` must be enabled to ensure that the ABI of the current target can be implemented correctly
  |
  = note: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
  = note: for more information, see issue #116344 <https://github.com/rust-lang/rust/issues/116344>

Wtf is this.

@bors r-

Signed-off-by: onur-ozkan <[email protected]>

onur-ozkan · 2025-02-11T17:43:46Z

Unrelated, it's because -D warnings:

2025-02-11T14:24:06.0541945Z �[0m�[1m�[38;5;9merror�[0m�[0m�[1m: function `test_is_builder_target` is never used�[0m
2025-02-11T14:24:06.0542802Z �[0m    �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/bootstrap/src/core/builder/tests.rs:1069:4�[0m
2025-02-11T14:24:06.0543322Z �[0m     �[0m�[0m�[1m�[38;5;12m|�[0m
2025-02-11T14:24:06.0543860Z �[0m�[1m�[38;5;12m1069�[0m�[0m �[0m�[0m�[1m�[38;5;12m|�[0m�[0m �[0m�[0mfn test_is_builder_target() {�[0m
2025-02-11T14:24:06.0544477Z �[0m     �[0m�[0m�[1m�[38;5;12m|�[0m�[0m    �[0m�[0m�[1m�[38;5;9m^^^^^^^^^^^^^^^^^^^^^^�[0m
2025-02-11T14:24:06.0544910Z �[0m     �[0m�[0m�[1m�[38;5;12m|�[0m
2025-02-11T14:24:06.0545784Z �[0m     �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: `-D dead-code` implied by `-D warnings`�[0m
2025-02-11T14:24:06.0546506Z �[0m     �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mhelp�[0m�[0m: to override `-D warnings` add `#[allow(dead_code)]`�[0m

I missed #[test] during the rebase lol.

onur-ozkan · 2025-02-11T21:15:42Z

@bors r=albertlarsan68,jieyouxu

bors · 2025-02-11T21:15:47Z

📌 Commit acc7ddf has been approved by albertlarsan68,jieyouxu

It is now in the queue for this repository.

…tlarsan68,jieyouxu improve host/cross target checking Using an invalid equality operator on `builder.config.build !=/==` can be hard to detect in reviews (which is quite dangerous). Replaced them with `is_host_target`, which is much clearer as it explicitly states what it does.

…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#134981 ( Explain that in paths generics can't be set on both the enum and the variant) - rust-lang#136698 (Replace i686-unknown-redox target with i586-unknown-redox) - rust-lang#136767 (improve host/cross target checking) - rust-lang#136829 ([rustdoc] Move line numbers into the `<code>` directly) - rust-lang#136875 (Rustc dev guide subtree update) - rust-lang#136900 (compiler: replace `ExternAbi::name` calls with formatters) - rust-lang#136913 (Put kobzol back on review rotation) - rust-lang#136915 (documentation fix: `f16` and `f128` are not double-precision) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#136767 - onur-ozkan:is-host-target, r=albertlarsan68,jieyouxu improve host/cross target checking Using an invalid equality operator on `builder.config.build !=/==` can be hard to detect in reviews (which is quite dangerous). Replaced them with `is_host_target`, which is much clearer as it explicitly states what it does.

bootstrap: add more tracing to compiler/std/llvm flows - Add more tracing to compiler/std/llvm flows. - Two drive-by nits: 1. Take `TargetSelection` by-value for `builder.is_builder_target()`. Noticed while adding tracing; follow-up to rust-lang#136767. 2. Coalesce enzyme build logic into one branch. - Document `COMPILER{,_FOR}` tracing targets for rust-lang#96176. - No functional changes. ### Testing You can play with the tracing locally with: ``` $ BOOTSTRAP_TRACING=bootstrap=debug ./x build library $ BOOTSTRAP_TRACING=bootstrap=trace ./x build library $ BOOTSTRAP_TRACING=bootstrap=trace,COMPILER=trace,COMPILER_FOR=trace ./x build library ``` ### Previews ``` $ BOOTSTRAP_TRACING=bootstrap=debug ./x build library ``` ![Screenshot 2025-02-15 230824](https://github.com/user-attachments/assets/c3b02b62-d52e-4c03-a00a-da0d95618989) ``` $ BOOTSTRAP_TRACING=bootstrap=trace,COMPILER=trace,COMPILER_FOR=trace ./x build library ``` ![Screenshot 2025-02-15 233859](https://github.com/user-attachments/assets/842e4ece-4c26-4191-acbb-5f93e42de4dc) r? `@onur-ozkan` (or reroll)

bootstrap: add more tracing to compiler/std/llvm flows - Add more tracing to compiler/std/llvm flows. - Two drive-by nits: 1. Take `TargetSelection` by-value for `builder.is_builder_target()`. Noticed while adding tracing; follow-up to rust-lang#136767. 2. Coalesce enzyme build logic into one branch. - Document `COMPILER{,_FOR}` tracing targets for rust-lang#96176. - No functional changes. ### Testing You can play with the tracing locally with: ``` $ BOOTSTRAP_TRACING=bootstrap=debug ./x build library $ BOOTSTRAP_TRACING=bootstrap=trace ./x build library $ BOOTSTRAP_TRACING=bootstrap=trace,COMPILER=trace,COMPILER_FOR=trace ./x build library ``` ### Previews ``` $ BOOTSTRAP_TRACING=bootstrap=debug ./x build library ``` ![Screenshot 2025-02-15 230824](https://github.com/user-attachments/assets/c3b02b62-d52e-4c03-a00a-da0d95618989) ``` $ BOOTSTRAP_TRACING=bootstrap=trace,COMPILER=trace,COMPILER_FOR=trace ./x build library ``` ![Screenshot 2025-02-15 233859](https://github.com/user-attachments/assets/842e4ece-4c26-4191-acbb-5f93e42de4dc) r? ``@onur-ozkan`` (or reroll)

Rollup merge of rust-lang#137080 - jieyouxu:more-tracing, r=onur-ozkan bootstrap: add more tracing to compiler/std/llvm flows - Add more tracing to compiler/std/llvm flows. - Two drive-by nits: 1. Take `TargetSelection` by-value for `builder.is_builder_target()`. Noticed while adding tracing; follow-up to rust-lang#136767. 2. Coalesce enzyme build logic into one branch. - Document `COMPILER{,_FOR}` tracing targets for rust-lang#96176. - No functional changes. ### Testing You can play with the tracing locally with: ``` $ BOOTSTRAP_TRACING=bootstrap=debug ./x build library $ BOOTSTRAP_TRACING=bootstrap=trace ./x build library $ BOOTSTRAP_TRACING=bootstrap=trace,COMPILER=trace,COMPILER_FOR=trace ./x build library ``` ### Previews ``` $ BOOTSTRAP_TRACING=bootstrap=debug ./x build library ``` ![Screenshot 2025-02-15 230824](https://github.com/user-attachments/assets/c3b02b62-d52e-4c03-a00a-da0d95618989) ``` $ BOOTSTRAP_TRACING=bootstrap=trace,COMPILER=trace,COMPILER_FOR=trace ./x build library ``` ![Screenshot 2025-02-15 233859](https://github.com/user-attachments/assets/842e4ece-4c26-4191-acbb-5f93e42de4dc) r? ``@onur-ozkan`` (or reroll)

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#136419 (adding autodiff tests) - rust-lang#136628 (ci: upgrade to crosstool-ng 1.27.0) - rust-lang#136681 (resolve `llvm-config` path properly on cross builds) - rust-lang#136714 (Update `compiler-builtins` to 0.1.146) - rust-lang#136731 (rustc_middle: parallel: TyCtxt: remove "unsafe impl DynSend/DynSync") - rust-lang#136791 (Disable DWARF in linker options for i686-unknown-uefi) Failed merges: - rust-lang#136767 (improve host/cross target checking) r? `@ghost` `@rustbot` modify labels: rollup

…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#134981 ( Explain that in paths generics can't be set on both the enum and the variant) - rust-lang#136698 (Replace i686-unknown-redox target with i586-unknown-redox) - rust-lang#136767 (improve host/cross target checking) - rust-lang#136829 ([rustdoc] Move line numbers into the `<code>` directly) - rust-lang#136875 (Rustc dev guide subtree update) - rust-lang#136900 (compiler: replace `ExternAbi::name` calls with formatters) - rust-lang#136913 (Put kobzol back on review rotation) - rust-lang#136915 (documentation fix: `f16` and `f128` are not double-precision) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#136419 (adding autodiff tests) - rust-lang#136628 (ci: upgrade to crosstool-ng 1.27.0) - rust-lang#136681 (resolve `llvm-config` path properly on cross builds) - rust-lang#136714 (Update `compiler-builtins` to 0.1.146) - rust-lang#136731 (rustc_middle: parallel: TyCtxt: remove "unsafe impl DynSend/DynSync") - rust-lang#136791 (Disable DWARF in linker options for i686-unknown-uefi) Failed merges: - rust-lang#136767 (improve host/cross target checking) r? `@ghost` `@rustbot` modify labels: rollup

…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#134981 ( Explain that in paths generics can't be set on both the enum and the variant) - rust-lang#136698 (Replace i686-unknown-redox target with i586-unknown-redox) - rust-lang#136767 (improve host/cross target checking) - rust-lang#136829 ([rustdoc] Move line numbers into the `<code>` directly) - rust-lang#136875 (Rustc dev guide subtree update) - rust-lang#136900 (compiler: replace `ExternAbi::name` calls with formatters) - rust-lang#136913 (Put kobzol back on review rotation) - rust-lang#136915 (documentation fix: `f16` and `f128` are not double-precision) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned albertlarsan68 Feb 9, 2025

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 9, 2025

albertlarsan68 approved these changes Feb 9, 2025

View reviewed changes

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 Feb 9, 2025

jieyouxu reviewed Feb 9, 2025

View reviewed changes

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

jieyouxu reviewed Feb 9, 2025

View reviewed changes

src/bootstrap/src/core/build_steps/compile.rs Outdated Show resolved Hide resolved

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 Feb 9, 2025

rustbot 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 Feb 10, 2025

jieyouxu approved these changes Feb 10, 2025

View reviewed changes

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 Feb 10, 2025

matthiaskrgr mentioned this pull request Feb 10, 2025

Rollup of 6 pull requests #136823

Merged

This was referenced Feb 10, 2025

Rollup of 8 pull requests #136834

Closed

Rollup of 8 pull requests #136836

Closed

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 11, 2025

This comment has been minimized.

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 Feb 11, 2025

This comment was marked as resolved.

Sign in to view

rename is_host_target to is_builder_target

acc7ddf

Signed-off-by: onur-ozkan <[email protected]>

onur-ozkan force-pushed the is-host-target branch from cba9ddd to acc7ddf Compare February 11, 2025 17:43

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 11, 2025

This was referenced Feb 12, 2025

Rollup of 8 pull requests #136917

Closed

Rollup of 8 pull requests #136918

Merged

bors merged commit 1073aea into rust-lang:master Feb 12, 2025
6 checks passed

rustbot added this to the 1.86.0 milestone Feb 12, 2025

jieyouxu mentioned this pull request Feb 15, 2025

bootstrap: add more tracing to compiler/std/llvm flows #137080

Merged

improve host/cross target checking #136767

improve host/cross target checking #136767

Uh oh!

Conversation

onur-ozkan commented Feb 9, 2025

Uh oh!

rustbot commented Feb 9, 2025

Uh oh!

rustbot commented Feb 9, 2025

Uh oh!

albertlarsan68 left a comment

Choose a reason for hiding this comment

Uh oh!

albertlarsan68 commented Feb 9, 2025

Uh oh!

bors commented Feb 9, 2025

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Feb 9, 2025

Uh oh!

onur-ozkan commented Feb 10, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Feb 10, 2025

Uh oh!

bors commented Feb 10, 2025

Uh oh!

workingjubilee commented Feb 10, 2025

Uh oh!

bors commented Feb 11, 2025

Uh oh!

This comment has been minimized.

onur-ozkan commented Feb 11, 2025

Uh oh!

This comment was marked as resolved.

onur-ozkan commented Feb 11, 2025

Uh oh!

onur-ozkan commented Feb 11, 2025

Uh oh!

bors commented Feb 11, 2025

Uh oh!

Uh oh!

Uh oh!