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

8294356: IGV: scheduled graphs contain duplicated elements #10423

Closed
wants to merge 2 commits into from

Conversation

robcasloz
Copy link
Contributor

@robcasloz robcasloz commented Sep 26, 2022

This changeset removes duplicated nodes and edges from graph dumps that include a control-flow graph:
cfg-before-after
This is achieved by ensuring that HotSpot only visits each node once when dumping IGV graphs.

Testing

  • Tested that tens of thousands of graphs do not contain duplicated nodes or edges by instrumenting IGV and running java -Xcomp -XX:PrintIdealGraphLevel=4.
  • Tested manually that unscheduled graphs are not affected by this changeset.
  • Tested that running compiler tests with -XX:PrintIdealGraphLevel=3 does not trigger any failure.

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8294356: IGV: scheduled graphs contain duplicated elements

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10423/head:pull/10423
$ git checkout pull/10423

Update a local copy of the PR:
$ git checkout pull/10423
$ git pull https://git.openjdk.org/jdk pull/10423/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10423

View PR using the GUI difftool:
$ git pr show -t 10423

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10423.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 26, 2022

👋 Welcome back rcastanedalo! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Sep 26, 2022

@robcasloz The following label will be automatically applied to this pull request:

  • hotspot-compiler

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.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Sep 26, 2022
@robcasloz robcasloz marked this pull request as ready for review September 26, 2022 14:08
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 26, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 26, 2022

Webrevs

Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

Looks good!

src/hotspot/share/opto/idealGraphPrinter.cpp Outdated Show resolved Hide resolved
src/hotspot/share/opto/idealGraphPrinter.cpp Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Sep 26, 2022

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

8294356: IGV: scheduled graphs contain duplicated elements

Reviewed-by: chagedorn, thartmann

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 178 new commits pushed to the master branch:

  • 4df4a1f: 8287832: jdk/jfr/event/runtime/TestActiveSettingEvent.java failed with "Expected two batches of Active Setting events"
  • 35d17a0: 8293864: Kitchensink24HStress.java fails with SIGSEGV in JfrCheckpointManager::lease
  • c5f462e: 8294956: GHA: qemu-debootstrap is deprecated, use the regular one
  • 269252a: 8295007: javax/swing/JRadioButton/4314194/bug4314194.java fails in mach5 for WIndowLookAndFeel
  • 6ed74ef: 8295005: compiler/loopopts/TestRemoveEmptyLoop.java fails with release VMs after JDK-8294839
  • 8a148bc: 8294848: Unnecessary SSLCipher dispose implementations
  • 8713dfa: 8294541: java/io/BufferedInputStream/TransferTo.java fails with OOME
  • 542cc60: 8294366: RISC-V: Partially mark out incompressible regions
  • 495c043: 7124710: interleaved RedefineClasses() and RetransformClasses() calls may have a problem
  • d39d8c8: 8170389: java.text.DigitList.getDouble() : Controversy between javadoc and code
  • ... and 168 more: https://git.openjdk.org/jdk/compare/2be315877b734b70170ef6375712188d7cd64268...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 26, 2022
@robcasloz
Copy link
Contributor Author

Looks good!

Thanks for reviewing, Christian. I applied your suggestions, and replaced NULL with nullptr everywhere in the touched function for consistency.

Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

Thanks for the update, changes look good!

@robcasloz
Copy link
Contributor Author

May I get a second review for this one? The changes are small and debug-only. Thanks!

Copy link
Member

@TobiHartmann TobiHartmann left a 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.

@robcasloz
Copy link
Contributor Author

Looks good to me.

Thanks for reviewing, Tobias!

@robcasloz
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 11, 2022

Going to push as commit 97f1321.
Since your change was applied there have been 186 commits pushed to the master branch:

  • 5e05e42: 8294901: remove pre-VS2017 checks in Windows related coding
  • e775acf: 8293986: Incorrect double-checked locking in com.sun.beans.introspect.ClassInfo
  • 9d116ec: 8294262: AArch64: compiler/vectorapi/TestReverseByteTransforms.java test failed on SVE machine
  • 4b17d28: 8294261: AArch64: Use pReg instead of pRegGov when possible
  • 891156a: 8295003: Do not mention applets in the "java.awt.color" package
  • e6c33e6: 8295014: Remove unnecessary explicit casts to void* in CHeapObjBase
  • 1bfcc27: 8294931: JFR: Simplify SettingInfo
  • eb90c4f: 8294377: Prepare to stop auto-inheriting documentation for subclasses of exceptions whose documentation is inherited
  • 4df4a1f: 8287832: jdk/jfr/event/runtime/TestActiveSettingEvent.java failed with "Expected two batches of Active Setting events"
  • 35d17a0: 8293864: Kitchensink24HStress.java fails with SIGSEGV in JfrCheckpointManager::lease
  • ... and 176 more: https://git.openjdk.org/jdk/compare/2be315877b734b70170ef6375712188d7cd64268...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 11, 2022
@openjdk openjdk bot closed this Oct 11, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 11, 2022
@openjdk
Copy link

openjdk bot commented Oct 11, 2022

@robcasloz Pushed as commit 97f1321.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants