Reland optimized-compiler-builtins config #119556
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-testsuite
|
This PR modifies If appropriate, please update This PR modifies If appropriate, please update |
|
@bors r+ |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 4, 2024
…tins, r=onur-ozkan Reland optimized-compiler-builtins config Copy of rust-lang#102579 PR. From rust-lang#102579: > No concerns on my side. Currently, Jyn isn't actively working on the project. I will close this PR; open another one to cherry-pick the commits, resolve conflicts, and then r+ it. > Fixes rust-lang#102560. Fixes rust-lang#101172. Helps with rust-lang#105065 (although there's some weirdness there - it's still broken when optimized-compiler-builtins is set to true). Fixes rust-lang#102560. Fixes rust-lang#101172. Helps with rust-lang#105065 r? ghost
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 4, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#117636 (add test for rust-lang#117626) - rust-lang#118704 (Promote `riscv32{im|imafc}` targets to tier 2) - rust-lang#119184 (Switch from using `//~ERROR` annotations with `--error-format` to `error-pattern`) - rust-lang#119325 (custom mir: make it clear what the return block is) - rust-lang#119391 (Use Result::flatten in catch_with_exit_code) - rust-lang#119431 (Support reg_addr register class in s390x inline assembly) - rust-lang#119475 (Remove libtest's dylib) - rust-lang#119532 (Make offset_of field parsing use metavariable which handles any spacing) - rust-lang#119553 (stop feed vis when cant access for trait item) - rust-lang#119556 (Reland optimized-compiler-builtins config) r? `@ghost` `@rustbot` modify labels: rollup
|
@bors r- rollup=never |
bors
added
S-waiting-on-author
onur-ozkan
commented
Jan 4, 2024
| if [ "$EXTERNAL_LLVM" = "" ]; then | ||
| RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.optimized-compiler-builtins" | ||
| elif [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then | ||
| echo "error: dist builds should always use optimized compiler-rt!" >&2 |
There was a problem hiding this comment.
dist-various-2 image uses an external LLVM and fails here. I am considering to update this image to not install/use the external LLVM and instead opt for compiling and using the in-tree one like we do in the dist-various-1 image. Before doing it, I want to know if @rust-lang/infra team is happy with that.
There was a problem hiding this comment.
Does dist-various-2 really use an external LLVM? I don't see llvm-root/llvm-config options in the Dockerfile.
There was a problem hiding this comment.
It doesn't use, my bad. I got confused with "ENV EXTERNAL_LLVM 1"
kadiwa4
reviewed
Jan 7, 2024
| @@ -106,4 +106,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[ | |||
| severity: ChangeSeverity::Info, | |||
| summary: "The dist.missing-tools config option was deprecated, as it was unused. If you are using it, remove it from your config, it will be removed soon.", | |||
| }, | |||
| ChangeInfo { | |||
| change_id: 102579, | |||
There was a problem hiding this comment.
you didn't update the PR number
There was a problem hiding this comment.
It's the actual PR number of the implementation.
in particular, this makes the `c` feature for compiler-builtins an explicit opt-in, rather than silently detected by whether `llvm-project` is checked out on disk. exposing this is necessary because the `cc` crate doesn't support cross-compiling to MSVC, and we want people to be able to run `x check --target foo` regardless of whether they have a c toolchain available. this also uses the new option in CI, where we *do* want to optimize compiler_builtins. the new option is off by default for the `dev` channel and on otherwise.
onur-ozkan
force-pushed
the
optimized-compiler-builtins
branch
from
b5ccbcb
to
6a409dd
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (87e1430): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 668.625s -> 665.728s (-0.43%) |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Feb 11, 2024
…ozkan Adapt `llvm-has-rust-patches` validation to take `llvm-config` into account. This adapts an assertion that was added in rust-lang#119556. The current assertion does not take the `llvm-config` setting into accounts, which does not match the `llvm-has-rust-patches` documentation, which states: > This would be used in conjunction with either an llvm-config or build.submodules = false. (It also breaks my workflow: I build LLVM separately, but do have the rust patches applied). --- **edit:** Originally this PR just removed the assertion, but it now implements the alternative mentioned here: An alternative fix would be to take `llvm-config` into account in the assertion, but to me the assertion seems to provide little value, thus the simpler fix of just removing it. cc `@onur-ozkan,` in case I'm missing a reason to keep the assertion.
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 11, 2024
Rollup merge of rust-lang#120890 - TimNN:relax-patches-check, r=onur-ozkan Adapt `llvm-has-rust-patches` validation to take `llvm-config` into account. This adapts an assertion that was added in rust-lang#119556. The current assertion does not take the `llvm-config` setting into accounts, which does not match the `llvm-has-rust-patches` documentation, which states: > This would be used in conjunction with either an llvm-config or build.submodules = false. (It also breaks my workflow: I build LLVM separately, but do have the rust patches applied). --- **edit:** Originally this PR just removed the assertion, but it now implements the alternative mentioned here: An alternative fix would be to take `llvm-config` into account in the assertion, but to me the assertion seems to provide little value, thus the simpler fix of just removing it. cc `@onur-ozkan,` in case I'm missing a reason to keep the assertion.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Copy of #102579 PR.
From #102579:
Fixes #102560. Fixes #101172. Helps with #105065
r? ghost