Skip to content

Revert "Auto merge of #92419 - erikdesjardins:coldland, r=nagisa" #94402

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
Merged
merged 2 commits into from
Mar 1, 2022
Merged

Revert "Auto merge of #92419 - erikdesjardins:coldland, r=nagisa" #94402

merged 2 commits into from
Mar 1, 2022

Conversation

@erikdesjardins
Copy link
Contributor

@erikdesjardins erikdesjardins commented Feb 26, 2022

Should fix (untested) #94390

Reopens #46515, #87055

r? @ehuss

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 26, 2022
@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 26, 2022

Some changes occured to rustc_codegen_gcc

cc @antoyo

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ehuss
Copy link
Contributor

ehuss commented Feb 26, 2022

r? @nagisa

I am not on the compiler team, so I'm not the appropriate person to review this.

@rust-highfive rust-highfive assigned nagisa and unassigned ehuss Feb 26, 2022
@nagisa
Copy link
Member

nagisa commented Feb 26, 2022

@bors r+

I'm not sure Reopens does anything, so I went ahead and reopened them manually.

@bors
Copy link
Collaborator

bors commented Feb 26, 2022

📌 Commit 45cc025dc6a0f1ad9bfc871d681bbf89492fdc1b has been approved by nagisa

@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 26, 2022
@matthiaskrgr
Copy link
Member

matthiaskrgr commented Feb 26, 2022

@bors rollup=never

@bors
Copy link
Collaborator

bors commented Feb 27, 2022

⌛ Testing commit 45cc025dc6a0f1ad9bfc871d681bbf89492fdc1b with merge 356f72f628f5edf19815d1aa1cf0a8d62c51a178...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Feb 27, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 27, 2022
@bors
Copy link
Collaborator

bors commented Feb 27, 2022

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

@Dylan-DPC
Copy link
Member

Dylan-DPC commented Mar 1, 2022

@bors r=nagisa

@bors
Copy link
Collaborator

bors commented Mar 1, 2022

📌 Commit 0c78433 has been approved by nagisa

@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 Mar 1, 2022
@bors
Copy link
Collaborator

bors commented Mar 1, 2022

⌛ Testing commit 0c78433 with merge 4a56cbe...

@bors
Copy link
Collaborator

bors commented Mar 1, 2022

☀️ Test successful - checks-actions
Approved by: nagisa
Pushing 4a56cbe to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 1, 2022
@bors bors merged commit 4a56cbe into rust-lang:master Mar 1, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 1, 2022
@rust-timer
Copy link
Collaborator

rust-timer commented Mar 1, 2022

Finished benchmarking commit (4a56cbe): comparison url.

Summary: This benchmark run shows 9 relevant improvements 🎉 but 152 relevant regressions 😿 to instruction counts.

  • Arithmetic mean of relevant regressions: 0.7%
  • Arithmetic mean of relevant improvements: -1.7%
  • Arithmetic mean of all relevant changes: 0.5%
  • Largest improvement in instruction counts: -3.8% on full builds of ripgrep opt
  • Largest regression in instruction counts: 3.3% on full builds of syn opt

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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

@rustbot rustbot added the perf-regression Performance regression. label Mar 1, 2022
@erikdesjardins erikdesjardins deleted the revert-coldland branch March 1, 2022 17:42
@erikdesjardins erikdesjardins mentioned this pull request Apr 24, 2022
Closed
@nox nox mentioned this pull request May 20, 2022
Closed
@luqmana luqmana mentioned this pull request May 31, 2022
Open
@InnovativeInventor InnovativeInventor mentioned this pull request Sep 21, 2022
Merged
TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Jun 27, 2023
@TaKO8Ki
Rollup merge of rust-lang#102099 - InnovativeInventor:re-cold-land, r…
047dd55 
…=nikic

Rebased: Mark drop calls in landing pads cold instead of noinline

I noticed that certain inlining optimizations were missing while staring at some compiled code output. I'd like to see this relanded, so I rebased the PR from ``@erikdesjardins`` (PR rust-lang#94823).

This PR reapplies rust-lang#92419, which was reverted in rust-lang#94402 due to rust-lang#94390.

Fixes rust-lang#46515, fixes rust-lang#87055.

Update: fixes rust-lang#97217.
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2023
@bors
Auto merge of rust-lang#102099 - InnovativeInventor:re-cold-land, r=n…
41a28aa 
…ikic

Rebased: Mark drop calls in landing pads cold instead of noinline

I noticed that certain inlining optimizations were missing while staring at some compiled code output. I'd like to see this relanded, so I rebased the PR from `@erikdesjardins` (PR rust-lang#94823).

This PR reapplies rust-lang#92419, which was reverted in rust-lang#94402 due to rust-lang#94390.

Fixes rust-lang#46515, fixes rust-lang#87055.

Update: fixes rust-lang#97217.
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2023
@bors
Auto merge of rust-lang#102099 - InnovativeInventor:re-cold-land, r=n…
2e5a9dd 
…ikic

Rebased: Mark drop calls in landing pads cold instead of noinline

I noticed that certain inlining optimizations were missing while staring at some compiled code output. I'd like to see this relanded, so I rebased the PR from `@erikdesjardins` (PR rust-lang#94823).

This PR reapplies rust-lang#92419, which was reverted in rust-lang#94402 due to rust-lang#94390.

Fixes rust-lang#46515, fixes rust-lang#87055.

Update: fixes rust-lang#97217.
antoyo pushed a commit to rust-lang/rustc_codegen_gcc that referenced this pull request Oct 8, 2023
@bors
Auto merge of #102099 - InnovativeInventor:re-cold-land, r=nikic
91ab790 
Rebased: Mark drop calls in landing pads cold instead of noinline

I noticed that certain inlining optimizations were missing while staring at some compiled code output. I'd like to see this relanded, so I rebased the PR from `@erikdesjardins` (PR #94823).

This PR reapplies rust-lang/rust#92419, which was reverted in rust-lang/rust#94402 due to rust-lang/rust#94390.

Fixes rust-lang/rust#46515, fixes rust-lang/rust#87055.

Update: fixes #97217.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nagisa nagisa

Labels

merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. 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.61.0

Development

Successfully merging this pull request may close these issues.

10 participants

@erikdesjardins @rust-highfive @rust-log-analyzer @ehuss @nagisa @bors @matthiaskrgr @Dylan-DPC @rust-timer @rustbot