Change -Z time event naming scheme and make them generic activities #67988

Zoxc · 2020-01-07T22:29:52Z

I made the -Z time-passes only events (which encodes argument in the event id) use a extra_verbose_generic_activity function which does not emit self-profiling events.

r? @michaelwoerister
cc @wesleywiser

rust-highfive · 2020-01-07T22:49:56Z

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2020-01-07T22:30:31.2451187Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-07T22:30:31.2551204Z ##[command]git config gc.auto 0
2020-01-07T22:30:31.2616492Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-07T22:30:31.2669825Z ##[command]git config --get-all http.proxy
2020-01-07T22:30:31.2806839Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67988/merge:refs/remotes/pull/67988/merge

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

michaelwoerister · 2020-01-08T15:15:19Z

Thanks for opening this PR, @Zoxc. I'll take a look shortly.

michaelwoerister · 2020-01-08T15:18:52Z

As a side note (haven't reviewed this in detail yet): Once #67397 lands, there is a clean way of attaching arguments to events without tripping up the tooling.

michaelwoerister

Thanks for PR, @Zoxc. I think this should fix perf.rlo and provides a clean basis for rebasing #67397 onto.

r=me with the two doc comment additions.

michaelwoerister · 2020-01-08T16:47:12Z

src/librustc_data_structures/profiling.rs

        }
    }

-    /// Start profiling a sparse pass. Profiling continues until the
+    /// Start profiling a verbose generic activity. Profiling continues until the
    /// VerboseTimingGuard returned from this call is dropped.


Please add the following to the doc comment:

In addition to recording a measureme event, "verbose" generic activities also print a timing entry to the console (if the compiler is invoked with -Ztime or -Ztime-passes).

michaelwoerister · 2020-01-08T16:50:03Z

src/librustc_data_structures/profiling.rs

        )
    }

-    /// Start profiling a generic pass. Profiling continues until the
+    /// Start profiling a extra verbose generic activity. Profiling continues until the
    /// VerboseTimingGuard returned from this call is dropped.


Please add the following to the doc comment:

Note that "extra verbose" generic activities do not record a measureme event. They only print a timing entry to the console (if -Ztime-passes is specified).

(it is -Z time-passes, right?)

Zoxc · 2020-01-08T22:26:22Z

@bors r=michaelwoerister p=1

bors · 2020-01-08T22:26:24Z

📌 Commit dee4077212f32b86272e9d2a0a5265e06b181269 has been approved by michaelwoerister

bors · 2020-01-09T05:15:53Z

🔒 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:

git checkout prof-fix (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self prof-fix --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

Auto-merging src/librustc_lint/late.rs
Auto-merging src/librustc_interface/passes.rs
CONFLICT (content): Merge conflict in src/librustc_interface/passes.rs
Auto-merging src/librustc_driver/lib.rs
Auto-merging src/librustc_codegen_ssa/back/write.rs
Auto-merging src/librustc/hir/map/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2020-01-09T05:19:16Z

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

Zoxc · 2020-01-09T06:20:52Z

@bors r=michaelwoerister

bors · 2020-01-09T06:20:53Z

📌 Commit 7db4b7e has been approved by michaelwoerister

bors · 2020-01-09T11:36:50Z

⌛ Testing commit 7db4b7e with merge c404ce6...

@michaelwoerister

Change -Z time event naming scheme and make them generic activities I made the `-Z time-passes` only events (which encodes argument in the event id) use a `extra_verbose_generic_activity` function which does not emit self-profiling events. r? @michaelwoerister cc @wesleywiser

@michaelwoerister

Change -Z time event naming scheme and make them generic activities I made the `-Z time-passes` only events (which encodes argument in the event id) use a `extra_verbose_generic_activity` function which does not emit self-profiling events. r? @michaelwoerister cc @wesleywiser

Centril · 2020-01-09T11:41:44Z

@bors retry rolled up.

@ghost

Rollup of 6 pull requests Successful merges: - #67258 (Introduce `X..`, `..X`, and `..=X` range patterns) - #67358 (Add HashSet::get_or_insert_owned) - #67935 (Relax the Sized bounds on Pin::map_unchecked(_mut)) - #67975 (Export public scalar statics in wasm) - #67988 (Change -Z time event naming scheme and make them generic activities) - #68006 (Recognise riscv64 in compiletest) Failed merges: - #67806 (Extract `rustc_ast_passes`, move gating, & refactor linting) r? @ghost

bors · 2020-01-09T14:49:17Z

☀️ Test successful - checks-azure
Approved by: michaelwoerister
Pushing c404ce6 to master...

rust-highfive · 2020-01-09T14:50:52Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@wesleywiser

Add some missing timers Based on rust-lang#67988 r? @wesleywiser

@wesleywiser

Add some missing timers Based on rust-lang#67988 r? @wesleywiser

rust-highfive assigned michaelwoerister Jan 7, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 7, 2020

Zoxc force-pushed the prof-fix branch from e9c1fd6 to 9c80ec0 Compare January 7, 2020 23:06

pnkfelix mentioned this pull request Jan 8, 2020

Use self profile infrastructure for -Z time and -Z time-passes #67777

Merged

michaelwoerister approved these changes Jan 8, 2020

View reviewed changes

Zoxc force-pushed the prof-fix branch from 9c80ec0 to dee4077 Compare January 8, 2020 20:32

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 8, 2020

Zoxc mentioned this pull request Jan 9, 2020

Add some missing timers #68043

Merged

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 Jan 9, 2020

Zoxc added 2 commits January 9, 2020 07:06

Change -Z time event naming scheme and make them generic activities

5427601

More comments

7db4b7e

Zoxc force-pushed the prof-fix branch from dee4077 to 7db4b7e Compare January 9, 2020 06:07

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 Jan 9, 2020

Centril mentioned this pull request Jan 9, 2020

Rollup of 6 pull requests #68052

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 9, 2020

bors merged commit 7db4b7e into rust-lang:master Jan 9, 2020

Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020

Rollup merge of rust-lang#68043 - Zoxc:missing-timers, r=wesleywiser

c74ae96

Add some missing timers Based on rust-lang#67988 r? @wesleywiser

Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020

Rollup merge of rust-lang#68043 - Zoxc:missing-timers, r=wesleywiser

8c0c5c7

Add some missing timers Based on rust-lang#67988 r? @wesleywiser

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change -Z time event naming scheme and make them generic activities #67988

Change -Z time event naming scheme and make them generic activities #67988

Zoxc commented Jan 7, 2020

rust-highfive commented Jan 7, 2020

michaelwoerister commented Jan 8, 2020

michaelwoerister commented Jan 8, 2020

michaelwoerister left a comment

michaelwoerister Jan 8, 2020

michaelwoerister Jan 8, 2020

Zoxc commented Jan 8, 2020

bors commented Jan 8, 2020

bors commented Jan 9, 2020

bors commented Jan 9, 2020

Zoxc commented Jan 9, 2020

bors commented Jan 9, 2020

bors commented Jan 9, 2020

Centril commented Jan 9, 2020

bors commented Jan 9, 2020

rust-highfive commented Jan 9, 2020

Change -Z time event naming scheme and make them generic activities #67988

Change -Z time event naming scheme and make them generic activities #67988

Conversation

Zoxc commented Jan 7, 2020

rust-highfive commented Jan 7, 2020

michaelwoerister commented Jan 8, 2020

michaelwoerister commented Jan 8, 2020

michaelwoerister left a comment

Choose a reason for hiding this comment

michaelwoerister Jan 8, 2020

Choose a reason for hiding this comment

michaelwoerister Jan 8, 2020

Choose a reason for hiding this comment

Zoxc commented Jan 8, 2020

bors commented Jan 8, 2020

bors commented Jan 9, 2020

bors commented Jan 9, 2020

Zoxc commented Jan 9, 2020

bors commented Jan 9, 2020

bors commented Jan 9, 2020

Centril commented Jan 9, 2020

bors commented Jan 9, 2020

rust-highfive commented Jan 9, 2020