Skip to content

Make HandleCycleError an enum instead of a macro-generated closure #101303

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 8, 2022
Merged

Make HandleCycleError an enum instead of a macro-generated closure #101303

merged 1 commit into from
Sep 8, 2022

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Sep 2, 2022

Helps with #96524. Based on #100943 to avoid merge conflicts, so it looks larger than it is (only the last commit is relevant).

cc https://rust-lang.zulipchat.com/#narrow/stream/241847-t-compiler.2Fwg-incr-comp/topic/Moving.20.60Value.60.20to.20rustc_query_system.20.2396524

r? @cjgillot

@jyn514 jyn514 added the A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) label Sep 2, 2022
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 2, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 2, 2022
cjgillot
cjgillot reviewed Sep 2, 2022
View reviewed changes
@cjgillot cjgillot 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 5, 2022
@jyn514
Make HandleCycleError an enum instead of a macro-generated closure
4856aff 
- Add a `HandleCycleError` enum to rustc_query_system, along with a `handle_cycle_error` function
- Move `Value` to rustc_query_system, so `handle_cycle_error` can use it
- Move the `Value` impls from rustc_query_impl to rustc_middle. This is necessary due to orphan rules.
@jyn514 jyn514 force-pushed the jnelson/handle-cycle-enum branch from 09d146c to 4856aff Compare September 7, 2022 00:26
@jyn514
Copy link
Member Author

jyn514 commented Sep 7, 2022

@bors r=cjgillot rollup=never (perf-sensitive)

@bors
Copy link
Collaborator

bors commented Sep 7, 2022

📌 Commit 4856aff has been approved by cjgillot

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 7, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 7, 2022
@Dylan-DPC
Rollup merge of rust-lang#101303 - jyn514:jnelson/handle-cycle-enum, …
5c92971 
…r=cjgillot

Make `HandleCycleError` an enum instead of a macro-generated closure

Helps with rust-lang#96524. Based on rust-lang#100943 to avoid merge conflicts, so it looks larger than it is (only the last commit is relevant).

cc https://rust-lang.zulipchat.com/#narrow/stream/241847-t-compiler.2Fwg-incr-comp/topic/Moving.20.60Value.60.20to.20rustc_query_system.20.2396524

r? `@cjgillot`
@Dylan-DPC Dylan-DPC mentioned this pull request Sep 7, 2022
Closed
@bors
Copy link
Collaborator

bors commented Sep 7, 2022

⌛ Testing commit 4856aff with merge a62340464732372726d292abb0be24a6e2d9b7be...

@bors
Copy link
Collaborator

bors commented Sep 7, 2022

💔 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 Sep 7, 2022
@jyn514
Copy link
Member Author

jyn514 commented Sep 7, 2022

@bors tree closed

GitHub is giving 500s again.

@jyn514
Copy link
Member Author

jyn514 commented Sep 7, 2022

@bors treeclosed

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@jyn514
Copy link
Member Author

jyn514 commented Sep 7, 2022

@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 Sep 7, 2022
@bors
Copy link
Collaborator

bors commented Sep 8, 2022

⌛ Testing commit 4856aff with merge 4af35b8...

@bors
Copy link
Collaborator

bors commented Sep 8, 2022

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 4af35b8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2022
@bors bors merged commit 4af35b8 into rust-lang:master Sep 8, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 8, 2022
This was referenced Sep 8, 2022
Closed
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4af35b8): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

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
cc @rust-lang/wg-compiler-performance

Instruction count

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

mean1 range count2
Regressions ❌
(primary)		 1.2% [1.1%, 1.3%] 2
Regressions ❌
(secondary)		 3.4% [3.1%, 3.9%] 6
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.2% [1.1%, 1.3%] 2

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.

mean1 range count2
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.4% [0.7%, 3.7%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

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.

mean1 range count2
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.7% [2.2%, 3.1%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@rustbot rustbot added the perf-regression Performance regression. label Sep 8, 2022
@rylev
Copy link
Member

rylev commented Sep 8, 2022

The supposed regressions are mostly in keccak, which has been bimodal and noisy lately.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Sep 8, 2022
@jyn514 jyn514 deleted the jnelson/handle-cycle-enum branch September 8, 2022 15:27
@jyn514 jyn514 mentioned this pull request Sep 12, 2022
Closed
6 tasks
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@cjgillot cjgillot cjgillot left review comments

Assignees

@cjgillot cjgillot

Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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.65.0
Development

Successfully merging this pull request may close these issues.
8 participants
@jyn514 @bors @rust-log-analyzer @rust-timer @rylev @cjgillot @rust-highfive @rustbot