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

8277878: Fix compiler tests after JDK-8275908 #6581

Closed

Conversation

simonis
Copy link
Member

@simonis simonis commented Nov 27, 2021

This is a quick fix for the two compiler tests introduced by JDK-8275908. The test explicitly added SerialGC in the parameter list which leads to a garbage collector conflict, if the tests are run with some other Garbage collector.

It was suggested to fix this by adding a @requires vm.gc.Serial tag but this is not necessary because the tests are actually GC-agnostic so I've removed the -XX:+UseSerialGC parameter from the test command line instead.

After the fix it was necessary to refine the check for whether the test JVM has JVMCI support built-in. Before the fix, I used WhiteBox.getWhiteBox().isJVMCISupportedByGC() which worked fine if only running with SerialGC. Now that we can run with GCs which don't support JVMCI we have to use the more specific (WB.getBooleanVMFlag("EnableJVMCI") != null).

Please let me know if you want me to push this instantly after it has been reviewed or if you first want to re-run your internal Tier3 tests before pushing.


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6581/head:pull/6581
$ git checkout pull/6581

Update a local copy of the PR:
$ git checkout pull/6581
$ git pull https://git.openjdk.java.net/jdk pull/6581/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6581

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6581.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 27, 2021

👋 Welcome back simonis! 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 label Nov 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 27, 2021

@simonis 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 label Nov 27, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 27, 2021

Webrevs

Copy link
Member

@TobiHartmann TobiHartmann left a comment

That looks good and trivial to me.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

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

8277878: Fix compiler tests after JDK-8275908

Reviewed-by: thartmann, chagedorn

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

  • 72bacf8: 8276108: Wrong instruction generation in aarch64 backend
  • e3e5908: 8277847: Support toolGuide tag in class-level documentation
  • 9a3a9b1: 8277865: G1: Change integer division to floating point division
  • aed53ee: 8264838: IGV: enhance graph export functionality
  • 0c7a4b8: 8277842: IGV: Add jvms property to know where a node came from
  • c3a7f2f: 8277382: make c1 BlockMerger use IR::verify only when necessary
  • 8f9eb62: 8274784: jshell: Garbled character was displayed by System.out.println(...) on Japanese Windows

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 label Nov 29, 2021
Copy link
Member

@chhagedorn chhagedorn left a comment

Looks good! I guess it does not hurt to quickly verify it. Tier3 testing is submitted, will get back to you with the results.

@simonis
Copy link
Member Author

@simonis simonis commented Nov 29, 2021

Thanks @chhagedorn, @TobiHartmann!

I'll wait with submitting until @chhagedorn reports back the Tier3 results.

@dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Nov 29, 2021

@simonis the submitted tests have passed. Thanks.

@simonis
Copy link
Member Author

@simonis simonis commented Nov 29, 2021

/integrate

@simonis
Copy link
Member Author

@simonis simonis commented Nov 29, 2021

Thanks @dholmes-ora.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

Going to push as commit 614c6e6.
Since your change was applied there have been 12 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 29, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

@simonis Pushed as commit 614c6e6.

💡 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 integrated
4 participants