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

Use PtrMetadata instead of Len in slice drop shims #134326

Merged
merged 2 commits into from
Dec 22, 2024

Conversation

scottmcm
Copy link
Member

@scottmcm scottmcm commented Dec 15, 2024

I tried to do a bigger change in #134297 which didn't work, so here's the part I really wanted: Removing another use of Len, in favour of PtrMetadata.

Split into two commits where the first just adds a test, so you can look at the second commit to see how the drop shim for an array changes with this PR.

Reusing the same reviewer from the last one:
r? BoxyUwU

@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 Dec 15, 2024
@lqd
Copy link
Member

lqd commented Dec 15, 2024

Let's see if the errors from the previous PR reproduce

@lqd

This comment was marked as resolved.

@bors

This comment was marked as resolved.

@lqd

This comment was marked as resolved.

@bors
Copy link
Contributor

bors commented Dec 15, 2024

⌛ Trying commit 8acccdc with merge 214902d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 15, 2024
…, r=<try>

Use `PtrMetadata` instead of `Len` in slice drop shims

I tried to do a bigger change in rust-lang#134297 which didn't work, so here's the part I really wanted: Removing another use of `Len`, in favour of `PtrMetadata`.

Reusing the same reviewer from the last one:
r? BoxyUwU
@bors
Copy link
Contributor

bors commented Dec 15, 2024

☀️ Try build successful - checks-actions
Build commit: 214902d (214902d83af34ccbac352703f3d75c3a7f4daaa1)

@BoxyUwU
Copy link
Member

BoxyUwU commented Dec 16, 2024

Seems reasonable to me but I am not super familiar with nuances of MIR so I will assign someone else for a final review

r? @saethlin

@rustbot rustbot assigned saethlin and unassigned BoxyUwU Dec 16, 2024
@saethlin
Copy link
Member

@bors r+ rollup=iffy
I can't tell at a glance if this is perf-sensitive but I think it's more likely that it is not.

@bors
Copy link
Contributor

bors commented Dec 21, 2024

📌 Commit 8acccdc has been approved by saethlin

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 Dec 21, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 22, 2024
…, r=saethlin

Use `PtrMetadata` instead of `Len` in slice drop shims

I tried to do a bigger change in rust-lang#134297 which didn't work, so here's the part I really wanted: Removing another use of `Len`, in favour of `PtrMetadata`.

Split into two commits where the first just adds a test, so you can look at the second commit to see how the drop shim for an array changes with this PR.

Reusing the same reviewer from the last one:
r? BoxyUwU
@bors
Copy link
Contributor

bors commented Dec 22, 2024

⌛ Testing commit 8acccdc with merge d0d464c...

@bors
Copy link
Contributor

bors commented Dec 22, 2024

💔 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 Dec 22, 2024
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@tgross35
Copy link
Contributor

Looks like dist-apple-various just got stuck?

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 22, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 22, 2024
@bors
Copy link
Contributor

bors commented Dec 22, 2024

⌛ Testing commit 8acccdc with merge b22856d...

@bors
Copy link
Contributor

bors commented Dec 22, 2024

☀️ Test successful - checks-actions
Approved by: saethlin
Pushing b22856d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 22, 2024
@bors bors merged commit b22856d into rust-lang:master Dec 22, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 22, 2024
@scottmcm scottmcm deleted the slice-drop-shim-ptrmetadata branch December 22, 2024 16:26
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b22856d): comparison URL.

Overall result: ❌ regressions - 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.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

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

Cycles

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

Binary size

Results (primary -0.0%)

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.1% [0.1%, 0.1%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.3%, -0.0%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.0% [-0.3%, 0.1%] 4

Bootstrap: 761.148s -> 762.237s (0.14%)
Artifact size: 330.61 MiB -> 330.65 MiB (0.01%)

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 22, 2024
…ewjasper

Delete `Rvalue::Len` 🎉

Everything's moved to `PtrMetadata`, so we can get rid of the `Len` variant now.

~~Depends on rust-lang#134326, so draft until that lands~~ Ready!

r? mir
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.

9 participants