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.

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

Revert "Auto merge of #127537 - veluca93:struct_tf, r=BoxyUwU" #129854

Merged
merged 1 commit into from
Sep 1, 2024

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Sep 1, 2024

This reverts #127537 (commit acb4e8b), reversing changes made to 100fde5.

Opening to see if this can help resolve the recent perf. results instability.

@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 1, 2024

@bors try @rust-timer queue

@rustbot
Copy link
Collaborator

rustbot commented Sep 1, 2024

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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. labels Sep 1, 2024
@rust-timer

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 1, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 1, 2024
Revert "Auto merge of rust-lang#127537 - veluca93:struct_tf, r=BoxyUwU"

This reverts commit acb4e8b, reversing changes made to 100fde5.

Opening to see if this can help resolve the recent perf. results [instability](https://rust-lang.zulipchat.com/#narrow/stream/247081-t-compiler.2Fperformance/topic/Weird.20perf.20results).
@bors
Copy link
Contributor

bors commented Sep 1, 2024

⌛ Trying commit 47e6b5d with merge dfc9c99...

@bors
Copy link
Contributor

bors commented Sep 1, 2024

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

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (dfc9c99): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +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)
1.4% [0.4%, 3.0%] 3
Regressions ❌
(secondary)
0.5% [0.5%, 0.5%] 1
Improvements ✅
(primary)
-0.5% [-1.0%, -0.2%] 63
Improvements ✅
(secondary)
-0.7% [-2.2%, -0.3%] 18
All ❌✅ (primary) -0.4% [-1.0%, 3.0%] 66

Max RSS (memory usage)

Results (primary -0.6%, secondary -0.8%)

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.8% [0.4%, 1.8%] 19
Regressions ❌
(secondary)
0.6% [0.4%, 0.9%] 13
Improvements ✅
(primary)
-0.9% [-3.8%, -0.4%] 87
Improvements ✅
(secondary)
-0.9% [-3.6%, -0.4%] 124
All ❌✅ (primary) -0.6% [-3.8%, 1.8%] 106

Cycles

Results (primary -0.5%, secondary -0.1%)

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.2% [0.5%, 2.8%] 13
Regressions ❌
(secondary)
1.2% [0.4%, 3.4%] 47
Improvements ✅
(primary)
-0.8% [-2.9%, -0.4%] 73
Improvements ✅
(secondary)
-1.1% [-3.6%, -0.4%] 67
All ❌✅ (primary) -0.5% [-2.9%, 2.8%] 86

Binary size

Results (primary -0.7%, secondary -1.4%)

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)
-0.7% [-1.6%, -0.0%] 81
Improvements ✅
(secondary)
-1.4% [-2.3%, -0.6%] 24
All ❌✅ (primary) -0.7% [-1.6%, -0.0%] 81

Bootstrap: 790.965s -> 750.306s (-5.14%)
Artifact size: 338.44 MiB -> 338.34 MiB (-0.03%)

@rustbot rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Sep 1, 2024
@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 1, 2024

We could do a bunch of perf. runs, but the desired result (removal of instability) would be a bit hard to detect (we'd need to check if the results don't change much, but even the baseline results after reverting are quite large).

So I'd suggest reverting, then checking if it helped and then try to land again with some improvements.

@Kobzol Kobzol marked this pull request as ready for review September 1, 2024 18:40
@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 1, 2024

r? lqd

@bors rollup=never

@rustbot rustbot assigned lqd and unassigned lcnr Sep 1, 2024
@lqd
Copy link
Member

lqd commented Sep 1, 2024

Ah I had also added this to #129851 — but do we want to try just this revert and see what happens for a few merges, before trying with #129714 if needed?

@lqd
Copy link
Member

lqd commented Sep 1, 2024

This one will at least fix a few regressions including bootstrap, while the collector behavior on the other was pretty weird and we may need to try both anyways.

@bors r+

@bors
Copy link
Contributor

bors commented Sep 1, 2024

📌 Commit 47e6b5d has been approved by lqd

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 Sep 1, 2024
@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 1, 2024

I checked the collector logs of #129714 and everything seemed to have happened correctly. So I think that it might just have been some database fluke. Let's try reverting just #127537 first, and see what happens. The other PR didn't seem that suspicious.

@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 1, 2024

@bors p=10

All current perf. results seem really weird and misleading, which is confusing developers on merged PRs. We hope that by reverting this PR, it should be fixed, so ideally the revert should be merged ASAP.

@bors
Copy link
Contributor

bors commented Sep 1, 2024

⌛ Testing commit 47e6b5d with merge 94885bc...

@bors
Copy link
Contributor

bors commented Sep 1, 2024

☀️ Test successful - checks-actions
Approved by: lqd
Pushing 94885bc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 1, 2024
@bors bors merged commit 94885bc into rust-lang:master Sep 1, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 1, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (94885bc): 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.5% [0.3%, 0.6%] 2
Improvements ✅
(primary)
-0.5% [-1.1%, -0.2%] 61
Improvements ✅
(secondary)
-0.7% [-2.2%, -0.3%] 26
All ❌✅ (primary) -0.5% [-1.1%, -0.2%] 61

Max RSS (memory usage)

Results (primary -0.6%, secondary -0.7%)

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.8% [0.5%, 1.9%] 14
Regressions ❌
(secondary)
0.7% [0.4%, 1.2%] 16
Improvements ✅
(primary)
-0.8% [-2.3%, -0.4%] 101
Improvements ✅
(secondary)
-1.0% [-3.5%, -0.4%] 82
All ❌✅ (primary) -0.6% [-2.3%, 1.9%] 115

Cycles

Results (primary -0.6%, secondary -0.1%)

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.9% [0.4%, 6.2%] 6
Regressions ❌
(secondary)
1.1% [0.4%, 4.7%] 43
Improvements ✅
(primary)
-0.8% [-3.1%, -0.4%] 63
Improvements ✅
(secondary)
-0.9% [-2.4%, -0.4%] 58
All ❌✅ (primary) -0.6% [-3.1%, 6.2%] 69

Binary size

Results (primary -0.7%, secondary -1.4%)

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)
-0.7% [-1.6%, -0.0%] 82
Improvements ✅
(secondary)
-1.4% [-2.3%, -0.5%] 25
All ❌✅ (primary) -0.7% [-1.6%, -0.0%] 82

Bootstrap: missing data
Artifact size: 338.38 MiB -> 338.33 MiB (-0.02%)

@rustbot rustbot removed the perf-regression Performance regression. label Sep 2, 2024
@Kobzol Kobzol deleted the revert-127537 branch September 2, 2024 20:29
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. 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
Development

Successfully merging this pull request may close these issues.

6 participants