8310513: [s390x] Intrinsify recursive ObjectMonitor locking

[offamitkumar]

Hi all,

This pull request contains a backport of commit 47df1459 from the openjdk/jdk repository.

The commit being backported was authored by Amit Kumar on 10 Apr 2024 and was reviewed by Lutz Schmidt and Martin Doerr.

Thanks!

Tested {tier1} X {fastdebug} with -XX:-TieredCompilation and do not see any new failure appearing.

Benchmarking Result:

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

With Patch: 
===== DaCapo 9.12-MR1 h2 PASSED in 148008 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 152460 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 151682 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 146845 msec =====


Without Patch: 
===== DaCapo 9.12-MR1 h2 PASSED in 192967 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 206936 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 191804 msec =====
===== DaCapo 9.12-MR1 h2 PASSED in 196735 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
• JDK-8310513 needs maintainer approval

Issue

• JDK-8310513: [s390x] Intrinsify recursive ObjectMonitor locking (Enhancement - P4 - Approved)

Reviewers

• Lutz Schmidt (@RealLucy - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 134

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk22u/pull/134.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 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]

@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

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

• 0f4bc65: 8328168: Epsilon: Premature OOM when allocating object larger than uncommitted heap size
• 71d0fcf: 8330156: RISC-V: Range check auipc + signed 12 imm instruction
• 4395278: 8327137: Add test for ConcurrentModificationException in BasicDirectoryModel
• 5de1d5c: 8323670: A few client tests intermittently throw ConcurrentModificationException
• e66cf81: 8305072: Win32ShellFolder2.compareTo is inconsistent
• 849b720: 8328953: JEditorPane.read throws ChangedCharSetException
• 890e046: 8320707: Virtual thread test updates
• 53f758e: 8328166: Epsilon: 'EpsilonHeap::allocate_work' misuses the parameter 'size' as size in bytes
• a93848c: 8295111: dpkg appears to have problems resolving symbolically linked native libraries
• bf8146e: 8328744: Parallel: Parallel GC throws OOM before heap is fully expanded
• ... and 35 more: https://git.openjdk.org/jdk22u/compare/22230b34d79010c6e639f55248cd6ce6be8c22e5...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealLucy) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[openjdk]

This backport pull request has now been updated with issue from the original commit.

[mlbridge]

Webrevs

• 01: Full - Incremental (2d563cf7)
• 00: Full (aeb9f25c)

[offamitkumar]

@RealLucy please review this :-)

[RealLucy]

Looks good.
Nice performance improvement.

[openjdk]

⚠️ @offamitkumar This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[offamitkumar]

/approval request Need to backport this change to JDK-22 as other archs ported it in JDK-21 and for them it's available in JDK-22u already.

[openjdk]

@offamitkumar
8310513: The approval request has been created successfully.

[offamitkumar]

Thanks @RealLucy for review.

/integrate

[openjdk]

@offamitkumar
Your change (at version 2d563cf) is now ready to be sponsored by a Committer.

[RealLucy]

/sponsor

[openjdk]

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

• 0f4bc65: 8328168: Epsilon: Premature OOM when allocating object larger than uncommitted heap size
• 71d0fcf: 8330156: RISC-V: Range check auipc + signed 12 imm instruction
• 4395278: 8327137: Add test for ConcurrentModificationException in BasicDirectoryModel
• 5de1d5c: 8323670: A few client tests intermittently throw ConcurrentModificationException
• e66cf81: 8305072: Win32ShellFolder2.compareTo is inconsistent
• 849b720: 8328953: JEditorPane.read throws ChangedCharSetException
• 890e046: 8320707: Virtual thread test updates
• 53f758e: 8328166: Epsilon: 'EpsilonHeap::allocate_work' misuses the parameter 'size' as size in bytes
• a93848c: 8295111: dpkg appears to have problems resolving symbolically linked native libraries
• bf8146e: 8328744: Parallel: Parallel GC throws OOM before heap is fully expanded
• ... and 35 more: https://git.openjdk.org/jdk22u/compare/22230b34d79010c6e639f55248cd6ce6be8c22e5...master

Your commit was automatically rebased without conflicts.

[openjdk]

@RealLucy @offamitkumar Pushed as commit 5eb11e5.

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