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

Remove verbose_generic_activity_with_arg #115736

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Sep 10, 2023

This removes verbose_generic_activity_with_arg and changes users to generic_activity_with_arg. This keeps the output of -Z time readable while these repeated events are still available with the self profiling mechanism.

@rustbot
Copy link
Collaborator

rustbot commented Sep 10, 2023

r? @WaffleLapkin

(rustbot has picked a reviewer for you, use r? to override)

@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 Sep 10, 2023
@rustbot
Copy link
Collaborator

rustbot commented Sep 10, 2023

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@rust-log-analyzer

This comment has been minimized.

@oli-obk
Copy link
Contributor

oli-obk commented Sep 11, 2023

r? @wesleywiser as you reviewed the PR that added this function

@rustbot rustbot assigned wesleywiser and unassigned WaffleLapkin Sep 11, 2023
tcx.sess.time(name, || pass.run_pass(tcx, body));
tcx.sess
.prof
.generic_activity_with_arg("mir_pass", name)
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you leave the pass name as activity name? body.source.def_id() can be used as arg.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That should work, but they should gain a mir_ prefix to fit with the profiling naming scheme.

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.

Seems reasonable, no objections.

r=me with build passing

@oli-obk
Copy link
Contributor

oli-obk commented Sep 13, 2023

@bors r=wesleywiser

@bors
Copy link
Contributor

bors commented Sep 13, 2023

📌 Commit c64e15e has been approved by wesleywiser

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 Sep 13, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#115736 (Remove `verbose_generic_activity_with_arg`)
 - rust-lang#115771 (cleanup leftovers of const_err lint)
 - rust-lang#115798 (add helper method for finding the one non-1-ZST field)
 - rust-lang#115812 (Merge settings.css into rustdoc.css)
 - rust-lang#115815 (fix: return early when has tainted in mir pass)
 - rust-lang#115816 (Disabled socketpair for Vita)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5dc37c1 into rust-lang:master Sep 13, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 13, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2023
Rollup merge of rust-lang#115736 - Zoxc:time-cleanup, r=wesleywiser

Remove `verbose_generic_activity_with_arg`

This removes `verbose_generic_activity_with_arg` and changes users to `generic_activity_with_arg`. This keeps the output of `-Z time` readable while these repeated events are still available with the self profiling mechanism.
@Zoxc Zoxc deleted the time-cleanup branch September 15, 2023 13:34
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Oct 9, 2023
Remove `verbose_generic_activity_with_arg`

This removes `verbose_generic_activity_with_arg` and changes users to `generic_activity_with_arg`. This keeps the output of `-Z time` readable while these repeated events are still available with the self profiling mechanism.
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) 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.

8 participants