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

[self-profiler] Make the profiler faster/more efficient #58425

Merged
merged 4 commits into from
Mar 3, 2019

Conversation

wesleywiser
Copy link
Member

@wesleywiser wesleywiser commented Feb 13, 2019

Related to #58372

r? @michaelwoerister

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 13, 2019
@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from a569a0d to 550146f Compare February 13, 2019 13:25
@rust-highfive

This comment has been minimized.

@michaelwoerister
Copy link
Member

Once #58309 lands, we should do a perf run to measure the overhead. I suspect that emitting JSON instead of binary data is still more expensive than we'd like it to be.

@wesleywiser
Copy link
Member Author

Probably, I haven't looked into doing binary serialization yet. Is there any existing infrastructure in the compiler for that or should I roll my own?

@wesleywiser
Copy link
Member Author

(FYI, in case you were remembering the performance of serialization as it was at All-Hands, that was without buffering the writes. I added a BufWriter around the file and it significantly improved the performance.)

@michaelwoerister
Copy link
Member

There is rustc's libserialize which works OK for metadata and incremental caches.

@michaelwoerister
Copy link
Member

I don't know how easy or hard it is to use libserialize outside of the compiler though. Let's check how the JSON version does first.

@wesleywiser
Copy link
Member Author

I think it's just a matter of #[derive(RustcDecodable)] but I'm not sure.

@bors
Copy link
Contributor

bors commented Feb 14, 2019

☔ The latest upstream changes (presumably #58455) made this pull request unmergeable. Please resolve the merge conflicts.

@michaelwoerister
Copy link
Member

I think it's just a matter of #[derive(RustcDecodable)] but I'm not sure.

Yes, I think that's true as long as both the compiler and importing tool are compiled with the same compiler version.

Given that there's just a couple of data structures that need to be serialized, doing something handwritten might be a viable option though. libserialize has some overhead because it uses leb128 for encoding integers. Since we care more about speed than about file size libserialize might not be a good trade off.

@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from 550146f to 27d5873 Compare February 15, 2019 12:13
@rust-highfive

This comment has been minimized.

@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from 27d5873 to 8a006f1 Compare February 18, 2019 00:19
@rust-highfive

This comment has been minimized.

@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from 8a006f1 to be88e76 Compare February 18, 2019 02:04
@rust-highfive

This comment has been minimized.

@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from be88e76 to fff27a0 Compare February 18, 2019 23:43
@rust-highfive

This comment has been minimized.

@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from fff27a0 to d30f158 Compare February 19, 2019 01:38
@michaelwoerister
Copy link
Member

Can you switch this to use a parking_lot::Mutex? Then we can do a first perf run to see how be the overhead is now.

@wesleywiser
Copy link
Member Author

Sure, I can do that tonight. Are you trying to measure the record overhead or the save results overhead?

I'll need to push a commit to enable whichever option you want to record by default since the entire feature is disabled by default.

@michaelwoerister
Copy link
Member

I think we should do both.

@wesleywiser
Copy link
Member Author

Ok. Do you want to do seperate perf runs or just one with the option turned on by default?

@rust-highfive

This comment has been minimized.

@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from f50d3a1 to 855c2ef Compare February 20, 2019 01:23
@rust-highfive

This comment has been minimized.

@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from 855c2ef to 2ba18f3 Compare February 20, 2019 01:41
@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 3, 2019
@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from d1ac877 to c0c7ac6 Compare March 3, 2019 03:33
@wesleywiser
Copy link
Member Author

Rebased

@bors r=michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 3, 2019

📌 Commit c0c7ac62b8c570ba581795d0182b720c48092b74 has been approved by michaelwoerister

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 3, 2019
@bors
Copy link
Contributor

bors commented Mar 3, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout more_profiler_changes (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self more_profiler_changes --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 3, 2019
@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from c0c7ac6 to d2c2a67 Compare March 3, 2019 14:53
@rust-highfive

This comment has been minimized.

@wesleywiser wesleywiser force-pushed the more_profiler_changes branch from d2c2a67 to f20ad70 Compare March 3, 2019 15:08
@wesleywiser
Copy link
Member Author

Rebased

@bors r=michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 3, 2019

📌 Commit f20ad70 has been approved by michaelwoerister

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 3, 2019
@bors
Copy link
Contributor

bors commented Mar 3, 2019

⌛ Testing commit f20ad70 with merge 87a4363...

bors added a commit that referenced this pull request Mar 3, 2019
…erister

[self-profiler] Make the profiler faster/more efficient

Related to #58372

r? @michaelwoerister
@bors
Copy link
Contributor

bors commented Mar 3, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: michaelwoerister
Pushing 87a4363 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 3, 2019
@bors bors merged commit f20ad70 into rust-lang:master Mar 3, 2019
@jens1o
Copy link
Contributor

jens1o commented Mar 4, 2019

What is the perf-graph looking like today?

@Mark-Simulacrum
Copy link
Member

This won't affect perf.r-l.o since it isn't run with self-profile enabled.

@michaelwoerister
Copy link
Member

I still expect it to be rather slow. Here are some thoughts on how to make it faster: #58372

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants