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

Update measureme crate to version 11 #119111

Merged
merged 1 commit into from
Jan 17, 2024

Conversation

michaelwoerister
Copy link
Member

@michaelwoerister michaelwoerister commented Dec 19, 2023

perf.rlo has been updated to use 11.0.0 already, so it should be able to handle the new file format.

r? @Mark-Simulacrum

Fixes #99282
Fixes #119103

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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 19, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2023

The Miri subtree was changed

cc @rust-lang/miri

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@klensy
Copy link
Contributor

klensy commented Dec 19, 2023

@michaelwoerister
Copy link
Member Author

@michaelwoerister
Copy link
Member Author

rustc-perf mostly relies on the commandline tools, IIUC. The only place a measureme crate is pulled in as dependency is here: https://github.com/rust-lang/rustc-perf/blob/dc2ac6a2d637a567332c5e41d825a365b5ed7561/site/Cargo.toml#L42

It takes the version from the master branch. I don't recommend that but at least it should stay up-to-date.

@klensy
Copy link
Contributor

klensy commented Dec 19, 2023

@lqd
Copy link
Member

lqd commented Dec 19, 2023

This should also fix #119103

@Kobzol
Copy link
Contributor

Kobzol commented Dec 19, 2023

@bors try @rust-timer queue

Let's see if perf.RLO handles it.

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

bors commented Dec 19, 2023

⌛ Trying commit 3ac7d64 with merge a19277d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 19, 2023
Update measureme crate to version 11.0.0

perf.rlo has been updated to use 11.0.0 already, so it should be able to handle the new file format.

r? `@Mark-Simulacrum`

Fixes rust-lang#99282
Fixes rust-lang#119103
@bors
Copy link
Contributor

bors commented Dec 19, 2023

☀️ Try build successful - checks-actions
Build commit: a19277d (a19277d089610031f64bfb2471fd39f64a18f594)

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a19277d): comparison URL.

Overall result: ❌ regressions - no 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.

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

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)
1.3% [0.6%, 2.6%] 4
Regressions ❌
(secondary)
4.0% [4.0%, 4.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.3% [0.6%, 2.6%] 4

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: 672.757s -> 671.691s (-0.16%)
Artifact size: 312.46 MiB -> 312.47 MiB (0.00%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Dec 19, 2023
@lqd
Copy link
Member

lqd commented Dec 19, 2023

It doesn't work, so I'll update rustc-perf to the new measureme. (edit: rust-lang/rustc-perf#1779)

Copy link
Member

@wesleywiser wesleywiser left a comment

Choose a reason for hiding this comment

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

r=me when ready 👍

@lqd
Copy link
Member

lqd commented Dec 20, 2023

@bors try

@bors
Copy link
Contributor

bors commented Dec 20, 2023

⌛ Trying commit 3ac7d64 with merge adf2bdb...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 20, 2023
Update measureme crate to version 11.0.0

perf.rlo has been updated to use 11.0.0 already, so it should be able to handle the new file format.

r? `@Mark-Simulacrum`

Fixes rust-lang#99282
Fixes rust-lang#119103
@bors
Copy link
Contributor

bors commented Dec 20, 2023

☀️ Try build successful - checks-actions
Build commit: adf2bdb (adf2bdbed168bec31748d732d893bfd4b2203959)

@lqd
Copy link
Member

lqd commented Dec 23, 2023

The update is merged on rustc-perf and deployed, and everything seems to work fine: the after or diff self-profile page for example, or other processed links like flamegraph, codegen-schedule or Perfetto/crox (I'm not sure if FF's profiler currently works).

@bors r=wesleywiser,lqd

@bors
Copy link
Contributor

bors commented Dec 23, 2023

📌 Commit 3ac7d64 has been approved by wesleywiser,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 Dec 23, 2023
@bors
Copy link
Contributor

bors commented Dec 23, 2023

⌛ Testing commit 3ac7d64 with merge d275e55...

@rustbot
Copy link
Collaborator

rustbot commented Jan 13, 2024

Could not assign reviewer from: Mark-Simulacrum.
User(s) Mark-Simulacrum are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

@michaelwoerister
Copy link
Member Author

The 11.0.1 release which fixes the big-endian compilation error is out.

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 15, 2024
@klensy
Copy link
Contributor

klensy commented Jan 15, 2024

The 11.0.1 release which fixes the big-endian compilation error is out.

rustc-perf needs this bump too?

@Mark-Simulacrum
Copy link
Member

@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 Jan 16, 2024
@bors
Copy link
Contributor

bors commented Jan 16, 2024

⌛ Trying commit ac58f9a with merge 98c5468...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 16, 2024
Update measureme crate to version 11

perf.rlo has been updated to use 11.0.0 already, so it should be able to handle the new file format.

r? `@Mark-Simulacrum`

Fixes rust-lang#99282
Fixes rust-lang#119103
@bors
Copy link
Contributor

bors commented Jan 16, 2024

☀️ Try build successful - checks-actions
Build commit: 98c5468 (98c54681e2177b6ef13d487fbfa699b6ba15833d)

@rust-timer

This comment has been minimized.

@lqd
Copy link
Member

lqd commented Jan 16, 2024

The 11.0.1 release which fixes the big-endian compilation error is out.

rustc-perf needs this bump too?

It shouldn't for our perf.rlo uses, as the previous successful runs with v11 showed. For people running rustc-perf on big-endian targets it probably would, but can be done in parallel and wouldn't need to block this PR per se?

@Mark-Simulacrum
Copy link
Member

(happy to r=me if we don't want to wait for confirmation, but I figured it's cheap to check)

@klensy
Copy link
Contributor

klensy commented Jan 16, 2024

wouldn't need to block this PR per se?

No block ofc, just possible todo.

@lqd
Copy link
Member

lqd commented Jan 16, 2024

We can wait for results for sure. However, I wanted to do the bump to ease @klensy's mind but couldn't: 11.0.1 wasn't pushed to the stable branch, and rustc-perf's site and collector will be on 11.0.0 for the results.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (98c5468): comparison URL.

Overall result: no relevant changes - no 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.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -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)
3.0% [3.0%, 3.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
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: 663.55s -> 662.594s (-0.14%)
Artifact size: 308.22 MiB -> 308.27 MiB (0.02%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 17, 2024
@michaelwoerister
Copy link
Member Author

@lqd, there's a PR open to update the stable branch: rust-lang/measureme#224

You could try to r+ it via bors. I'm not sure about the exact permissions at the moment (but I think we should give r+ to wg-performance).

@michaelwoerister
Copy link
Member Author

The perf run results seem to be displayed normally.

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jan 17, 2024

📌 Commit ac58f9a has been approved by Mark-Simulacrum

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 Jan 17, 2024
@lqd
Copy link
Member

lqd commented Jan 17, 2024

I'm not sure about the exact permissions at the moment

(According to the team config, only t-compiler not contributors.)

@bors
Copy link
Contributor

bors commented Jan 17, 2024

⌛ Testing commit ac58f9a with merge 25b706c...

@bors
Copy link
Contributor

bors commented Jan 17, 2024

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 25b706c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 17, 2024
@bors bors merged commit 25b706c into rust-lang:master Jan 17, 2024
12 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Jan 17, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (25b706c): 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)
-2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

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: 666.76s -> 664.038s (-0.41%)
Artifact size: 308.34 MiB -> 308.36 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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
10 participants