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

8309974: some JVMCI tests fail when VM options include -XX:+EnableJVMCI #14476

Closed
wants to merge 1 commit into from

Conversation

dougxc
Copy link
Member

@dougxc dougxc commented Jun 14, 2023

This PR fixes a few JVMCI tests to run the ClassFileInstaller step with @run main/othervm instead of @run driver so that it inherits extra VM options passed to jtreg. This is required for these tests as they use JVMCI and module exports are needed when running ClassFileInstaller on the test class itself.

Thanks to @jonathan-gibbons for providing this solution.


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-8309974: some JVMCI tests fail when VM options include -XX:+EnableJVMCI (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14476

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 14, 2023

👋 Welcome back dnsimon! 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 Jun 14, 2023
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

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

  • hotspot

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 hotspot-dev@openjdk.org label Jun 14, 2023
…Installer to inherit VM options passed to jtreg
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

@dougxc Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@mlbridge
Copy link

mlbridge bot commented Jun 14, 2023

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

I must admit I am surprised by this situation. I never imagined that @module directives would also be applied to the action to run the ClassfileInstaller as it should not need anything of that kind - it is just a simple file copying utility. But I can see how jtreg has no way to know that. Makes me wonder though whether @modules should only ever be applied to main/othervm? We not only recommend using driver mode for ClassfileInstaller we actively went through and changed a number of tests to do that!

So the fix seems fine in so far as the situation we have today, but I'm not convinced there isn't a jtreg issue here that needs further examination.

Thanks.

@openjdk
Copy link

openjdk bot commented Jun 15, 2023

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

8309974: some JVMCI tests fail when VM options include -XX:+EnableJVMCI

Reviewed-by: dholmes

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

  • 5f3613e: 8309960: ParallelGC young collections very slow in DelayInducer
  • 83d9267: 8303513: C2: LoadKlassNode::make fails with 'expecting TypeKlassPtr'
  • de8aca2: 8307907: [ppc] Remove RTM locking implementation
  • 4c0e164: 8309717: C2: Remove Arena::move_contents usage
  • 6b94289: 8309502: RISC-V: String.indexOf intrinsic may produce misaligned memory loads
  • 181845a: 8309899: Rename PtrQueueSet::buffer_size()
  • 931625a: 8309808: BytecodeTracer prints wrong BSM for invokedynamic
  • ee4ab67: 8309958: Incorrect @SInCE tag format in Container.java

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 Jun 15, 2023
@dougxc
Copy link
Member Author

dougxc commented Jun 15, 2023

I must admit I am surprised by this situation. I never imagined that @module directives would also be applied to the action to run the ClassfileInstaller as it should not need anything of that kind - it is just a simple file copying utility. But I can see how jtreg has no way to know that. Makes me wonder though whether @modules should only ever be applied to main/othervm? We not only recommend using driver mode for ClassfileInstaller we actively went through and changed a number of tests to do that!

So the fix seems fine in so far as the situation we have today, but I'm not convinced there isn't a jtreg issue here that needs further examination.

Thanks.

To be honest, it's still unclear to me why passing the extra VM options -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI to jtreg (via the TEST_OPTS=VM_OPTIONS make control variable) causes this problem. That seems like it should be unrelated as to whether jtreg applies @module to a driver command. In any case, @jonathan-gibbons understands the jtreg issue and is taking care of it.

@dougxc dougxc changed the title 8309974: some JVMCI tests fails when VM options include -XX:+EnableJVMCI 8309974: some JVMCI tests fail when VM options include -XX:+EnableJVMCI Jun 15, 2023
@dcubed-ojdk
Copy link
Member

If a bug has been filed for this JTREG issue that @jonathan-gibbons is investigating,
then please make sure that the bug for this PR is linked to it.

@dougxc
Copy link
Member Author

dougxc commented Jun 15, 2023

Thanks for the review David.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 15, 2023

Going to push as commit 8b4af46.
Since your change was applied there have been 9 commits pushed to the master branch:

  • 0038491: 8309978: [x64] Fix useless padding
  • 5f3613e: 8309960: ParallelGC young collections very slow in DelayInducer
  • 83d9267: 8303513: C2: LoadKlassNode::make fails with 'expecting TypeKlassPtr'
  • de8aca2: 8307907: [ppc] Remove RTM locking implementation
  • 4c0e164: 8309717: C2: Remove Arena::move_contents usage
  • 6b94289: 8309502: RISC-V: String.indexOf intrinsic may produce misaligned memory loads
  • 181845a: 8309899: Rename PtrQueueSet::buffer_size()
  • 931625a: 8309808: BytecodeTracer prints wrong BSM for invokedynamic
  • ee4ab67: 8309958: Incorrect @SInCE tag format in Container.java

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 15, 2023

@dougxc Pushed as commit 8b4af46.

💡 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 hotspot-dev@openjdk.org integrated Pull request has been integrated
3 participants