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

Encode lifetime param spans too #110469

Merged
merged 1 commit into from
Apr 22, 2023
Merged

Encode lifetime param spans too #110469

merged 1 commit into from
Apr 22, 2023

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Apr 17, 2023 •
edited
Loading

Fixes #110464
Fixes #110591

@rustbot
Copy link
Collaborator

rustbot commented Apr 17, 2023

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@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 17, 2023
@compiler-errors
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 17, 2023
@bors
Copy link
Contributor

bors commented Apr 17, 2023

⌛ Trying commit 9164c1c8de87c4a807f076c7e7bedded0ff18ae7 with merge 1579cc65b509c4475b182c2694fc456907c7e12e...

@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 17, 2023
@bors
Copy link
Contributor

bors commented Apr 17, 2023

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

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1579cc65b509c4475b182c2694fc456907c7e12e): 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)		 0.4% [0.2%, 0.8%] 42
Regressions ❌
(secondary)		 0.8% [0.4%, 1.0%] 4
Improvements ✅
(primary)		 -1.6% [-2.8%, -0.6%] 4
Improvements ✅
(secondary)		 -5.2% [-7.5%, -0.2%] 7
All ❌✅ (primary) 0.2% [-2.8%, 0.8%] 46

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)		 2.4% [0.9%, 3.8%] 2
Regressions ❌
(secondary)		 1.7% [1.7%, 1.7%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.4% [-3.4%, -3.4%] 1
All ❌✅ (primary) 2.4% [0.9%, 3.8%] 2

Cycles

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)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.7% [-4.3%, -3.2%] 3
All ❌✅ (primary) - - 0

@rustbot rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Apr 18, 2023
@compiler-errors
Copy link
Member Author

Oof, that's rough.

@compiler-errors
Copy link
Member Author

cc @petrochenkov and @cjgillot -- this did end up being perf-negative. Thoughts? I guess we have two choices here:

  • Make def_span return DUMMY_SP for foreign lifetime params, since I don't think it's feasible to audit all of the places we're calling def_span and make sure we just never call it with a DefKind::LifetimeParam...
  • Deal with the perf?

@apiraino
Copy link
Contributor

T-compiler will revisit beta backport next week, after the perf. run is triaged notes on Zulip

@oli-obk
Copy link
Contributor

oli-obk commented Apr 21, 2023

@bors r+

The "regression" is only a reduction of the perf improvement introduced by the PR that introduced the bug: #109765 (comment)

@bors
Copy link
Contributor

bors commented Apr 21, 2023

📌 Commit 9164c1c8de87c4a807f076c7e7bedded0ff18ae7 has been approved by oli-obk

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

bors commented Apr 22, 2023

⌛ Testing commit 9164c1c8de87c4a807f076c7e7bedded0ff18ae7 with merge b46499519e5a53d7c354265f2a77e8f91aebf810...

@bors
Copy link
Contributor

bors commented Apr 22, 2023

💔 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 Apr 22, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member Author

rebase caused some formatting change lol

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Apr 22, 2023

📌 Commit 24c2c07 has been approved by oli-obk

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

bors commented Apr 22, 2023

⌛ Testing commit 24c2c07 with merge 37b22cf...

@bors
Copy link
Contributor

bors commented Apr 22, 2023

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 37b22cf to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 22, 2023
@bors bors merged commit 37b22cf into rust-lang:master Apr 22, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 22, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (37b22cf): comparison URL.

Overall result: ❌ regressions - 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.5% [0.2%, 0.7%] 21
Regressions ❌
(secondary)		 0.7% [0.3%, 0.9%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.5% [0.2%, 0.7%] 21

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)		 5.1% [0.7%, 14.1%] 7
Regressions ❌
(secondary)		 2.6% [1.9%, 3.2%] 5
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 5.1% [0.7%, 14.1%] 7

Cycles

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)		 2.2% [1.2%, 3.2%] 4
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.2% [1.2%, 3.2%] 4

@nnethercote
Copy link
Contributor

This comment justifies the regressions.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Apr 24, 2023
@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 27, 2023
@cuviper cuviper mentioned this pull request Apr 27, 2023
Merged
@cuviper cuviper modified the milestones: 1.71.0, 1.70.0 Apr 27, 2023
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 27, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 30, 2023
@bors
Auto merge of rust-lang#110871 - cuviper:beta-next, r=cuviper
071f14b 
[beta] backport

This PR backports:

- Encode def span for ConstParam rust-lang#110425
- Update to LLVM 16.0.2 rust-lang#110535
- Encode lifetime param spans too rust-lang#110469
- make sysroot finding compatible with multiarch systems rust-lang#110281
- Update awscli rust-lang#110952
- Temporarily disable the jobserver-error test rust-lang#110361

Also bumps us to the latest released stable, 1.69.0.

r? `@cuviper`
@compiler-errors compiler-errors deleted the encode-lt-param-span branch August 11, 2023 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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.70.0
9 participants
@compiler-errors @rustbot @rust-timer @bors @apiraino @oli-obk @rust-log-analyzer @nnethercote @cuviper