Skip to content

8310513: [s390x] Intrinsify recursive ObjectMonitor locking #17975

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

Closed
wants to merge 3 commits into from

Conversation

offamitkumar
Copy link
Member

@offamitkumar offamitkumar commented Feb 23, 2024

s390 implementation of JDK-8277180. PPC implementation for the same: #7305

I had tested tier1 on fastdebug, release vm.

BenchMarking:

./build/linux-s390x-server-release/jdk/bin/java -Xms4g -Xmx4g -jar dacapo-9.12-MR1-bach.jar h2 -s huge -t 1 -n 1

without patch: 
===== DaCapo 9.12-MR1 h2 PASSED in 223023 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 225686 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 219824 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 226719 msec =====



with patch: 
===== DaCapo 9.12-MR1 h2 PASSED in 167816 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 174368 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 170517 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 169349 msec =====

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-8310513: [s390x] Intrinsify recursive ObjectMonitor locking (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17975

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 23, 2024

👋 Welcome back amitkumar! 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 changed the title JDK-8310513 8310513: [s390x] Intrinsify recursive ObjectMonitor locking Feb 23, 2024
@openjdk
Copy link

openjdk bot commented Feb 23, 2024

@offamitkumar 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 Feb 23, 2024
@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

8310513: [s390x] Intrinsify recursive ObjectMonitor locking

Reviewed-by: lucy, mdoerr

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

  • 635cb3c: 8329745: Update the documentation of ServerSocket and Socket to refer to StandardSocketOptions instead of legacy SocketOptions
  • 5c9f036: 8329858: G1: Make G1VerifyLiveAndRemSetClosure stateless
  • 492b954: 8329750: Change Universe functions to return more specific Klass* types
  • 87131fb: 8329629: GC interfaces should work directly against nmethod instead of CodeBlob
  • 5ea21c3: 8329878: Reduce public interface of CardTableBarrierSet
  • a48289a: 8329761: Remove unused KeyBuilder and unusedSets from StyleContext
  • 8907eda: 8325485: IncrementInstructions.of(int, int) is not storing the args
  • b9331cd: 8329823: RISC-V: Need to sync CPU features with related JVM flags
  • 71c5bbc: 8329527: Opcode.IFNONNULL.primaryTypeKind() is not ReferenceType
  • 58e39c1: 8329884: Serial: Fix build failure due to ‘Copy’ has not been declared
  • ... and 663 more: https://git.openjdk.org/jdk/compare/69a11c7f7ea7c4195a8ee56391bdf04c75bd8156...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.

@offamitkumar offamitkumar marked this pull request as ready for review April 5, 2024 04:00
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 5, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 5, 2024

Webrevs

@offamitkumar offamitkumar requested a review from RealLucy April 5, 2024 04:09
Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

Looks good overall.
My change requests have the intention to make identical actions look identical. That helps with understanding the code.

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

LGTM.
Reviewed, provided GHA find no errors.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 8, 2024
@offamitkumar
Copy link
Member Author

Thanks @RealLucy !!!

@TheRealMDoerr would you please review this as well?

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

I couldn't spot any bugs.

@offamitkumar
Copy link
Member Author

Thanks @TheRealMDoerr and @RealLucy for Review.

I ran the test again with -XX:-TieredCompilation flag and do not see any new failure there as well.

/integrate

@openjdk
Copy link

openjdk bot commented Apr 10, 2024

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 10, 2024

@offamitkumar Pushed as commit 47df145.

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

@offamitkumar offamitkumar deleted the recursive_locking branch May 15, 2024 09:46
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
Development

Successfully merging this pull request may close these issues.

3 participants