Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Feb 3, 2024

Clean backport to improve Zero support.

Additional testing:

  • Linux x86_32 Zero, jcstress run
  • Large matrix of Zero builds

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-8319777 needs maintainer approval
  • JDK-8320582 needs maintainer approval

Issues

  • JDK-8319777: Zero: Support 8-byte cmpxchg (Enhancement - P4 - Approved)
  • JDK-8320582: Zero: Misplaced CX8 enablement flag (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 232

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 3, 2024

👋 Welcome back shade! 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 Backport 6b96bb640aa91d96877b8ceea5fed359607c1e45 8319777: Zero: Support 8-byte cmpxchg Feb 3, 2024
@openjdk
Copy link

openjdk bot commented Feb 3, 2024

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Feb 3, 2024
@shipilev shipilev force-pushed the JDK-8319777-zero-8byte-cas branch from 8009883 to 1b37227 Compare February 3, 2024 10:11
@shipilev
Copy link
Member Author

shipilev commented Feb 3, 2024

/issue add JDK-8320582

@openjdk
Copy link

openjdk bot commented Feb 3, 2024

@shipilev
Adding additional issue to issue list: 8320582: Zero: Misplaced CX8 enablement flag.

@shipilev shipilev force-pushed the JDK-8319777-zero-8byte-cas branch from 1b37227 to 54596cc Compare February 7, 2024 07:46
@shipilev shipilev marked this pull request as ready for review February 7, 2024 15:52
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 7, 2024
@shipilev
Copy link
Member Author

shipilev commented Feb 7, 2024

/approval request 8319777 Clean backport to improve Zero support. It enables the code that is protected by VMVersion::supports_cx8 flag, but significant chunk of the code is already does 8-byte CASes without consulting this flag. The patch is contained in Zero and gives no risk to Server ports. Zero testing passes. JDK-8320582 is the follow-up for this one.
/approval request 8320582 Clean followup to JDK-8319777. Zero testing passes.

@openjdk
Copy link

openjdk bot commented Feb 7, 2024

@shipilev
8319777: The approval request has been created successfully.
8320582: The approval request has been created successfully.

@openjdk
Copy link

openjdk bot commented Feb 7, 2024

@shipilev
8319777: The approval request has been updated successfully.
8320582: The approval request has been updated successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Feb 7, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 7, 2024

Webrevs

@GoeLin
Copy link
Member

GoeLin commented Feb 8, 2024

/approve yes

@openjdk
Copy link

openjdk bot commented Feb 8, 2024

@GoeLin
8319777: The approval request has been approved.
8320582: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Feb 8, 2024

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

8319777: Zero: Support 8-byte cmpxchg
8320582: Zero: Misplaced CX8 enablement flag

Reviewed-by: phh

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.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Feb 8, 2024
@shipilev
Copy link
Member Author

shipilev commented Feb 8, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Feb 8, 2024

Going to push as commit 98e6d04.

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

openjdk bot commented Feb 8, 2024

@shipilev Pushed as commit 98e6d04.

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

@shipilev shipilev deleted the JDK-8319777-zero-8byte-cas branch February 8, 2024 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants