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

Put all cached values into a central struct instead of just the stable hash #104898

Merged
merged 6 commits into from
Dec 6, 2022
Merged

Put all cached values into a central struct instead of just the stable hash #104898

merged 6 commits into from
Dec 6, 2022

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Nov 25, 2022 •
edited
Loading

cc @nnethercote

this allows re-use of the type for Predicate without duplicating all the logic for the non-hash cached fields

@rustbot
Copy link
Collaborator

rustbot commented Nov 25, 2022

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @wesleywiser (or someone else) soon.

Please see the contribution instructions for more information.

@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. labels Nov 25, 2022
@oli-obk oli-obk mentioned this pull request Nov 25, 2022
Closed
@oli-obk
Copy link
Contributor Author

oli-obk commented Nov 25, 2022

@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 Nov 25, 2022
@bors
Copy link
Contributor

bors commented Nov 25, 2022

⌛ Trying commit e9dfef805748033935dd80b4ce88bbaa2ae5fa70 with merge 3e281287898e8727c05b969380d5ed98b55c6e79...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Nov 25, 2022

💔 Test failed - checks-actions

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@nnethercote
Copy link
Contributor

@oli-obk: there is no explanation for the motivation here. Is it purely a code cleanup?

@oli-obk
Copy link
Contributor Author

oli-obk commented Nov 28, 2022

Yea, I plan to deduplicate logic between Ty and Predicate (and possibly others in the future). The Predicate work in #94487 duplicates most of the Ty logic

@oli-obk oli-obk changed the title Group all the things Put all cached values into a central struct instead of just the stable hash Nov 28, 2022
@oli-obk oli-obk force-pushed the group_all_the_things branch from e9dfef8 to 6e197aa Compare November 28, 2022 09:42
@oli-obk
Copy link
Contributor Author

oli-obk commented Nov 28, 2022

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Nov 28, 2022

⌛ Trying commit 6e197aa3a0f6c7b0abbde6a83331409859dc1820 with merge 6f33eaffc8ace0ee5b65c8e698225e3cf7fe5f04...

@bors
Copy link
Contributor

bors commented Nov 28, 2022

💔 Test failed - checks-actions

@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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 28, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Nov 28, 2022

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@oli-obk
Copy link
Contributor Author

oli-obk commented Nov 28, 2022

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Nov 28, 2022

⌛ Trying commit d9b02730f2c155451d146f52ef5730579df9cc95 with merge 45e7432821c6706e05c9f8d789635c356cc0c365...

@bors
Copy link
Contributor

bors commented Nov 28, 2022

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

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (45e7432821c6706e05c9f8d789635c356cc0c365): comparison URL.

Overall result: no relevant changes - 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-review -S-waiting-on-perf -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

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)		 - - 0
Regressions ❌
(secondary)		 5.5% [5.5%, 5.5%] 1
Improvements ✅
(primary)		 -2.6% [-2.6%, -2.6%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -2.6% [-2.6%, -2.6%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

@rustbot rustbot added 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 Nov 29, 2022
@oli-obk
Copy link
Contributor Author

oli-obk commented Nov 29, 2022

@bors rollup no perf effect, just a cleanup

@oli-obk oli-obk force-pushed the group_all_the_things branch from d9b0273 to 14a9cf2 Compare November 30, 2022 14:59
@jyn514 jyn514 mentioned this pull request Nov 30, 2022
Closed
wesleywiser
wesleywiser approved these changes Dec 6, 2022
View reviewed changes
Copy link
Member

@wesleywiser wesleywiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! Might be worth checking the rustc dev guide to see if TyS or PredicateS are mentioned there and updating it with the appropriate new type names (for instance: https://rustc-dev-guide.rust-lang.org/memory.html?highlight=predicates#example-tytys).

@wesleywiser
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 6, 2022

📌 Commit 14a9cf2 has been approved by wesleywiser

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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 6, 2022
@oli-obk oli-obk mentioned this pull request Dec 6, 2022
Merged
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 6, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 6, 2022
@bors
Auto merge of rust-lang#105378 - matthiaskrgr:rollup-fjeorw5, r=matth…
b28d30e 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#104898 (Put all cached values into a central struct instead of just the stable hash)
 - rust-lang#105004 (Fix `emit_unused_delims_expr` ICE)
 - rust-lang#105174 (Suggest removing struct field from destructive binding only in shorthand scenario)
 - rust-lang#105250 (Replace usage of `ResumeTy` in async lowering with `Context`)
 - rust-lang#105286 (Add -Z maximal-hir-to-mir-coverage flag)
 - rust-lang#105320 (rustdoc: simplify CSS selectors on top-doc and non-exhaustive toggles)
 - rust-lang#105349 (Point at args in associated const fn pointers)
 - rust-lang#105362 (Cleanup macro-expanded code in `rustc_type_ir`)
 - rust-lang#105370 (Remove outdated syntax from trait alias pretty printing)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit db416ea into rust-lang:master Dec 6, 2022
@rustbot rustbot added this to the 1.67.0 milestone Dec 6, 2022
@oli-obk oli-obk deleted the group_all_the_things branch March 8, 2023 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@wesleywiser wesleywiser

Labels
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.67.0
Development

Successfully merging this pull request may close these issues.
7 participants
@oli-obk @rustbot @rust-timer @bors @rust-log-analyzer @nnethercote @wesleywiser