8330051: Small ObjectMonitor spinning code cleanups

[coleenp]

Please review this patch that refactors some functions in the adaptive spinning code and moves the Knobs to where they're used and can be modified for experiments in the following code. Also changed 'goto's to a 'break'. I didn't change the names of TrySpin or TryLock, since all the names in this file are this style.

The only non-cosmetic change is for the pre-spin. If the TryLock returns that a CAS failed, then the pre-spin ends, which shouldn't make a difference wrt to performance because the pre-spin is only for 10 iterations, but somehow my numbers are a little bit better for both Dacapo pmd and xalan.

Tested with tier1-7.

---

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-8330051: Small ObjectMonitor spinning code cleanups (Enhancement - P4)

Reviewers

• Daniel D. Daugherty (@dcubed-ojdk - Reviewer)
• Erik Österlund (@fisk - Reviewer) ⚠️ Review applies to 5499cc04
• Fredrik Bredberg (@fbredber - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18730

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

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

8330051: Small ObjectMonitor spinning code cleanups

Reviewed-by: dcubed, eosterlund, fbredberg

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

• 6d56996: 8330540: Rename the enum type CompileCommand to CompileCommandEnum
• f6feeb0: 8330703: Improve link syntax in javax.lang.model.util
• df04358: 8330179: Clean up non-standard use of /** comments in jdk.compiler
• c1dd82b: 8329644: Discuss expected visitor evolution patterns in javax.lang.model.util
• b704e91: 8329433: Reduce nmethod header size
• 8da175d: 8330008: [s390x] Test bit "in-memory" in case of DiagnoseSyncOnValueBasedClasses
• 3c1d1d9: 8320522: Remove code related to RegisterFinalizersAtInit
• 650ca65: 8329330: NoClassDefFoundError: Could not initialize class jdk.jfr.internal.MirrorEvents
• 177092b: 8330569: Rename Nix to Posix in platform-dependent attachListener code
• eb60822: 8310072: JComboBox/DisabledComboBoxFontTestAuto: Enabled and disabled ComboBox does not match in these LAFs: GTK+
• ... and 221 more: https://git.openjdk.org/jdk/compare/8267d6565d17c8db8f5b50a37482610ffe0a8a5c...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]

@coleenp The following label will be automatically applied to this pull request:

• hotspot-runtime

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

• 05: Full - Incremental (15fbf5fb)
• 04: Full - Incremental (c3fa46bd)
• 03: Full - Incremental (5499cc04)
• 02: Full - Incremental (a505b45a)
• 01: Full - Incremental (f6155395)
• 00: Full (1fed2faa)

[dcubed-ojdk]

There are some changes in behavior that I've flagged in this pass.

They might actually be okay, but I have to mull on it. For now I'm
not yet ready to approve.

[coleenp]

Thank you for the knowledgable review and comments.

[fisk]

This looks good to me. Maybe one name change nit. I don't need to see the updated version.

[fbredber]

Looks good to me. Introducing TryLockResult really improves the readability.

[fbredber]

Thanks for the if/break update. Looks good!

[dcubed-ojdk]

Thumbs up!

[coleenp]

Thank you Dan, Fredrik, Erik and Axel for your reviews and comments.
/integrate

[openjdk]

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

• 3e185c7: 8330154: Serial: Remove TenuredSpace::update_for_block
• f889797: 8330463: Rename invalidate() to write_region() in ModRefBarrierSet
• c4f5c51: 8330576: ZYoungCompactionLimit should have range check
• 70acade: 8330339: G1: Move some public methods to private in G1BlockOffsetTable APIs
• 35b30c8: 8330595: Invoke ObjectMethods::bootstrap method exactly
• 3d62bbf: 8330681: Explicit hashCode and equals for java.lang.runtime.SwitchBootstraps$TypePairs
• 5313dcc: 8330733: Generational ZGC: Remove ZBarrier::verify_old_object_live_slow_path
• 5394f57: 8330621: Make 5 compiler tests use ProcessTools.executeProcess
• 20546c1: 8330004: Refactor cloning down code in Split If for Template Assertion Predicates
• bd67ac6: 8329331: Intrinsify Unsafe::setMemory
• ... and 232 more: https://git.openjdk.org/jdk/compare/8267d6565d17c8db8f5b50a37482610ffe0a8a5c...master

Your commit was automatically rebased without conflicts.

[openjdk]

@coleenp Pushed as commit ee7b2e9.

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