Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8321025: Enable Neoverse N1 optimizations for Neoverse V2 #2579

Closed

Conversation

pengxiaolong
Copy link
Contributor

@pengxiaolong pengxiaolong commented Jun 14, 2024

Notes

Backport 8321025: Enable Neoverse N1 optimizations for Neoverse V2 to jdk17, it is not a clean backport, the method model_is(0xd40) is in jdk17, equivalent code in jdk17 is like (_model == 0xd40 || _model2 == 0xd40).

Verification

Not able to test it on CPU with Neoverse V2, I don't have server supports Neoverse V2 yet, but the code has been backported to Amazon Corretto 17 since January 16, 2024, overall it should be a low risk.


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

Issue

  • JDK-8321025: Enable Neoverse N1 optimizations for Neoverse V2 (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2579

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 14, 2024

👋 Welcome back xpeng! 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
Copy link

openjdk bot commented Jun 14, 2024

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

8321025: Enable Neoverse N1 optimizations for Neoverse V2

Reviewed-by: shade

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

  • 33dbf71: 8293872: Make runtime/Thread/ThreadCountLimit.java more robust
  • e996135: 8320079: The ArabicBox.java test has no control buttons
  • 3df08b2: 8328560: java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java imports Applet
  • 04aa5f8: 8332936: Test vmTestbase/metaspace/gc/watermark_70_80/TestDescription.java fails with no GC's recorded
  • 20ee52e: 8331063: Some HttpClient tests don't report leaks
  • c2dd771: 8301686: TLS 1.3 handshake fails if server_name doesn't match resuming session
  • d41ad82: 8328011: Convert java/awt/Frame/GetBoundsResizeTest/GetBoundsResizeTest.java applet test to main
  • 544ab78: 8327650: Test java/nio/channels/DatagramChannel/StressNativeSignal.java timed out
  • 4621d59: 8328115: Convert java/awt/font/TextLayout/TestJustification.html applet test to main
  • 978b793: 8327137: Add test for ConcurrentModificationException in BasicDirectoryModel
  • ... and 59 more: https://git.openjdk.org/jdk17u-dev/compare/05e645e86af1e4933af8819966d57e0d680b5d25...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 (@shipilev) 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 openjdk bot changed the title Backport c9d15f7d5ee616bf48d85647ee504714ac5fafc2 8321025: Enable Neoverse N1 optimizations for Neoverse V2 Jun 14, 2024
@openjdk
Copy link

openjdk bot commented Jun 14, 2024

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

@openjdk openjdk bot added the backport label Jun 14, 2024
@pengxiaolong pengxiaolong marked this pull request as ready for review June 17, 2024 14:37
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 17, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 17, 2024

Webrevs

@shipilev
Copy link
Member

In Corretto 17, we picked up is_model: corretto/corretto-17@3d11b55. Seeing how this backport is already not clean, I think we should do the same here. It would also provide a bit more credence to the patch, as we propose exactly the same patch that already runs in prod.

@pengxiaolong
Copy link
Contributor Author

In Corretto 17, we picked up is_model: corretto/corretto-17@3d11b55. Seeing how this backport is already not clean, I think we should do the same here. It would also provide a bit more credence to the patch, as we propose exactly the same patch that already runs in prod.

Thanks, I'll do that for both jdk17 and jdk21.

@shipilev
Copy link
Member

Yup, Corretto 21 did a similar thing: corretto/corretto-21@6325710

…h64: Sync SVE related CPU features with VM options)
@pengxiaolong
Copy link
Contributor Author

Yup, Corretto 21 did a similar thing: corretto/corretto-21@6325710

Updated both PRs, thanks!

@openjdk
Copy link

openjdk bot commented Jun 18, 2024

⚠️ @pengxiaolong 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.

@pengxiaolong
Copy link
Contributor Author

pengxiaolong commented Jun 19, 2024

/approval request Backport JDK-8321025 to jdk17 for to enable Neoverse N1 optimizations for Neoverse V2, it was not a clean backport, also backported VM_Version::model_is from openjdk/jdk@3283328 when resolving the conflicts. Risk should be low, it was backported to Amazon-Corretto-17 in Jan 2024, no known issue so far.

@openjdk
Copy link

openjdk bot commented Jun 19, 2024

@pengxiaolong
8321025: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 19, 2024
@pengxiaolong
Copy link
Contributor Author

Thanks for the review and approval! I'll start to integrate

@pengxiaolong
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 21, 2024
@openjdk
Copy link

openjdk bot commented Jun 21, 2024

@pengxiaolong
Your change (at version d3c5a79) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 24, 2024

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

  • 02ec672: 8315774: Enable parallelism in vmTestbase/gc/g1/unloading tests
  • 0392d4e: 8318605: Enable parallelism in vmTestbase/nsk/stress/stack tests
  • f9cc9e9: 8334332: TestIOException.java fails if run by root
  • aa47dc7: 8310070: Test: javax/net/ssl/DTLS/DTLSWontNegotiateV10.java timed out
  • 9a45e2d: 8272777: Clean up remaining AccessController warnings in test library
  • 01cb648: 8305081: Remove finalize() from test/hotspot/jtreg/compiler/runtime/Test8168712
  • 5a40a44: 8305079: Remove finalize() from compiler/c2/Test719030
  • 858416c: 8277042: add test for 8276036 to compiler/codecache
  • c4d6967: 8299779: Test tools/jpackage/share/jdk/jpackage/tests/MainClassTest.java timed out
  • 46cefca: 8294994: Update Jarsigner and Keytool i18n tests to validate i18n compliance
  • ... and 70 more: https://git.openjdk.org/jdk17u-dev/compare/05e645e86af1e4933af8819966d57e0d680b5d25...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 24, 2024

@shipilev @pengxiaolong Pushed as commit 953a03d.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants