Skip to content

Conversation

compiler-errors
Copy link
Member

The last big change in the series.

I will follow-up with additional filed issues once this PR lands:

  • Investigate making TypeFoldable<TyCtxt<'tcx>> for ty::Clause<'tcx> implementation less weird:
    .expect("no sensible folder would do this"))
  • Clean up the elaborator since it should only be emitting child clauses, not predicates
  • Rename identifiers like pred and predicates to clause if they're actually clauses around the codebase
  • Validate that all of the ToPredicate impls are acutally still needed, or prune them if they're not

r? @ghost until the other branch lands

@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 Jun 22, 2023
@compiler-errors compiler-errors changed the title Migrate predicates_of and caller_bounds to Clause Migrate TyCtxt::predicates_of and ParamEnv::caller_bounds to Clause Jun 22, 2023
@compiler-errors compiler-errors marked this pull request as ready for review June 24, 2023 02:55
@rustbot
Copy link
Collaborator

rustbot commented Jun 24, 2023

Some changes occurred to the core trait solver

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

Some changes occurred in const_evaluatable.rs

cc @BoxyUwU

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@compiler-errors
Copy link
Member Author

r? @oli-obk or @lcnr

@bors
Copy link
Collaborator

bors commented Jun 24, 2023

☔ The latest upstream changes (presumably #112987) made this pull request unmergeable. Please resolve the merge conflicts.

Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

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

r=me after rebase

@compiler-errors
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Jun 26, 2023

📌 Commit 374173c has been approved by oli-obk

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 26, 2023
@bors
Copy link
Collaborator

bors commented Jun 27, 2023

⌛ Testing commit 374173c with merge b5e51db...

@bors
Copy link
Collaborator

bors commented Jun 27, 2023

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing b5e51db to master...

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b5e51db): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.5% [0.5%, 0.5%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.9% [-1.3%, -0.7%] 6
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.7% [-1.3%, 0.5%] 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)
1.7% [1.0%, 2.5%] 11
Regressions ❌
(secondary)
2.8% [2.6%, 3.0%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.7% [1.0%, 2.5%] 11

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)
4.5% [1.5%, 8.6%] 8
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.6% [-4.2%, -3.0%] 3
Improvements ✅
(secondary)
-3.0% [-4.4%, -2.0%] 5
All ❌✅ (primary) 2.3% [-4.2%, 8.6%] 11

Binary size

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

Bootstrap: 661.833s -> 661.464s (-0.06%)

@rustbot rustbot added the perf-regression Performance regression. label Jun 27, 2023
@lqd
Copy link
Member

lqd commented Jun 27, 2023

cargo and bitmaps noise, stabilizing from the previous merge.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 27, 2023
floriangru added a commit to floriangru/creusot that referenced this pull request Jul 6, 2023
it's quite unsightly and maybe it would be better to use directly Clauses instead of Predicates (from rustc_middle::ty),
Also, it might be the reason the translation is a bit shuffled, so, maybe it would be better to change those modifications
@compiler-errors compiler-errors deleted the clause-3 branch August 11, 2023 19:56
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. 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. 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
Development

Successfully merging this pull request may close these issues.

6 participants