8282094: [REDO] Parallel: Refactor PSCardTable::scavenge_contents_parallel

[reinrich]

This backport is a dependency for the backport of https://bugs.openjdk.org/browse/JDK-8310031
Applies cleanly. Only a trivial renaming is required.
Risk is medium. We've done the downstream backport already many weeks ago.

I've tested on x86_64:
jdk:tier1 TEST_VM_OPTS="-XX:+UseParallelGC"
langtools:tier1 TEST_VM_OPTS="-XX:+UseParallelGC"

Local CI Testing:
The fix passed our CI testing (e.g. 2024-02-24): JTReg tests: tier1-4 of hotspot and jdk. All of Langtools and jaxp. JCK, SPECjvm2008, SPECjbb2015, Renaissance Suite, and SAP specific tests (also with ParallelGC).
Testing was done with fastdebug builds on the main platforms and also on Linux/PPC64le.

---

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-8282094 needs maintainer approval

Issue

• JDK-8282094: [REDO] Parallel: Refactor PSCardTable::scavenge_contents_parallel (Enhancement - P4 - Approved)

Reviewers

• Paul Hohensee (@phohensee - Reviewer) ⚠️ Review applies to c64debe9
• Zhengyu Gu (@zhengyu123 - Reviewer) ⚠️ Review applies to c64debe9

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2228/head:pull/2228
$ git checkout pull/2228

Update a local copy of the PR:
$ git checkout pull/2228
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2228/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2228

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2228.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back rrich! A progress list of the required criteria for merging this PR into pr/2227 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

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

[mlbridge]

Webrevs

• 02: Full (10ce4658)
• 01: Full - Incremental (c64debe9)
• 00: Full (c64debe9)

[zhengyu123]

LGTM

[openjdk-notifier]

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8282094_17u_backport
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

[openjdk]

@reinrich this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8282094_17u_backport
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

[reinrich]

So I'm trying to merge master after integration of the dependent PR #2227. Why do I get conflicts?? The backport applied cleanly on #2227

[openjdk]

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

8282094: [REDO] Parallel: Refactor PSCardTable::scavenge_contents_parallel

Reviewed-by: phh, zgu

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

[GoeLin]

Hi,
this is because you merge two changes, the one that sits under this one and the copy of it that was pushed to jdk17u-dev. They are identical, but Github does not grok this. This is very annoying. I have seen errors before in the parts merged automatically.

[reinrich]

Test failure is unrelated (https://bugs.openjdk.org/browse/JDK-8326960)

[reinrich]

/integrate

[openjdk]

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

• 3c05a02: 8326638: Crash in PhaseIdealLoop::remix_address_expressions due to unexpected Region instead of Loop
• f423686: 8325972: Add -x to bash for building with LOG=debug
• 385731f: 8320303: Allow PassFailJFrame to accept single window creator
• 30ead33: 8318580: "javax/swing/MultiMonitor/MultimonVImage.java failing with Error. Can't find library: /open/test/jdk/java/awt/regtesthelpers" after JDK-8316053

Your commit was automatically rebased without conflicts.

[openjdk]

@reinrich Pushed as commit fa8a159.

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