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

Rollup of 3 pull requests #117564

Merged
merged 15 commits into from
Nov 4, 2023
Merged

Rollup of 3 pull requests #117564

merged 15 commits into from
Nov 4, 2023

Conversation

TaKO8Ki
Copy link
Member

@TaKO8Ki TaKO8Ki commented Nov 4, 2023

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Nadrieril and others added 15 commits November 2, 2023 03:19
@Nadrieril
Reorder
fedee8d
@Nadrieril
Uncomplicate check_let_chain
1f9a2f7
@Nadrieril
Check pattern error while lowering
380c56c
@Nadrieril
Tweak diagnostic for consistency
d95f6a9
@Nadrieril
Add regression test for pattern checks
b60f08a
@Nadrieril
Always do all the pattern checks
c198569
@Nadrieril
Factor out pointing at ADT definition
fcd24fb
@Nadrieril
Cleanup check_match code paths
3760d91
@cuviper
Use filter_map in try_par_for_each_in
3984914 
This simplifies the expression, especially for the rayon part, and also
lets us drop the `E: Copy` constraint.
@Nadrieril
Accumulate let chains alongside the visit
335156c
@Nadrieril
Tweak spans for "adt defined here" note
746197c
@durin42
consts: remove dead code around i1 constant values
f8daa7d 
`LLVMConstZext` recently got deleted, and it turns out (thanks to @nikic
for knowing!) that this is dead code. Tests all pass for me without this
logic, and per nikic:

> We always generate constants in "relocatable bag of bytes"
> representation, so you're never going to get a plain bool.

So this should be a safe thing to do.

r? @nikic
@rustbot label: +llvm-main
@TaKO8Ki
Rollup merge of rust-lang#117343 - Nadrieril:cleanup_check_match, r=d…
9b9ea77 
…avidtwco

Cleanup `rustc_mir_build/../check_match.rs`

The file had become pretty unwieldy, with a fair amount of duplication. As a bonus, I discovered that we weren't running some pattern checks in if-let chains.

I recommend looking commit-by-commit. The last commit is a whim, I think it makes more sense that way but I don't hold this opinion strongly.
@TaKO8Ki
Rollup merge of rust-lang#117550 - cuviper:try_par_for_each_in, r=est31
c9c8513 
Use `filter_map` in `try_par_for_each_in`

This simplifies the expression, especially for the rayon part, and also
lets us drop the `E: Copy` constraint.
@TaKO8Ki
Rollup merge of rust-lang#117554 - durin42:llvm-delete-dead-zext-code…
c55bf0e 
…, r=nikic

consts: remove dead code around `i1` constant values

`LLVMConstZext` recently got deleted, and it turns out (thanks to `@nikic` for knowing!) that this is dead code. Tests all pass for me without this logic, and per nikic:

> We always generate constants in "relocatable bag of bytes"
> representation, so you're never going to get a plain bool.

So this should be a safe thing to do.

r? `@nikic`
`@rustbot` label: +llvm-main
@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. rollup A PR which is a rollup labels Nov 4, 2023
@TaKO8Ki
Copy link
Member Author

TaKO8Ki commented Nov 4, 2023

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Nov 4, 2023

📌 Commit c55bf0e has been approved by TaKO8Ki

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 Nov 4, 2023
@bors
Copy link
Contributor

bors commented Nov 4, 2023

⌛ Testing commit c55bf0e with merge a9b03ff...

@bors
Copy link
Contributor

bors commented Nov 4, 2023

☀️ Test successful - checks-actions
Approved by: TaKO8Ki
Pushing a9b03ff to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2023
@bors bors merged commit a9b03ff into rust-lang:master Nov 4, 2023
12 checks passed
@rustbot rustbot added this to the 1.75.0 milestone Nov 4, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#117343 Cleanup rustc_mir_build/../check_match.rs 0da9b3241f610033230527c98da310ee6d0d1402 (link)
#117550 Use filter_map in try_par_for_each_in c92292282b1751e3de7f455df912d47b4fe9f59f (link)
#117554 consts: remove dead code around i1 constant values a8d56031e73c3773dc15d42a7018dd5d9db1b9c3 (link)

previous master: 3aaa0f57b7

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

This was referenced Nov 4, 2023
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a9b03ff): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

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
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -9.6% [-15.4%, -3.0%] 4
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -9.6% [-15.4%, -3.0%] 4

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.1% [0.5%, 1.6%] 3
Regressions ❌
(secondary)		 3.8% [2.8%, 4.7%] 2
Improvements ✅
(primary)		 -0.7% [-0.9%, -0.4%] 3
Improvements ✅
(secondary)		 -2.2% [-4.9%, -1.2%] 4
All ❌✅ (primary) 0.2% [-0.9%, 1.6%] 6

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
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -6.6% [-13.4%, -0.4%] 5
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -6.6% [-13.4%, -0.4%] 5

Binary size

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

Bootstrap: 635.62s -> 635.227s (-0.06%)
Artifact size: 304.43 MiB -> 304.46 MiB (0.01%)

@github-actions github-actions bot mentioned this pull request Nov 6, 2023
Merged
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Nov 6, 2023
@bors-ferrocene @BenWiederhake
@SabrinaJewson @J-ZhengLi @koka831 @bjorn3 @joshlf @lengyijun @Zalathar @oli-obk @flip1995 @y21 @bors @bvanjoi
Merge #84
a01e81f 
84: Automated pull from upstream `master` r=Dajamante a=github-actions[bot]


This PR pulls the following changes from the upstream repository:

* rust-lang/rust#117585
* rust-lang/rust#117576
* rust-lang/rust#96979
* rust-lang/rust#117191
* rust-lang/rust#117179
* rust-lang/rust#117574
* rust-lang/rust#117537
* rust-lang/rust#117608
  * rust-lang/rust#117596
  * rust-lang/rust#117588
  * rust-lang/rust#117524
  * rust-lang/rust#116017
* rust-lang/rust#117504
* rust-lang/rust#117469
* rust-lang/rust#116218
* rust-lang/rust#117589
* rust-lang/rust#117581
* rust-lang/rust#117503
* rust-lang/rust#117590
  * rust-lang/rust#117583
  * rust-lang/rust#117570
  * rust-lang/rust#117562
  * rust-lang/rust#117534
  * rust-lang/rust#116894
  * rust-lang/rust#110340
* rust-lang/rust#113343
* rust-lang/rust#117579
* rust-lang/rust#117094
* rust-lang/rust#117566
* rust-lang/rust#117564
  * rust-lang/rust#117554
  * rust-lang/rust#117550
  * rust-lang/rust#117343
* rust-lang/rust#115274
* rust-lang/rust#117540
* rust-lang/rust#116412
* rust-lang/rust#115333
* rust-lang/rust#117507
* rust-lang/rust#117538
  * rust-lang/rust#117533
  * rust-lang/rust#117523
  * rust-lang/rust#117520
  * rust-lang/rust#117505
  * rust-lang/rust#117434
* rust-lang/rust#117535
* rust-lang/rust#117510
* rust-lang/rust#116439
* rust-lang/rust#117508



Co-authored-by: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
Co-authored-by: SabrinaJewson <sejewson@gmail.com>
Co-authored-by: J-ZhengLi <lizheng135@huawei.com>
Co-authored-by: koka <koka.code@gmail.com>
Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Co-authored-by: Joshua Liebow-Feeser <joshlf@users.noreply.github.com>
Co-authored-by: lengyijun <sjtu5140809011@gmail.com>
Co-authored-by: Zalathar <Zalathar@users.noreply.github.com>
Co-authored-by: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Co-authored-by: Philipp Krones <hello@philkrones.com>
Co-authored-by: y21 <30553356+y21@users.noreply.github.com>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: bohan <bohan-zhang@foxmail.com>
@Nadrieril
Copy link
Member

From measurements done elsewhere I'm fairly confident the perf improvements come from #117343. Idk if you need perf triage for improvements though ^^

@TaKO8Ki TaKO8Ki deleted the rollup-lkqhpqc branch November 12, 2023 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.75.0
Development

Successfully merging this pull request may close these issues.
7 participants
@TaKO8Ki @bors @rust-timer @Nadrieril @rustbot @cuviper @durin42