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
8274328: C2: Redundant CFG edges fixup in block ordering #5705
Conversation
|
@kelthuzadx The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
PING :- |
That looks good to me but I'm not an expert in that code. I submitted some testing and it all passed.
src/hotspot/share/opto/block.cpp
Outdated
@@ -914,7 +914,6 @@ void PhaseCFG::fixup_flow() { | |||
ProjNode* tmp = proj0; | |||
proj0 = proj1; | |||
proj1 = tmp; |
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.
swap(proj0, proj1)
can be used here.
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.
Thanks Tobias for review. I have replaced above code with swap(pointer ref,pointer ref)
@kelthuzadx This change now passes all automated pre-integration checks. 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 142 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.
|
@TobiHartmann please add links to testing in RFE. |
Thanks @TobiHartmann and @vnkozlov for reviews! /integrate |
Going to push as commit 44047f8.
Your commit was automatically rebased without conflicts. |
@kelthuzadx Pushed as commit 44047f8. |
Done. |
I think Trace::fixup_blocks is redundant because PhaseCFG::fixup_flow will nevertheless fix up the CFG flow(i.e. flip successor blocks of IfNode) right after PhaseBlockLayout pass, we can remove this step when doing PhaseBlockLayout pass.(Testing: jtreg/compiler/c2, presubmit test)
jdk/src/hotspot/share/opto/compile.cpp
Line 2765 in 5ec1cdc
jdk/src/hotspot/share/opto/block.cpp
Line 1679 in 5ec1cdc
jdk/src/hotspot/share/opto/block.cpp
Lines 908 to 916 in 5ec1cdc
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5705/head:pull/5705
$ git checkout pull/5705
Update a local copy of the PR:
$ git checkout pull/5705
$ git pull https://git.openjdk.java.net/jdk pull/5705/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 5705
View PR using the GUI difftool:
$ git pr show -t 5705
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5705.diff