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.

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

next solver: provisional cache #119735

Merged
merged 7 commits into from
Jan 12, 2024
Merged

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jan 8, 2024

this adds the cache removed in #115843. However, it should now correctly track whether a provisional result depends on an inductive or coinductive stack.

While working on this, I was using the following doc: https://hackmd.io/VsQPjW3wSTGUSlmgwrDKOA. I don't think it's too helpful to understanding this, but am somewhat hopeful that the inline comments are more useful.

There are quite a few future perf improvements here. Given that this is already very involved I don't believe it is worth it (for now). While working on this PR one of my few attempts to significantly improve perf ended up being unsound again because I was not careful enough ✨

r? @compiler-errors

lcnr added 3 commits January 8, 2024 10:19
results in slightly cleaner logic while making the following commit easier
don't really know why, but it is a lot easier for me to think
about cycles that way.
@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jan 8, 2024
@lcnr lcnr force-pushed the provisional-cache-readd branch from 72a813a to 118453c Compare January 9, 2024 08:16
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@lcnr lcnr force-pushed the provisional-cache-readd branch from e352079 to 4be4c66 Compare January 9, 2024 10:19
@lcnr lcnr marked this pull request as ready for review January 9, 2024 10:21
@rustbot
Copy link
Collaborator

rustbot commented Jan 9, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@lcnr lcnr force-pushed the provisional-cache-readd branch 3 times, most recently from 0c22b1e to 0b321b6 Compare January 9, 2024 10:52
@lcnr lcnr force-pushed the provisional-cache-readd branch from 0b321b6 to 242633f Compare January 9, 2024 10:53
@rust-log-analyzer

This comment has been minimized.

@compiler-errors
Copy link
Member

🙈

@bors r+ rollup (new solver only)

@bors
Copy link
Contributor

bors commented Jan 11, 2024

📌 Commit 13aa900 has been approved by compiler-errors

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 Jan 11, 2024
@bors
Copy link
Contributor

bors commented Jan 12, 2024

⌛ Testing commit 13aa900 with merge 2b1365b...

@bors
Copy link
Contributor

bors commented Jan 12, 2024

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 2b1365b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 12, 2024
@bors bors merged commit 2b1365b into rust-lang:master Jan 12, 2024
12 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Jan 12, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2b1365b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -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)
1.3% [1.3%, 1.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.1% [-1.1%, -1.1%] 1
All ❌✅ (primary) 1.3% [1.3%, 1.3%] 1

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.9% [0.5%, 1.8%] 4
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.9% [0.5%, 1.8%] 4

Binary size

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

Bootstrap: 666.39s -> 666.917s (0.08%)
Artifact size: 308.38 MiB -> 308.37 MiB (-0.00%)

@lcnr lcnr deleted the provisional-cache-readd branch January 12, 2024 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants