Skip to content

Use a closure instead of three chained iterators #140464

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

Merged
merged 2 commits into from
May 3, 2025

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Apr 29, 2025

Fixes the perf regression from #123948

That PR had chained a third option to the iterator which apparently didn't optimize well

@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 Apr 29, 2025
@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 29, 2025

@bors try @rust-timer queue

@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 Apr 29, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 29, 2025
Use a closure instead of three chained iterators

Should fix the perf regression from rust-lang#123948

r? `@ghost`
@bors
Copy link
Collaborator

bors commented Apr 29, 2025

⌛ Trying commit 9193dfe with merge ccff30b...

@bors
Copy link
Collaborator

bors commented Apr 29, 2025

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

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ccff30b): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

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 the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.5% [0.4%, 0.6%] 2
Improvements ✅
(primary)
-0.6% [-2.8%, -0.1%] 13
Improvements ✅
(secondary)
-0.2% [-0.2%, -0.2%] 3
All ❌✅ (primary) -0.6% [-2.8%, -0.1%] 13

Max RSS (memory usage)

Results (primary -0.3%)

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.9% [0.9%, 0.9%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.6%, -0.5%] 5
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.3% [-0.6%, 0.9%] 6

Cycles

Results (primary -1.0%, secondary 1.9%)

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)
1.9% [1.9%, 1.9%] 1
Improvements ✅
(primary)
-1.0% [-2.8%, -0.4%] 4
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.0% [-2.8%, -0.4%] 4

Binary size

Results (primary -1.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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.1% [-1.1%, -1.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.1% [-1.1%, -1.1%] 1

Bootstrap: 763.233s -> 763.955s (0.09%)
Artifact size: 365.38 MiB -> 365.28 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 Apr 29, 2025
@oli-obk oli-obk marked this pull request as ready for review April 30, 2025 04:26
@rustbot
Copy link
Collaborator

rustbot commented Apr 30, 2025

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 30, 2025

r? compiler

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 30, 2025

📌 Commit 9193dfe has been approved by petrochenkov

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 Apr 30, 2025
VlaDexa added a commit to VlaDexa/rust that referenced this pull request May 2, 2025
…rochenkov

Use a closure instead of three chained iterators

Fixes the perf regression from rust-lang#123948

That PR had chained a third option to the iterator which apparently didn't optimize well
@bors
Copy link
Collaborator

bors commented May 3, 2025

⌛ Testing commit 9193dfe with merge d7df5bd...

@bors
Copy link
Collaborator

bors commented May 3, 2025

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing d7df5bd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 3, 2025
@bors bors merged commit d7df5bd into rust-lang:master May 3, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 3, 2025
Copy link

github-actions bot commented May 3, 2025

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 5fe04cb (parent) -> d7df5bd (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard d7df5bdf2986e596aeaeec38e732711c69ebbce1 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-apple-2: 7202.8s -> 4501.5s (-37.5%)
  2. dist-apple-various: 6216.6s -> 7950.9s (27.9%)
  3. dist-aarch64-linux: 7558.3s -> 5453.2s (-27.9%)
  4. x86_64-msvc-2: 6599.6s -> 7394.3s (12.0%)
  5. aarch64-apple: 4165.8s -> 3839.5s (-7.8%)
  6. dist-ohos: 11523.2s -> 10679.3s (-7.3%)
  7. i686-msvc-1: 9801.7s -> 9105.3s (-7.1%)
  8. dist-arm-linux: 4822.7s -> 4575.8s (-5.1%)
  9. x86_64-gnu-aux: 5894.9s -> 6153.8s (4.4%)
  10. dist-x86_64-msvc-alt: 7610.4s -> 7277.6s (-4.4%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d7df5bd): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.3% [-0.6%, -0.2%] 13
Improvements ✅
(secondary)
-0.1% [-0.1%, -0.1%] 2
All ❌✅ (primary) -0.3% [-0.6%, -0.2%] 13

Max RSS (memory usage)

Results (primary -0.2%)

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.7% [0.4%, 1.0%] 5
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.7% [-1.6%, -0.4%] 9
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.2% [-1.6%, 1.0%] 14

Cycles

Results (primary 0.1%, secondary -3.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.6% [0.4%, 0.9%] 9
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.9%, -0.4%] 6
Improvements ✅
(secondary)
-3.4% [-3.4%, -3.4%] 1
All ❌✅ (primary) 0.1% [-0.9%, 0.9%] 15

Binary size

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

Bootstrap: 769.318s -> 770.259s (0.12%)
Artifact size: 365.50 MiB -> 365.51 MiB (0.00%)

@rustbot rustbot removed the perf-regression Performance regression. label May 3, 2025
@oli-obk oli-obk deleted the successors-mut-perf branch May 3, 2025 18:13
@oli-obk oli-obk mentioned this pull request May 3, 2025
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.

5 participants