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

Make allocator_kind a query. #85909

Merged
merged 3 commits into from
Jun 28, 2021
Merged

Make allocator_kind a query. #85909

merged 3 commits into from
Jun 28, 2021

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jun 1, 2021

Part of #85153

r? @Aaron1011

@rust-highfive
Copy link
Collaborator

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2021
@cjgillot
Copy link
Contributor Author

cjgillot commented Jun 1, 2021

Let's be prudent this time.
@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 1, 2021
@bors
Copy link
Contributor

bors commented Jun 1, 2021

⌛ Trying commit 3a493f62b7a18de3440c1154e2deaa372044e418 with merge b114126504443321b47bdcfff7ea2fa23f2b8bfe...

@bors
Copy link
Contributor

bors commented Jun 1, 2021

☀️ Try build successful - checks-actions
Build commit: b114126504443321b47bdcfff7ea2fa23f2b8bfe (b114126504443321b47bdcfff7ea2fa23f2b8bfe)

@rust-timer
Copy link
Collaborator

Queued b114126504443321b47bdcfff7ea2fa23f2b8bfe with parent 7f9ab03, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (b114126504443321b47bdcfff7ea2fa23f2b8bfe): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 2, 2021
@Aaron1011
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 2, 2021

📌 Commit 3a493f62b7a18de3440c1154e2deaa372044e418 has been approved by Aaron1011

@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 2, 2021
@bors
Copy link
Contributor

bors commented Jun 2, 2021

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2021
@cjgillot
Copy link
Contributor Author

cjgillot commented Jun 2, 2021

Rebased
@bors r=Aaron1011

@bors
Copy link
Contributor

bors commented Jun 2, 2021

📌 Commit 21abf69ec24a4ecb0c494f310cacab312be196de has been approved by Aaron1011

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 2, 2021
@klensy
Copy link
Contributor

klensy commented Jun 2, 2021

Perf run was before rebase, so something can be broken again.

@cjgillot
Copy link
Contributor Author

cjgillot commented Jun 2, 2021

Last perf run was done on top of #85886. None of the more recently merged PRs involve allocator_kind.

@bors
Copy link
Contributor

bors commented Jun 2, 2021

⌛ Testing commit 21abf69ec24a4ecb0c494f310cacab312be196de with merge 08ae0ac8831ed767b006ee8c371bc7901024be92...

@bors
Copy link
Contributor

bors commented Jun 2, 2021

💔 Test failed - checks-actions

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bjorn3
Copy link
Member

bjorn3 commented Jun 8, 2021

Mixed improvements up to 0.5% and regressions up to 0.3%.

@Aaron1011
Copy link
Member

@cjgillot: Can you resolve the merge conflicts?

@Aaron1011 Aaron1011 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 19, 2021
@Aaron1011
Copy link
Member

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 20, 2021
@bors
Copy link
Contributor

bors commented Jun 20, 2021

⌛ Trying commit cbdfbdd with merge 361827ed97640f3f9422b917c9e8338cd14da838...

@bors
Copy link
Contributor

bors commented Jun 20, 2021

☀️ Try build successful - checks-actions
Build commit: 361827ed97640f3f9422b917c9e8338cd14da838 (361827ed97640f3f9422b917c9e8338cd14da838)

@rust-timer
Copy link
Collaborator

Queued 361827ed97640f3f9422b917c9e8338cd14da838 with parent 75d1500, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (361827ed97640f3f9422b917c9e8338cd14da838): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jun 20, 2021
@cjgillot cjgillot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 22, 2021
@Aaron1011
Copy link
Member

The performance regresions are quite small..

@bors r+

@bors
Copy link
Contributor

bors commented Jun 27, 2021

📌 Commit cbdfbdd has been approved by Aaron1011

@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 27, 2021
@bors
Copy link
Contributor

bors commented Jun 28, 2021

⌛ Testing commit cbdfbdd with merge 3455304...

@bors
Copy link
Contributor

bors commented Jun 28, 2021

☀️ Test successful - checks-actions
Approved by: Aaron1011
Pushing 3455304 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 28, 2021
@bors bors merged commit 3455304 into rust-lang:master Jun 28, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 28, 2021
@cjgillot cjgillot deleted the alloc-kind-query branch June 28, 2021 17:37
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Jul 7, 2021
@bors
Auto merge of rust-lang#85909 - cjgillot:alloc-kind-query, r=Aaron1011
e0af5f7 
Make allocator_kind a query.

Part of rust-lang#85153

r? `@Aaron1011`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Aaron1011 Aaron1011

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.
Projects
None yet
Milestone
1.55.0
Development

Successfully merging this pull request may close these issues.
9 participants
@cjgillot @rust-highfive @rust-timer @bors @Aaron1011 @klensy @rust-log-analyzer @bjorn3 @rustbot