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.

Sign up for GitHub

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

Jump to bottom

8315948: JDK-8315818 broke Xcomp on libgraal #15643

Closed
wants to merge 2 commits into from
Closed

8315948: JDK-8315818 broke Xcomp on libgraal #15643

wants to merge 2 commits into from

Conversation

dougxc
Copy link
Member

@dougxc dougxc commented Sep 8, 2023 •
edited by openjdk bot
Loading

This PR fixes a regression caused by JDK-8315818. Libgraal must not unblock a thread waiting on a blocking compilation, even if libgraal itself is not yet initialized. Initialization of libgraal is not prone to the same initialization deadlocks that jargraal can cause.

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-8315948: JDK-8315818 broke Xcomp on libgraal (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15643

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 8, 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
Copy link

openjdk bot commented Sep 8, 2023

@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 Sep 8, 2023
@dougxc dougxc marked this pull request as ready for review September 8, 2023 18:24
tkrodriguez
tkrodriguez approved these changes Sep 8, 2023
View reviewed changes
src/hotspot/share/compiler/compileBroker.cpp Outdated
blocking = false;
}
} else {
// In libjvmci, JVMCI initialization should not deadlock with other threads
Copy link
Contributor

Choose a reason for hiding this comment

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

Can't this comment just go before the guarding if? An empty else at the every end is harder to connect with the guarding condition.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@openjdk
Copy link

openjdk bot commented Sep 8, 2023 •
edited
Loading

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

8315948: JDK-8315818 broke Xcomp on libgraal

Reviewed-by: never, thartmann

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

  • 455c471: 8313277: Resolve multiple definition of 'normalize' when statically linking JDK native libraries with user code
  • 3b422d0: 8316094: Problemlist compiler/rangechecks/TestRangeCheckHoistingScaledIV.java
  • f55e799: 8316038: Fix doc typos in java.io.Console and java.util.Scanner
  • 9480078: 8315550: G1: Fix -Wconversion warnings in g1NUMA
  • d08258f: 8315938: Deprecate for removal Unsafe methods that have standard APIs for many releases
  • fda142f: 8312174: missing JVMTI events from vthreads parked during JVMTI attach
  • d0be73a: 8041488: Locale-Dependent List Patterns
  • dd214d0: 8315437: Enable parallelism in vmTestbase/nsk/monitoring/stress/classload tests
  • 877731d: 8315770: serviceability/sa/TestJmapCoreMetaspace.java should run with -XX:-VerifyDependencies
  • d06a564: 8315765: G1: Incorrect use of G1LastPLABAverageOccupancy
  • ... and 15 more: https://git.openjdk.org/jdk/compare/a62c48b87e814b5b1f4c8089f9ff354156f92f69...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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 8, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 8, 2023

Webrevs

TobiHartmann
TobiHartmann approved these changes Sep 12, 2023
View reviewed changes
Copy link
Member

@TobiHartmann TobiHartmann left a comment

Choose a reason for hiding this comment

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

Looks reasonable to me.

@dougxc
Copy link
Member Author

dougxc commented Sep 12, 2023

Testing was done via GitHub actions and on libgraal using mach5.

Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Sep 12, 2023

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

  • 8b4f9a8: 8315990: Amend problemlisted tests to proper position
  • 455c471: 8313277: Resolve multiple definition of 'normalize' when statically linking JDK native libraries with user code
  • 3b422d0: 8316094: Problemlist compiler/rangechecks/TestRangeCheckHoistingScaledIV.java
  • f55e799: 8316038: Fix doc typos in java.io.Console and java.util.Scanner
  • 9480078: 8315550: G1: Fix -Wconversion warnings in g1NUMA
  • d08258f: 8315938: Deprecate for removal Unsafe methods that have standard APIs for many releases
  • fda142f: 8312174: missing JVMTI events from vthreads parked during JVMTI attach
  • d0be73a: 8041488: Locale-Dependent List Patterns
  • dd214d0: 8315437: Enable parallelism in vmTestbase/nsk/monitoring/stress/classload tests
  • 877731d: 8315770: serviceability/sa/TestJmapCoreMetaspace.java should run with -XX:-VerifyDependencies
  • ... and 16 more: https://git.openjdk.org/jdk/compare/a62c48b87e814b5b1f4c8089f9ff354156f92f69...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 12, 2023

@dougxc Pushed as commit 6f2684b.

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

@dougxc dougxc deleted the JDK-8315948 branch August 20, 2024 06:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TobiHartmann TobiHartmann TobiHartmann approved these changes

@tkrodriguez tkrodriguez tkrodriguez approved these changes

Assignees
No one assigned
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dougxc @tkrodriguez @TobiHartmann