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

Don't pass TreatProjections separately to fast_reject #109202

Merged
merged 1 commit into from
Mar 24, 2023
Merged

Don't pass TreatProjections separately to fast_reject #109202

merged 1 commit into from
Mar 24, 2023

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Mar 16, 2023 •
edited
Loading

Don't pass TreatProjections separately to fast_reject, and instead use the original approach of switching on two variants of TreatParams (undoes this: #108830 (review)).

Fixes the regression introduced in #108830 (comment)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Mar 16, 2023
@compiler-errors
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 16, 2023
@bors
Copy link
Contributor

bors commented Mar 16, 2023

⌛ Trying commit e41f3b743dad3e22a630a78a3afb09d611cffa9d with merge e0299011ffe5158445068f2f78490cad2ce56261...

@compiler-errors compiler-errors changed the title New solver fast reject faster 2 Yet another attempt to mitigate regression due to changes to fast-reject Mar 16, 2023
@bors
Copy link
Contributor

bors commented Mar 16, 2023

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

1 similar comment
@bors
Copy link
Contributor

bors commented Mar 16, 2023

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

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e0299011ffe5158445068f2f78490cad2ce56261): comparison URL.

Overall result: ✅ improvements - no action needed

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 may lead to changes in compiler perf.

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

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.1% [-2.6%, -0.8%] 13
Improvements ✅
(secondary)		 -3.5% [-10.4%, -0.7%] 16
All ❌✅ (primary) -1.1% [-2.6%, -0.8%] 13

Max RSS (memory usage)

Results

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.

mean range count
Regressions ❌
(primary)		 2.2% [2.2%, 2.2%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.7% [-1.7%, -1.7%] 1
Improvements ✅
(secondary)		 -5.6% [-11.7%, -2.7%] 6
All ❌✅ (primary) 0.3% [-1.7%, 2.2%] 2

Cycles

Results

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.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.4% [-3.1%, -1.6%] 2
Improvements ✅
(secondary)		 -3.7% [-8.1%, -1.5%] 11
All ❌✅ (primary) -2.4% [-3.1%, -1.6%] 2

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 17, 2023
@compiler-errors
Copy link
Member Author

ok, so the old appproach is not a perf regression then. I'll adapt this with better naming and stuff, cc @lcnr

@compiler-errors compiler-errors force-pushed the new-solver-fast-reject-faster-2 branch from e41f3b7 to 2307b97 Compare March 17, 2023 19:32
@compiler-errors
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 17, 2023
@bors
Copy link
Contributor

bors commented Mar 17, 2023

⌛ Trying commit 2307b9787680a3a5ff987485acfe5330ffbc1ca6 with merge 81d64ee4c50a4314379d8182a7dfb96c22449231...

@bors
Copy link
Contributor

bors commented Mar 17, 2023

☀️ Try build successful - checks-actions
Build commit: 81d64ee4c50a4314379d8182a7dfb96c22449231 (81d64ee4c50a4314379d8182a7dfb96c22449231)

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (81d64ee4c50a4314379d8182a7dfb96c22449231): comparison URL.

Overall result: ✅ improvements - no action needed

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 may lead to changes in compiler perf.

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

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 1.0% [1.0%, 1.0%] 1
Improvements ✅
(primary)		 -1.0% [-2.5%, -0.5%] 15
Improvements ✅
(secondary)		 -3.5% [-10.4%, -0.7%] 16
All ❌✅ (primary) -1.0% [-2.5%, -0.5%] 15

Max RSS (memory usage)

Results

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.

mean range count
Regressions ❌
(primary)		 2.3% [2.2%, 2.4%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.9% [-2.1%, -1.8%] 3
Improvements ✅
(secondary)		 -4.8% [-10.1%, -2.4%] 7
All ❌✅ (primary) -0.2% [-2.1%, 2.4%] 5

Cycles

Results

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.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.9% [-2.4%, -1.6%] 3
Improvements ✅
(secondary)		 -4.1% [-8.9%, -1.5%] 9
All ❌✅ (primary) -1.9% [-2.4%, -1.6%] 3

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 18, 2023
@compiler-errors
Copy link
Member Author

Cool, regression seems mitiagated.

r? @lcnr

@compiler-errors compiler-errors marked this pull request as ready for review March 18, 2023 21:52
@compiler-errors compiler-errors changed the title Yet another attempt to mitigate regression due to changes to fast-reject Don't pass TreatProjections separately to fast_reject Mar 18, 2023
@bors
Copy link
Contributor

bors commented Mar 23, 2023

⌛ Testing commit f8eb062be3d5b47f06888da223c78c5330c52906 with merge 3b082161ae5fc239b0b89db2b0036dfffccc5332...

@bors
Copy link
Contributor

bors commented Mar 23, 2023

💔 Test failed - checks-actions

@bors 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 Mar 23, 2023
@compiler-errors
Copy link
Member Author

spurious

@bors retry

@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 Mar 23, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Mar 23, 2023

⌛ Testing commit f8eb062be3d5b47f06888da223c78c5330c52906 with merge 34f97a8d40526ef74c8b2a42ce20d9e78eeca3c4...

@bors
Copy link
Contributor

bors commented Mar 23, 2023

💔 Test failed - checks-actions

@bors 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 Mar 23, 2023
@compiler-errors compiler-errors force-pushed the new-solver-fast-reject-faster-2 branch from f8eb062 to fc0cbe8 Compare March 23, 2023 18:57
@compiler-errors
Copy link
Member Author

What the heck does this PR have to do with LLVM build on mingw?!

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Mar 23, 2023

📌 Commit fc0cbe8 has been approved by lcnr

It is now in the queue for this repository.

@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 Mar 23, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@matthiaskrgr
Copy link
Member

@compiler-errors this happens like 3-6 times a day on random prs :(
#108227

@compiler-errors
Copy link
Member Author

@matthiaskrgr thanks, just confused why it happens on my pr repeatedly 😆 i'll just keep re-queueing it until it passes i guess

@bors
Copy link
Contributor

bors commented Mar 23, 2023

⌛ Testing commit fc0cbe8 with merge cf073ec...

@bors
Copy link
Contributor

bors commented Mar 24, 2023

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing cf073ec to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 24, 2023
@bors bors merged commit cf073ec into rust-lang:master Mar 24, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 24, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cf073ec): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.4% [0.4%, 0.4%] 1
Improvements ✅
(primary)		 -0.9% [-2.3%, -0.2%] 17
Improvements ✅
(secondary)		 -2.6% [-10.5%, -0.4%] 24
All ❌✅ (primary) -0.9% [-2.3%, -0.2%] 17

Max RSS (memory usage)

Results

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.

mean range count
Regressions ❌
(primary)		 3.3% [3.1%, 3.6%] 2
Regressions ❌
(secondary)		 2.7% [0.8%, 4.7%] 32
Improvements ✅
(primary)		 -1.8% [-2.4%, -1.4%] 6
Improvements ✅
(secondary)		 -4.6% [-8.5%, -0.5%] 4
All ❌✅ (primary) -0.5% [-2.4%, 3.6%] 8

Cycles

Results

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.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 1.4% [0.9%, 1.8%] 2
Improvements ✅
(primary)		 -2.1% [-2.8%, -1.2%] 3
Improvements ✅
(secondary)		 -2.0% [-8.6%, -0.5%] 26
All ❌✅ (primary) -2.1% [-2.8%, -1.2%] 3

@compiler-errors compiler-errors deleted the new-solver-fast-reject-faster-2 branch August 11, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

Labels
merged-by-bors This PR was explicitly merged by bors. 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
7 participants
@compiler-errors @rust-timer @bors @rust-log-analyzer @matthiaskrgr @lcnr @rustbot