Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eliminate ConstnessAnd again #91549

Merged
merged 10 commits into from
Dec 13, 2021
Merged

Eliminate ConstnessAnd again #91549

merged 10 commits into from
Dec 13, 2021

Conversation

fee1-dead
Copy link
Member

Closes #91489.
Closes #89432.

Reverts #91491.
Reverts #89450.

r? @spastorino

@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 5, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Dec 5, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Dec 5, 2021

📌 Commit 2304b061e4daf677f4ffc16f138ca82dd6b9d879 has been approved by oli-obk

@bors 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 Dec 5, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Dec 5, 2021

@bors r-

Should check whether this also solves the duplicate query evals

@bors 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 Dec 5, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Dec 5, 2021

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Dec 5, 2021
@bors
Copy link
Contributor

bors commented Dec 5, 2021

⌛ Trying commit 2304b061e4daf677f4ffc16f138ca82dd6b9d879 with merge 826335d7ca7f2dac1507ef05f329437f4ebe6caf...

@bors
Copy link
Contributor

bors commented Dec 5, 2021

☀️ Try build successful - checks-actions
Build commit: 826335d7ca7f2dac1507ef05f329437f4ebe6caf (826335d7ca7f2dac1507ef05f329437f4ebe6caf)

@rust-timer
Copy link
Collaborator

Queued 826335d7ca7f2dac1507ef05f329437f4ebe6caf with parent 6c189bc, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (826335d7ca7f2dac1507ef05f329437f4ebe6caf): comparison url.

Summary: This change led to moderate relevant regressions 😿 in compiler performance.

  • Moderate regression in instruction counts (up to 1.1% on incr-patched: b9b3e592dd cherry picked builds of style-servo)

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

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf +perf-regression

@rustbot rustbot added perf-regression Performance regression. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Dec 5, 2021
@fee1-dead fee1-dead marked this pull request as draft December 5, 2021 17:39
@fee1-dead
Copy link
Member Author

Requesting another perf run as I have tried to improve performance in recent commits.

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Dec 5, 2021
@bors
Copy link
Contributor

bors commented Dec 5, 2021

⌛ Trying commit 3eaadbda9403bd62c9c56725df9ccae8228b3077 with merge 8a028f2d4744e089b8bdd970a21eb062f830255b...

@bors
Copy link
Contributor

bors commented Dec 5, 2021

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

@bors
Copy link
Contributor

bors commented Dec 5, 2021

☀️ Try build successful - checks-actions
Build commit: 8a028f2d4744e089b8bdd970a21eb062f830255b (8a028f2d4744e089b8bdd970a21eb062f830255b)

@rust-timer
Copy link
Collaborator

Queued 8a028f2d4744e089b8bdd970a21eb062f830255b with parent 1597728, future comparison URL.

@fee1-dead
Copy link
Member Author

@bors r=spastorino

@bors
Copy link
Contributor

bors commented Dec 12, 2021

📌 Commit ffc9082 has been approved by spastorino

@bors 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 Dec 12, 2021
@bors
Copy link
Contributor

bors commented Dec 12, 2021

⌛ Testing commit ffc9082 with merge 22f8bde...

@bors
Copy link
Contributor

bors commented Dec 13, 2021

☀️ Test successful - checks-actions
Approved by: spastorino
Pushing 22f8bde to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 13, 2021
@bors bors merged commit 22f8bde into rust-lang:master Dec 13, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 13, 2021
This was referenced Dec 13, 2021
Closed
Merged
Closed
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (22f8bde): comparison url.

Summary: This change led to large relevant regressions 😿 in compiler performance.

  • Large regression in instruction counts (up to 3.1% on full builds of inflate)

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

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

@fee1-dead fee1-dead deleted the const_env branch December 13, 2021 04:51
@fee1-dead fee1-dead removed the perf-regression-triaged The performance regression has been triaged. label Dec 14, 2021
@fee1-dead
Copy link
Member Author

@rustbot label: +perf-regression-triaged

The only change between the last perf triage comment and the regression after the merge is a rebase. The exact cause is unknown, but I'm speculating CGU division and/or inlining differences. The regressions aren't "noise", but some of them are not related to the visible changes this PR has. this is like #87688 (comment), but the exact details could differ.

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Dec 14, 2021
flip1995 pushed a commit to flip1995/rust that referenced this pull request Dec 17, 2021
@bors
Auto merge of rust-lang#91549 - fee1-dead:const_env, r=spastorino
41c48bd 
Eliminate ConstnessAnd again

Closes rust-lang#91489.
Closes rust-lang#89432.

Reverts rust-lang#91491.
Reverts rust-lang#89450.

r? `@spastorino`
JohnTitor added a commit to JohnTitor/rust-semverver that referenced this pull request Apr 15, 2022
@JohnTitor
Rustup to rust-lang/rust#91549
305a346
@fee1-dead fee1-dead added the F-const_trait_impl `#![feature(const_trait_impl)]` label Jul 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@spastorino spastorino

Labels
F-const_trait_impl `#![feature(const_trait_impl)]` merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.59.0
9 participants
@fee1-dead @rust-highfive @oli-obk @bors @rust-timer @spastorino @apiraino @rustbot @SNCPlay42