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

8255245: C1: Fix output of -XX:+PrintCFGToFile to open it with visualizer #837

Closed
wants to merge 2 commits into from

Conversation

chhagedorn
Copy link
Member

@chhagedorn chhagedorn commented Oct 23, 2020

JDK-8251093 introduced some improved logging for intervals. When specifying -XX:+PrintCFGToFile to dump the graph to a file to later open it with the C1 visualizer, it also uses the improved interval printing. However, this output can no longer be read by the C1 Visualizer. As the C1 Visualizer is not part of the JDK, we should include the old format again for the output produced by -XX:+PrintCFGToFile to be compatible with the visualizer again. The console output can still use the improved logging of JDK-8251093.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Testing

Linux x32 Linux x64 Windows x64 macOS x64
Build ✔️ (1/1 passed) ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) (1/9 failed) ✔️ (9/9 passed)

Failed test task

Issue

  • JDK-8255245: C1: Fix output of -XX:+PrintCFGToFile to open it with visualizer

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/837/head:pull/837
$ git checkout pull/837

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 23, 2020

👋 Welcome back chagedorn! 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 openjdk bot added the rfr Pull request is ready for review label Oct 23, 2020
@openjdk
Copy link

openjdk bot commented Oct 23, 2020

@chhagedorn 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 Oct 23, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 23, 2020

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

@openjdk
Copy link

openjdk bot commented Oct 23, 2020

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

8255245: C1: Fix output of -XX:+PrintCFGToFile to open it with visualizer

Reviewed-by: kvn, xliu

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

  • ca8bba6: 8238263: Create at-requires mechanism for containers
  • a7fa1b7: 8251994: VM crashed running TestComplexAddrExpr.java test with -XX:UseAVX=X
  • b498433: 8254825: Monitoring available clipboard formats should be done via new Windows APIs
  • de05b00: 8255365: Problem list failing client manual tests
  • 49c4978: 8060202: [macosx] Test closed/java/awt/Choice/GetSizeTest/GetSizeTest fails only in MacOSX(10.10)
  • 2b47a58: 8028281: [TEST_BUG] [macosx] javax/swing/JTabbedPane/7024235/Test7024235.java fails
  • 83a91bf: 8253734: C2: Optimize Move nodes
  • 6666dcb: 8237363: Remove automatic is in heap verification in OopIterateClosure
  • fa64477: 8255301: Common and strengthen the code in ciMemberName and ciMethodHandle
  • 9b5a2a6: 8255349: Vector API issues on Big Endian
  • ... and 69 more: https://git.openjdk.java.net/jdk/compare/bd45191f00b3e282b833e5b349bbede3c390485a...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 Oct 23, 2020
@chhagedorn
Copy link
Member Author

@vnkozlov @neliasso @navyxliu Thank you for your reviews!

@chhagedorn
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Oct 28, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 28, 2020
@openjdk
Copy link

openjdk bot commented Oct 28, 2020

@chhagedorn Since your change was applied there have been 103 commits pushed to the master branch:

  • 5e0a8cd: 8255488: Re-enable some problem listed tests
  • 3f8bd92: 8233556: [TESTBUG] JPopupMenu tests fail on MacOS
  • 4acf634: 8171998: javax/swing/JMenu/4692443/bug4692443.java fails on Windows
  • a804c6a: 8254871: Remove unnecessary string copy in NetworkInterface.c
  • acd0e25: 8255254: Split os::reserve_memory and os::map_memory_to_file interfaces
  • dc85a3f: 8015602: [macosx] Test javax/swing/SpringLayout/4726194/bug4726194.java fails on MacOSX
  • 1d245c6: 8252117: com/sun/jdi/BadHandshakeTest.java failed with "ConnectException: Connection refused: connect"
  • 7a7ce02: 8007632: DES/3DES keys support in PKCS12 keystore
  • a023b93: 8255394: jdk/test/lib/hexdump/ASN1FormatterTest.java fails with ---illegal-access=deny
  • 84e985d: 8253920: Share method trampolines in CDS dynamic archive
  • ... and 93 more: https://git.openjdk.java.net/jdk/compare/bd45191f00b3e282b833e5b349bbede3c390485a...master

Your commit was automatically rebased without conflicts.

Pushed as commit b7d483c.

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

@chhagedorn chhagedorn deleted the JDK-8255245 branch Nov 18, 2020
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
4 participants