-
Notifications
You must be signed in to change notification settings - Fork 5.8k
8259984: IGV: Crash when drawing control flow before GCM #2607
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 rcastanedalo! A progress list of the required criteria for merging this PR into |
@robcasloz 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
|
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! I played around with it in the IGV. I regularly got some assertion failure messages before - now they are gone now 👍
...isualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
Show resolved
Hide resolved
@robcasloz 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 45 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 |
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.
Excellent!
Thanks Christian and Nils for reviewing! Christian, I refactored the code as per your suggestion, please have a look again. |
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!
/summary |
@robcasloz Setting summary to:
|
Thanks again, Christian. |
/integrate |
@robcasloz Since your change was applied there have been 45 commits pushed to the
Your commit was automatically rebased without conflicts. Pushed as commit 61820b7. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
The block formation algorithm applied by IGV to schedule graphs without associated CFG information traverses the graph backwards. This makes it difficult to deal with block projection nodes, leading in some cases to double addition of block nodes and block edges, and ultimately causing assertion failures.
This fix replaces the backward traversal by a forward traversal that relies on node category information (introduced in 8261336) to identify control successors. The forward traversal is arguably simpler and, besides avoiding the reported assertion failure, has two advantages:
The following screenshots illustrate the improvements (before the fix to the left, after the fix to the right):
Tested automatically on tens of thousands of graphs by running
java -Xcomp -XX:-TieredCompilation -XX:PrintIdealGraphLevel=4 ...
on an instrumented version of IGV that schedules graphs eagerly. Checked manually that the CFGs of a few selected graphs (included the reported one) are well-formed. Also checked that the overall IGV graph scheduling time is not affected by the changes.Thanks to Christian Hagedorn for checking the fix independently.
Progress
Issue
Reviewers
Download
$ git fetch https://git.openjdk.java.net/jdk pull/2607/head:pull/2607
$ git checkout pull/2607