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

8257848: -XX:CompileCommand=blackhole,* should be diagnostic #1674

Closed
wants to merge 6 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Dec 7, 2020

This follows up on retroactive CSR review comments (JDK-8257827). As the result of discussion, it is decided to demote the "blackhole" compile command to diagnostic. Examples:

$ build/linux-x86_64-server-release/images/jdk/bin/java -Xcomp -XX:CompileCommand=quiet -XX:CompileCommand=blackhole,java/lang/Object.toString
OpenJDK 64-Bit Server VM warning: Blackhole compile option is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions

$ build/linux-x86_64-server-release/images/jdk/bin/java -Xcomp -XX:+UnlockDiagnosticVMOptions -XX:CompileCommand=quiet -XX:CompileCommand=blackhole,java/lang/Object.toString
OpenJDK 64-Bit Server VM warning: Blackhole compile option only works for methods with void type: java.lang.Object.toString()Ljava/lang/String;

New test verifies the locking/unlocking of the command.

Testing:


Progress

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

Issue

  • JDK-8257848: -XX:CompileCommand=blackhole,* should be diagnostic

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 7, 2020

👋 Welcome back shade! 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 Dec 7, 2020

@shipilev 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 Dec 7, 2020
@shipilev shipilev changed the title 8257848: -XX:+CompileCommand=blackhole,* should be diagnostic 8257848: -XX:CompileCommand=blackhole,* should be diagnostic Dec 7, 2020
@shipilev shipilev marked this pull request as ready for review December 7, 2020 19:13
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 7, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 7, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 7, 2020

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

8257848: -XX:CompileCommand=blackhole,* should be diagnostic

Reviewed-by: vlivanov

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

  • d2b6619: 8242258: (jrtfs) Path::toUri throws AssertionError for malformed input
  • 52ab721: 8254733: HotSpot Style Guide should permit using range-based for loops
  • 1d0adbb: 8253644: C2: assert(skeleton_predicate_has_opaque(iff)) failed: unexpected
  • 51ac376: 8256411: Based anonymous classes have a weird end position
  • 0b6b6eb: 8257813: [redo] C2: Filter type in PhiNode::Value() for induction variables of trip-counted integer loops

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 Dec 7, 2020
src/hotspot/share/compiler/compilerOracle.cpp Outdated Show resolved Hide resolved
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.

Do you need to update blackhole tests to add -XX:+UnlockDiagnosticVMOptions?

@shipilev
Copy link
Member Author

shipilev commented Dec 8, 2020

Do you need to update blackhole tests to add -XX:+UnlockDiagnosticVMOptions?

They already have it, because they use -XX:+AbortVMOnCompilationFailure.

@shipilev
Copy link
Member Author

shipilev commented Dec 8, 2020

There is one unrelated x86_32 test failure, otherwise tests are clean.

/integrate

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

openjdk bot commented Dec 8, 2020

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

  • d2b6619: 8242258: (jrtfs) Path::toUri throws AssertionError for malformed input
  • 52ab721: 8254733: HotSpot Style Guide should permit using range-based for loops
  • 1d0adbb: 8253644: C2: assert(skeleton_predicate_has_opaque(iff)) failed: unexpected
  • 51ac376: 8256411: Based anonymous classes have a weird end position
  • 0b6b6eb: 8257813: [redo] C2: Filter type in PhiNode::Value() for induction variables of trip-counted integer loops

Your commit was automatically rebased without conflicts.

Pushed as commit 35e8153.

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

@vnkozlov
Copy link
Contributor

vnkozlov commented Dec 8, 2020

Do you need to update blackhole tests to add -XX:+UnlockDiagnosticVMOptions?

They already have it, because they use -XX:+AbortVMOnCompilationFailure.

Good.

@shipilev shipilev deleted the JDK-8257848-bh-diagnostic branch January 4, 2021 18:13
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
Development

Successfully merging this pull request may close these issues.

3 participants