8353588: [REDO] DaCapo xalan performance with -XX:+UseObjectMonitorTable

[rkennke]

Like #24098, but clears the BasicLock cache before calling inflate_and_enter().

diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index f7e0844639b..f17c46fea38 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -1667,6 +1667,9 @@ bool Deoptimization::relock_objects(JavaThread* thread, GrowableArray<MonitorInf
           // was fast_locked to restore the valid lock stack.
           ObjectSynchronizer::enter_for(obj, lock, deoptee_thread);
           if (deoptee_thread->lock_stack().contains(obj())) {
+            if (UseObjectMonitorTable) {
+              lock->clear_object_monitor_cache();
+            }
             LightweightSynchronizer::inflate_fast_locked_object(obj(), ObjectSynchronizer::InflateCause::inflate_cause_vm_internal,
                                                                 deoptee_thread, thread);
           }

---

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-8353588: [REDO] DaCapo xalan performance with -XX:+UseObjectMonitorTable (Bug - P4)

Reviewers

• Coleen Phillimore (@coleenp - Reviewer)
• Axel Boldt-Christmas (@xmas92 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24413

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back rkennke! 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]

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

8353588: [REDO] DaCapo xalan performance with -XX:+UseObjectMonitorTable

Reviewed-by: coleenp, aboldtch

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

• 64b691a: 8271870: G1: Add objArray splitting when scanning object with evacuation failure
• b428cda: 8349686: [s390x] C1: Improve Class.isInstance intrinsic
• 70e3250: 8352419: Test tools/jpackage/share/ErrorTest.java#id0 and #id1 fail
• 296d9d6: 8353345: C2 asserts because maskShiftAmount modifies node without deleting the hash

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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]

@rkennke 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.

[mlbridge]

Webrevs

• 01: Full - Incremental (9073a18c)
• 00: Full (a83a451e)

[coleenp]

@xmas92 had two choices in the CR but I like this one better because a few lines above it also clears the object_monitor_cache for UseObjectMonitorTable, and I don't like testing null pointers.

[coleenp]

Also, I'll run this through our tier1-4 testing.

[coleenp]

Yes, I'll repost when testing is finished.

[coleenp]

Our internal tier1-4 tests passed.

[xmas92]

Alright. I'll hope we can improve this mechanism to be less fragile and more obvious in the future.

The stack cache was always written to be for C2 and the CacheSetter was there to cover all the other places we construct these BasicLocks in case they appear in a C2 frame. Now we are using it bidirectionally in both enter and exit.

But this should work, and I know you are working on future improvements here @coleenp

Thanks for the fix @rkennke

[rkennke]

Thanks @coleenp and @xmas92!

/integrate

[openjdk]

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

• db08726: 8352966: Opensource Several Font related tests - Batch 2
• 6b7b324: 8351431: Type annotations on new class creation expressions can't be retrieved
• 64b691a: 8271870: G1: Add objArray splitting when scanning object with evacuation failure
• b428cda: 8349686: [s390x] C1: Improve Class.isInstance intrinsic
• 70e3250: 8352419: Test tools/jpackage/share/ErrorTest.java#id0 and #id1 fail
• 296d9d6: 8353345: C2 asserts because maskShiftAmount modifies node without deleting the hash

Your commit was automatically rebased without conflicts.

[openjdk]

@rkennke Pushed as commit d894b78.

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