Apply EarlyOtherwiseBranch to scalar value
#129047
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
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
DianQK
force-pushed
the
early_otherwise_branch_scalar
branch
from
cc633b3
to
f8ebe31
Compare
|
☔ The latest upstream changes (presumably #130165) made this pull request unmergeable. Please resolve the merge conflicts. |
|
r=me after rebase |
DianQK
force-pushed
the
early_otherwise_branch_scalar
branch
from
f8ebe31
to
e3a9eaf
Compare
|
Rebased. |
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 23, 2024
…, r=cjgillot Apply `EarlyOtherwiseBranch` to scalar value In the future, I'm thinking of hoisting discriminant via GVN so that we only need to write very little code here. r? `@cjgillot`
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
@bors retry |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (a772336): comparison URL. Overall result: ❌✅ regressions and improvements - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)Results (primary 5.0%, secondary 3.7%)This 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.
CyclesResults (primary -0.5%, secondary -8.0%)This 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.
Binary sizeResults (primary 0.2%, secondary 0.0%)This 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.
Bootstrap: 768.601s -> 767.14s (-0.19%) |
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Sep 24, 2024
…h_scalar, r=cjgillot" This reverts commit a772336, reversing changes made to 702987f. It seems Apply EarlyOtherwiseBranch to scalar value rust-lang#129047 may have lead to several nightly regressions: - rust-lang#130769 - rust-lang#130774 - rust-lang#130771 And since this is a mir-opt ICE that seems to quite easy to trigger with real-world crates being affected, let's revert for now and reland the mir-opt later.
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Sep 24, 2024
…h_scalar, r=cjgillot" This reverts commit a772336, reversing changes made to 702987f. It seems Apply EarlyOtherwiseBranch to scalar value rust-lang#129047 may have lead to several nightly regressions: - rust-lang#130769 - rust-lang#130774 - rust-lang#130771 And since this is a mir-opt ICE that seems to quite easy to trigger with real-world crates being affected, let's revert for now and reland the mir-opt later.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 24, 2024
Revert "Apply EarlyOtherwiseBranch to scalar value rust-lang#129047" This reverts PR rust-lang#129047, commit a772336, reversing changes made to 702987f. cc `@DianQK` and `@cjgillot` as the PR author and reviewer of rust-lang#129047 respectively. It seems [Apply EarlyOtherwiseBranch to scalar value rust-lang#129047](rust-lang#129047) may have lead to several nightly regressions: - rust-lang#130769 - rust-lang#130774 - rust-lang#130771 Example test that would ICE with changes in rust-lang#129047 (this test is included in this PR): ```rs //@ compile-flags: -C opt-level=3 //@ check-pass use std::task::Poll; pub fn poll(val: Poll<Result<Option<Vec<u8>>, u8>>) { match val { Poll::Ready(Ok(Some(_trailers))) => {} Poll::Ready(Err(_err)) => {} Poll::Ready(Ok(None)) => {} Poll::Pending => {} } } ``` Since this is a mir-opt ICE that seems to quite easy to trigger with real-world crates being affected, let's revert for now and reland the mir-opt after these are fixed.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 24, 2024
Revert "Apply EarlyOtherwiseBranch to scalar value rust-lang#129047" This reverts PR rust-lang#129047, commit a772336, reversing changes made to 702987f. cc `@DianQK` and `@cjgillot` as the PR author and reviewer of rust-lang#129047 respectively. It seems [Apply EarlyOtherwiseBranch to scalar value rust-lang#129047](rust-lang#129047) may have lead to several nightly regressions: - rust-lang#130769 - rust-lang#130774 - rust-lang#130771 Example test that would ICE with changes in rust-lang#129047 (this test is included in this PR): ```rs //@ compile-flags: -C opt-level=3 //@ check-pass use std::task::Poll; pub fn poll(val: Poll<Result<Option<Vec<u8>>, u8>>) { match val { Poll::Ready(Ok(Some(_trailers))) => {} Poll::Ready(Err(_err)) => {} Poll::Ready(Ok(None)) => {} Poll::Pending => {} } } ``` Since this is a mir-opt ICE that seems to quite easy to trigger with real-world crates being affected, let's revert for now and reland the mir-opt after these are fixed.
DianQK
added a commit
to DianQK/rust
that referenced
this pull request
Sep 24, 2024
…ch_scalar, r=cjgillot" This reverts commit 16a0266.
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Sep 25, 2024
Revert "Apply EarlyOtherwiseBranch to scalar value #129047" This reverts PR #129047, commit a772336fb3fbd1fe4493077fcfe04e0221296a99, reversing changes made to 702987f75b74f789ba227ee04a3d7bb1680c2309. cc `@DianQK` and `@cjgillot` as the PR author and reviewer of #129047 respectively. It seems [Apply EarlyOtherwiseBranch to scalar value #129047](rust-lang/rust#129047) may have lead to several nightly regressions: - rust-lang/rust#130769 - rust-lang/rust#130774 - rust-lang/rust#130771 Example test that would ICE with changes in #129047 (this test is included in this PR): ```rs //@ compile-flags: -C opt-level=3 //@ check-pass use std::task::Poll; pub fn poll(val: Poll<Result<Option<Vec<u8>>, u8>>) { match val { Poll::Ready(Ok(Some(_trailers))) => {} Poll::Ready(Err(_err)) => {} Poll::Ready(Ok(None)) => {} Poll::Pending => {} } } ``` Since this is a mir-opt ICE that seems to quite easy to trigger with real-world crates being affected, let's revert for now and reland the mir-opt after these are fixed.
DianQK
added a commit
to DianQK/rust
that referenced
this pull request
Oct 30, 2024
…ch_scalar, r=cjgillot" This reverts commit 16a0266.
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.
In the future, I'm thinking of hoisting discriminant via GVN so that we only need to write very little code here.
r? @cjgillot