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 8 pull requests #107768

Merged
merged 16 commits into from
Feb 8, 2023
Merged

Rollup of 8 pull requests #107768

merged 16 commits into from
Feb 8, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 16 commits February 6, 2023 09:06
@WaffleLapkin
Remove arena_cache modifier from upstream_monomorphizations_for
23412dd
@oli-obk
Avoid locking the global context across the after_expansion callback
0ddf249
@Nathan-Fenner
Split fn_ctxt/adjust_fulfillment_errors from fn_ctxt/checks
4c05366
@tshepang
allow quick-edit convenience
63dc0b8
@tshepang
make more readable
a002c05
@lcnr
remove binder from query constraints
a04f31d
@RalfJung
miri: fix ICE when running out of address space
2900ba1
@maurer
llvm-16: Use Triple.h from new header location.
147c51e 
LLVM 16 has moved Triple.h from ADT and into TargetParser
@matthiaskrgr
Rollup merge of rust-lang#107719 - WaffleLapkin:de-arena-allocates-yo…
401fe5c 
…u-UwU, r=cjgillot

Remove `arena_cache` modifier from `upstream_monomorphizations_for`

Arena-caching a pointer is pretty meaningless as far as I can tell.
@matthiaskrgr
Rollup merge of rust-lang#107740 - oli-obk:lock_tcx, r=petrochenkov
8709e9b 
Avoid locking the global context across the `after_expansion` callback

r? `@petrochenkov`

This was noticed in model-checking/kani#2184 (comment)

This didn't have a perf impact, as it's just an additional 2 or 3 RefCell locks being created.
@matthiaskrgr
Rollup merge of rust-lang#107746 - Nathan-Fenner:nathanf/clean-up-adj…
cf7aa57 
…ust_fulfillment_errors, r=compiler-errors

Split fn_ctxt/adjust_fulfillment_errors from fn_ctxt/checks

This is a follow-up from rust-lang#106477, addressing a small number of the `FIXME`s that were added, by moving some functions into the new(er) `adjust_fulfillment_errors` module.

More cleanup is possible for this file (and I'll hopefully get around to doing some of that soon) but the very first thing is to just move these functions out.

There should be no "real" changes in this PR, besides minor adjustments to imports and the functions being transferred.
@matthiaskrgr
Rollup merge of rust-lang#107749 - tshepang:editing-convenience, r=mi…
c149682 
…chaelwoerister

allow quick-edit convenience
@matthiaskrgr
Rollup merge of rust-lang#107750 - tshepang:readability, r=GuillaumeG…
26b532f 
…omez

make more readable
@matthiaskrgr
Rollup merge of rust-lang#107755 - lcnr:no-binder, r=oli-obk
505d05d 
remove binder from query constraints

r? types
@matthiaskrgr
Rollup merge of rust-lang#107756 - RalfJung:miri-out-of-addresses, r=…
d044c1b 
…oli-obk

miri: fix ICE when running out of address space

Fixes rust-lang/miri#2769
r? `@oli-obk`

I didn't add a test since that requires oli-obk/ui_test#38 (host must be 64bit and target 32bit). Also the test takes ~30s, so I am not sure if we want to have it in the test suite?
@matthiaskrgr
Rollup merge of rust-lang#107764 - maurer:llvm-16, r=cuviper
232213d 
llvm-16: Use Triple.h from new header location.

LLVM 16 has moved Triple.h from ADT and into TargetParser.

LLVM [landed a commit](llvm/llvm-project@62c7f03) this morning moving the header. This change should make rustc continue to build against 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 Feb 7, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Feb 7, 2023

📌 Commit 232213d has been approved by matthiaskrgr

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

bors commented Feb 7, 2023

⌛ Testing commit 232213d with merge 3f059f6...

@bors
Copy link
Contributor

bors commented Feb 8, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 3f059f6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 8, 2023
@bors bors merged commit 3f059f6 into rust-lang:master Feb 8, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 8, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#107764 50c21a84c6bfcbfd3980b6b8091bf2fc452e6360
#107756 b7ba6111317121b7e746bf2d80ff928454ff977d
#107755 714f77261ee2f3c80f0c9903939ace84cf060fc4
#107750 eed5f9aea547b88e9d31c4ce354c2c4f5baf8d99
#107749 321aa22d2e44796152fd683778e14cbee7fafb10
#107746 b9641bc999f66e9f6ae356928dfcb5438c6d0905
#107740 8a431d0da68087275ca528ca5eb8cba61b522d5a
#107719 e3691ec17fad154ff5ef578c5fadcfea71fa8344

previous master: bd39bbb4bb

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

@bors bors mentioned this pull request Feb 8, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3f059f6): 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
Regressions ❌
(secondary)		 1.7% [1.7%, 1.7%] 2
Improvements ✅
(primary)		 -1.0% [-1.5%, -0.4%] 3
Improvements ✅
(secondary)		 -3.7% [-4.2%, -3.2%] 6
All ❌✅ (primary) -1.0% [-1.5%, -0.4%] 3

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.7% [2.2%, 3.2%] 2
Improvements ✅
(primary)		 -1.8% [-3.9%, -0.6%] 3
Improvements ✅
(secondary)		 -4.3% [-4.3%, -4.3%] 1
All ❌✅ (primary) -1.8% [-3.9%, -0.6%] 3

Cycles

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

@rustbot rustbot added the perf-regression Performance regression. label Feb 8, 2023
@rylev
Copy link
Member

rylev commented Feb 14, 2023 •
edited
Loading

Small number of regressions in secondary benchmarks in a rollup - I think we're fine calling this triaged.

@rustbot label: perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Feb 14, 2023
@matthiaskrgr matthiaskrgr deleted the rollup-9u4cal4 branch March 16, 2024 18:18
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. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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.69.0
Development

Successfully merging this pull request may close these issues.