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

Record allocation spans inside force_allocation #115184

Merged
merged 2 commits into from Aug 25, 2023

Conversation

saethlin
Copy link
Member

This expands rust-lang/miri#2940 to cover locals

r? @RalfJung

@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 Aug 24, 2023
@rustbot
Copy link
Collaborator

rustbot commented Aug 24, 2023

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

The Miri subtree was changed

cc @rust-lang/miri

@saethlin saethlin added the A-miri Area: The miri tool label Aug 24, 2023
Copy link
Member

@RalfJung RalfJung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks great overall with minor nits!

Can you confirm that if you use current_span instead, at least one of the tests changes its output?

compiler/rustc_const_eval/src/interpret/place.rs Outdated Show resolved Hide resolved
src/tools/miri/src/machine.rs Outdated Show resolved Hide resolved
@saethlin
Copy link
Member Author

saethlin commented Aug 25, 2023

Can you confirm that if you use current_span instead, at least one of the tests changes its output?

Their output does change, but not in a way that is meaningful. They highlight the span of the expression for the rvalue in the let, instead of the variable name. I'm adding a more direct test for the span selection.

@RalfJung
Copy link
Member

Thanks!

One of my comments is still unresolved I think.

Co-authored-by: Ralf Jung <post@ralfj.de>
@RalfJung
Copy link
Member

Looks good, thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Aug 25, 2023

📌 Commit 8ecdefb has been approved by RalfJung

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

bors commented Aug 25, 2023

⌛ Testing commit 8ecdefb with merge 296c7a6...

@bors
Copy link
Contributor

bors commented Aug 25, 2023

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 296c7a6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 25, 2023
@bors bors merged commit 296c7a6 into rust-lang:master Aug 25, 2023
12 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Aug 25, 2023
@saethlin saethlin deleted the local-allocated-spans branch August 25, 2023 19:05
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (296c7a6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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

Cycles

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

Binary size

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

Bootstrap: 632.601s -> 629.829s (-0.44%)
Artifact size: 315.72 MiB -> 315.71 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-miri Area: The miri tool 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.

None yet

5 participants