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

8273489: Zero: Handle UseHeavyMonitors on all monitorenter paths #5416

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Sep 8, 2021

While fixing JDK-8273486, I noticed there is one place where we do not call VM slowpath when UseHeavyMonitors are requested. That place is ZeroInterpreter::native_entry. We should probably implement UseHeavyMonitors check on those paths.

New code is modeled after existing uses, for example this.

Additional testing:

  • Linux x86_64 Zero make bootcycle-images
  • Linux x86_64 Zero make bootcycle-images with -XX:+UseHeavyMonitors forced

Progress

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

Issue

  • JDK-8273489: Zero: Handle UseHeavyMonitors on all monitorenter paths

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5416

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 8, 2021

👋 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 Sep 8, 2021

@shipilev 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 Sep 8, 2021
@shipilev shipilev marked this pull request as ready for review Sep 8, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 8, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 8, 2021

Webrevs

coleenp
coleenp approved these changes Sep 9, 2021
Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Makes sense.

@openjdk
Copy link

openjdk bot commented Sep 9, 2021

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

8273489: Zero: Handle UseHeavyMonitors on all monitorenter paths

Reviewed-by: coleenp

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

  • c81690d: 8273498: compiler/c2/Test7179138_1.java timed out
  • 4866eaa: 8273409: Receiver type narrowed by CCP does not always trigger post-parse call devirtualization
  • 5ca26cb: 8273433: Enable parallelism in vmTestbase_nsk_sysdict tests
  • f6cc173: 8273539: [PPC64] gtest build error after JDK-8264207
  • 9690df7: 8273476: G1: refine G1CollectedHeap::par_iterate_regions_array_part_from
  • 00e059d: 8133686: HttpURLConnection.getHeaderFields and URLConnection.getRequestProperties methods return field values in reverse order
  • aa93111: 8273483: Zero: Clear pending JNI exception check in native method handler
  • 8c16f48: 8273487: Zero: Handle "zero" variant in runtime tests
  • dc33bd8: 8273315: Parallelize and increase timeouts for java/foreign/TestMatrix.java test
  • 5b1dfe4: 8273439: Fix G1CollectedHeap includes and forward declarations
  • ... and 39 more: https://git.openjdk.java.net/jdk/compare/3cd95a2932ab6a2cb39322354f7ad181de8bfc9e...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 the ready Pull request is ready to be integrated label Sep 9, 2021
@shipilev
Copy link
Member Author

shipilev commented Sep 9, 2021

Thanks! I'll integrate now.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 9, 2021

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

  • c81690d: 8273498: compiler/c2/Test7179138_1.java timed out
  • 4866eaa: 8273409: Receiver type narrowed by CCP does not always trigger post-parse call devirtualization
  • 5ca26cb: 8273433: Enable parallelism in vmTestbase_nsk_sysdict tests
  • f6cc173: 8273539: [PPC64] gtest build error after JDK-8264207
  • 9690df7: 8273476: G1: refine G1CollectedHeap::par_iterate_regions_array_part_from
  • 00e059d: 8133686: HttpURLConnection.getHeaderFields and URLConnection.getRequestProperties methods return field values in reverse order
  • aa93111: 8273483: Zero: Clear pending JNI exception check in native method handler
  • 8c16f48: 8273487: Zero: Handle "zero" variant in runtime tests
  • dc33bd8: 8273315: Parallelize and increase timeouts for java/foreign/TestMatrix.java test
  • 5b1dfe4: 8273439: Fix G1CollectedHeap includes and forward declarations
  • ... and 39 more: https://git.openjdk.java.net/jdk/compare/3cd95a2932ab6a2cb39322354f7ad181de8bfc9e...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 9, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated labels Sep 9, 2021
@openjdk
Copy link

openjdk bot commented Sep 9, 2021

@shipilev Pushed as commit e3bda63.

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

@openjdk openjdk bot removed the rfr Pull request is ready for review label Sep 9, 2021
@shipilev shipilev deleted the JDK-8273489-zero-heavymonitors branch Sep 13, 2021
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
2 participants