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

proof tree nits #112835

Merged
merged 3 commits into from
Jun 20, 2023
Merged

proof tree nits #112835

merged 3 commits into from
Jun 20, 2023

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jun 20, 2023

@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 labels Jun 20, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jun 20, 2023

Some changes occurred to the core trait solver

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

@BoxyUwU
Copy link
Member

BoxyUwU commented Jun 20, 2023

@bors rollup=never p=1 (likely to conflict)
r=me if using the flag on the example in rust-lang/trait-system-refactor-initiative#25 gives the same results as it did in #112351

@lcnr
Copy link
Contributor Author

lcnr commented Jun 20, 2023

@bors r=BoxyUwU

test is the same modulo changes to DefId paths 😁

@bors
Copy link
Contributor

bors commented Jun 20, 2023

📌 Commit e4b171a has been approved by BoxyUwU

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 Jun 20, 2023
@compiler-errors
Copy link
Member

@bors rollup- im gonna try this in a rollup

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jun 20, 2023
@klensy
Copy link
Contributor

klensy commented Jun 20, 2023

#[derive(Eq, PartialEq, Debug, Hash, HashStable)]
pub enum CandidateKind<'tcx> {
/// Probe entered when normalizing the self ty during candidate assembly
NormalizedSelfTyAssembly,
/// A normal candidate for proving a goal
Candidate { name: String, result: QueryResult<'tcx> },
}

Noticed while looking pr diff: currently name always static string, but allocated as String everywhere, maybe change it to str?

@bors
Copy link
Contributor

bors commented Jun 20, 2023

⌛ Testing commit e4b171a with merge 4651421...

@lcnr
Copy link
Contributor Author

lcnr commented Jun 20, 2023

Noticed while looking pr diff: currently name always static string, but allocated as String everywhere, maybe change it to str?

yeah, or well, the goal is to replace it with an enum (and add fn probe_candidate which takes a CandidateKind directly).

@bors
Copy link
Contributor

bors commented Jun 20, 2023

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing 4651421 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 20, 2023
@bors bors merged commit 4651421 into rust-lang:master Jun 20, 2023
11 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 20, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4651421): 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.

mean range count
Regressions ❌
(primary)
0.7% [0.3%, 0.9%] 7
Regressions ❌
(secondary)
1.2% [0.5%, 1.7%] 10
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.7% [0.3%, 0.9%] 7

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)
2.3% [2.3%, 2.3%] 1
Improvements ✅
(primary)
-1.7% [-3.6%, -0.6%] 10
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.7% [-3.6%, -0.6%] 10

Cycles

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

Binary size

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

Bootstrap: 657.004s -> 657.077s (0.01%)

@rustbot rustbot added the perf-regression Performance regression. label Jun 21, 2023
@BoxyUwU BoxyUwU removed the perf-regression Performance regression. label Jun 21, 2023
@BoxyUwU
Copy link
Member

BoxyUwU commented Jun 21, 2023

this doesn't even touch any code run by benchmarks its entirely new solver

@lqd
Copy link
Member

lqd commented Jun 21, 2023

Yeah it could just be the inlining noise happening even by simply looking at the old trait solver in a way it doesn't like. Similar to how #112351 also improved these same benchmarks unexpectedly (and this could be them returning to their steady state, which I feel is likely here).

I myself don't know what is old or new solver from the diff, or what is shared between the two, so maybe the weekly triage will see something we don't -- but most likely they can just mark this as triaged from your comment.


update: it does look like returning to previous values.

image

@lcnr lcnr deleted the proof-tree-nits branch June 21, 2023 12: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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants