-
Notifications
You must be signed in to change notification settings - Fork 5.9k
8344014: Simplify TracePhase constructor #22029
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
Conversation
👋 Welcome back stuefe! A progress list of the required criteria for merging this PR into |
@tstuefe This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 25 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
3689bd7
to
7a66398
Compare
Mac OS error unrelated. |
/label add hotspot-compiler |
@tstuefe |
@tstuefe |
/reviewers 2 |
@dean-long |
This looks OK, but doesn't seem strictly necessary for JDK-8344009. We could get the PhaseTraceId from |
I thought so too, but it seemed a bit ugly and brittle, and the simplification seemed worth it anyhow. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
Thank you @dean-long and @rwestrel ! |
/integrate |
Going to push as commit 133f8f3.
Your commit was automatically rebased without conflicts. |
As a prerequisite for JDK-8344009,
TracePhase
constructor needs to know the PhaseTraceId. And while we are at it, it can be simplified: trace strings can be kept in via x-macro with the IDs, and it is sufficient to pass in the IDs, no need to pass the pointer to the counters since we use the same counters anyway.Since this is a somewhat invasive but purely mechanical change, I separate this work from JDK-8344009.
There are no functional changes. Trace texts have been faithfully taken over, even in the case where the original TracePhase constructor invocation got fed an empty string (
_t_vector
and_t_renumberLive
) - whether this was intentional or not, this patch does not change it.The patch preserves the possibility to override the phase name with an explicit argument to the constructor. This is used in one existing case ("computeLive (sbplr)"), again, to faithfully preserve the log format.
Test: I checked manually with +CITimeVerbose with and without patch and compared the output; output format is preserved.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22029/head:pull/22029
$ git checkout pull/22029
Update a local copy of the PR:
$ git checkout pull/22029
$ git pull https://git.openjdk.org/jdk.git pull/22029/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 22029
View PR using the GUI difftool:
$ git pr show -t 22029
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22029.diff
Using Webrev
Link to Webrev Comment