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

8253690: [PPC64] Use flag kind "diagnostic" for platform specific flags #413

Closed

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Sep 29, 2020

Current platform implementation (globals_ppc.hpp) uses regular product flags for almost everything.
Most platform specific flags were never intended for official support. They are only there to diagnose issues and find workarounds.
So flag kind "diagnostic" fits better for them.

Note that I rearranged a couple of lines when looking at the diff.
My actual change is what is described here: https://bugs.openjdk.java.net/browse/JDK-8253692


Progress

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

Issue

  • JDK-8253690: [PPC64] Use flag kind "diagnostic" for platform specific flags

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 29, 2020

👋 Welcome back mdoerr! 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 Sep 29, 2020
@openjdk
Copy link

openjdk bot commented Sep 29, 2020

@TheRealMDoerr 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 29, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 29, 2020

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Hi Martin,

make sure you check up on the places the switches are used and pass UnlockDiagnosticVMOptions.

Cheers, Thomas

"Reoptimize code-sequences of calls at runtime.") \
\
/* Power 8: Configure Data Stream Control Register. */ \
product(uint64_t,DSCR_PPC64, (uintx)-1, \
product(uint64_t, DSCR_PPC64, (uint64_t)-1, \
Copy link
Member

Choose a reason for hiding this comment

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

Has nothing to do with this issue. But I leave it up to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just cleanup, no real change.

/* special instructions */ \
product(bool, UseByteReverseInstructions, false, \
product(bool, SuperwordUseVSX, false, \
Copy link
Member

Choose a reason for hiding this comment

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

Why leave this one out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

SuperwordUseVSX switches usage of vector registers in C2. It's more fundamental than simple instruction usage switches. It's comparable to UseAVX on x86 which is product, too. So I prefer keeping it product for now. Are you ok with it?

Copy link
Member

Choose a reason for hiding this comment

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

Sure, just curious. Leave it up to you.

\
product(bool, ZapMemory, false, "Write 0x0101... to empty memory." \
" Use this to ease debugging.") \
Copy link
Member

Choose a reason for hiding this comment

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

Future cleanup: this feels like it should be in shared code. The usual way to do this is to zap in DEBUG.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, sounds like this functionality derserves some overwork. But I only want to make it diagnostic with this change.

Copy link
Member

@tstuefe tstuefe 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 Martin.

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

This is an overdue cleanup. Thanks for taking care. The changes look good to me. Reviewed.

@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 1, 2020

@TheRealMDoerr This PR has not yet been marked as ready for integration.

@TheRealMDoerr TheRealMDoerr changed the title 8253690: [PPC64] Use flag kind diagnostic for platform specific flags 8253690: [PPC64] Use flag kind "diagnostic" for platform specific flags Oct 1, 2020
@TheRealMDoerr TheRealMDoerr changed the title 8253690: [PPC64] Use flag kind "diagnostic" for platform specific flags 8253690: [PPC64] Use flag kind diagnostic for platform specific flags Oct 1, 2020
@TheRealMDoerr TheRealMDoerr changed the title 8253690: [PPC64] Use flag kind diagnostic for platform specific flags 8253690: [PPC64] Use flag kind "diagnostic" for platform specific flags Oct 1, 2020
@openjdk
Copy link

openjdk bot commented Oct 1, 2020

@TheRealMDoerr 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 more details.

After integration, the commit message for the final commit will be:

8253690: [PPC64] Use flag kind "diagnostic" for platform specific flags

Reviewed-by: stuefe, lucy

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

  • 1d88172: 8253682: The AppletInitialFocusTest1.java is unstable
  • 5dd9353: 8253636: C2: Adjust NodeClasses::_max_classes
  • 05a764f: 8253883: Problem list jdk/test/lib/hexdump/ASN1Formatter on Windows
  • 55c282b: 8253878: clean up nsk/share/jvmti/ArgumentHandler
  • 776acfd: 8253880: clean up sun/hotspot/tools/ctw/Utils class
  • 79d70f6: 8253869: sun/hotspot/whitebox/CPUInfoTest.java fails after JDK-8239090
  • ca0e014: 8252003: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jvmti
  • 092c227: 8252523: Add ASN.1 Formatter to work with test utility HexPrinter
  • 06d8cf6: 8253812: Cleanup AbstractMemberWriter
  • 424d7d6: 8252881: [JVMCI] ResolvedJavaType.resolveMethod fails in fastdebug when invoked with a constructor
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/1ae6b533fbba433e64868aa3b6846041e3a91136...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 1, 2020
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk openjdk bot closed this Oct 1, 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 1, 2020
@openjdk
Copy link

openjdk bot commented Oct 1, 2020

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

  • 1d88172: 8253682: The AppletInitialFocusTest1.java is unstable
  • 5dd9353: 8253636: C2: Adjust NodeClasses::_max_classes
  • 05a764f: 8253883: Problem list jdk/test/lib/hexdump/ASN1Formatter on Windows
  • 55c282b: 8253878: clean up nsk/share/jvmti/ArgumentHandler
  • 776acfd: 8253880: clean up sun/hotspot/tools/ctw/Utils class
  • 79d70f6: 8253869: sun/hotspot/whitebox/CPUInfoTest.java fails after JDK-8239090
  • ca0e014: 8252003: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jvmti
  • 092c227: 8252523: Add ASN.1 Formatter to work with test utility HexPrinter
  • 06d8cf6: 8253812: Cleanup AbstractMemberWriter
  • 424d7d6: 8252881: [JVMCI] ResolvedJavaType.resolveMethod fails in fastdebug when invoked with a constructor
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/1ae6b533fbba433e64868aa3b6846041e3a91136...master

Your commit was automatically rebased without conflicts.

Pushed as commit a824289.

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

@TheRealMDoerr TheRealMDoerr deleted the 8253690_ppc64_flags branch October 1, 2020 09:21
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