Skip to content

Conversation

@dougxc
Copy link
Member

@dougxc dougxc commented Feb 18, 2025

JDK-8346781 changed JVMCIServiceLocator such that the set of providers is computed eagerly in JVMCIServiceLocator.<clinit>. There are some JVMCI test classes that directly subclass JVMCIServiceLocator which means deadlock could occur between the main thread running the test and a JVMCI compiler thread. This PR fixes this by ensuring that JVMCIServiceLocator providers are separate classes from the main test class.


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-8350263: JvmciNotifyBootstrapFinishedEventTest intermittently times out (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23679

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 18, 2025

👋 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
Copy link

openjdk bot commented Feb 18, 2025

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

8350263: JvmciNotifyBootstrapFinishedEventTest intermittently times out

Reviewed-by: yzheng, never

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 rfr Pull request is ready for review label Feb 18, 2025
@openjdk
Copy link

openjdk bot commented Feb 18, 2025

@dougxc 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 Feb 18, 2025
@mlbridge
Copy link

mlbridge bot commented Feb 18, 2025

Webrevs

ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseJVMCICompiler", "-Djvmci.Compiler=ErrorCompiler",
"-XX:-UseJVMCINativeLibrary",
Copy link
Contributor

Choose a reason for hiding this comment

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

do we support this in a jdk build?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure I understand the question: UseJVMCINativeLibrary is a JVMCI flag just like all other JVMCI flags.

Copy link
Contributor

Choose a reason for hiding this comment

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

IIUC -UseJVMCINativeLibrary will not use libjvmcicompiler.so but we don't include any Graal java class in jmods/jdk.graal.compiler.jmod, then what does it run?

Copy link
Member Author

Choose a reason for hiding this comment

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

The -Djvmci.Compiler=ErrorCompiler option specifies a different compiler implementation.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see now. So +UseJVMCINativeLibrary overrides -Djvmci.Compiler=ErrorCompiler and that is why we have to explicitly specify -UseJVMCINativeLibrary?

Copy link
Member Author

@dougxc dougxc Feb 18, 2025

Choose a reason for hiding this comment

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

Yes. Without specifying -UseJVMCINativeLibrary, you get this error:

Cannot use JVMCI compiler: JVMCI compiler 'ErrorCompiler' not found in JVMCI native library.
Use -XX:-UseJVMCINativeLibrary when specifying a JVMCI compiler available on a class path with jvmci.Compiler.

@dougxc
Copy link
Member Author

dougxc commented Feb 18, 2025

Thanks for the reviews.

/integrate

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 18, 2025
@openjdk
Copy link

openjdk bot commented Feb 18, 2025

@dougxc An unexpected error occurred during integration. No push attempt will be made. The error has been logged and will be investigated. It is possible that this error is caused by a transient issue; feel free to retry the operation.

@dougxc
Copy link
Member Author

dougxc commented Feb 18, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Feb 18, 2025

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

  • 46d4a60: 8349088: De-virtualize Codeblob and nmethod
  • 62d93f2: 8346050: Update BuildTestLib.gmk to build whole testlibrary

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 18, 2025

@dougxc Pushed as commit f2b4e12.

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

Development

Successfully merging this pull request may close these issues.

3 participants