8324824: AArch64: Detect Ampere-1B core and update default options for Ampere CPUs

[cnqpzhang]

Hi all,

This pull request contains a backport of commit 9936aeea from the openjdk/jdk repository.

The commit being backported was authored by Patrick Zhang on 8 Feb 2024 and was reviewed by Dean Long and Tobias Hartmann.

Thanks!

---

Progress

• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• JDK-8324824 needs maintainer approval

Issue

• JDK-8324824: AArch64: Detect Ampere-1B core and update default options for Ampere CPUs (Enhancement - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 249

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

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

[openjdk]

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

[mlbridge]

Webrevs

• 00: Full (946256bc)

[cnqpzhang]

/approval request This is a clean backport for adding CPU detection for Ampere-1B core to LTS repos, as well as enabling default options for Ampere-1/1A/1B at aarch64-port particularly. Pass tier1/tier2 and selected relevant tests. Thanks.

[openjdk]

@cnqpzhang
8324824: The approval request has been created successfully.

[GoeLin]

Hi @cnqzhang, I would prefer this to go to the July update, as it also touches existing CPUs. July update developtment starts 27.2.

[cnqpzhang]

Thanks for your review, @GoeLin. It is fine to have this in jdk21u-dev July update.

How could I handle this PR? keep it as is, or close then re-submit after 27.2? I hope it won't be missed after months, better some auto program could handle the backport at right time. What's your suggestion? Thanks.

[openjdk]

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

8324824: AArch64: Detect Ampere-1B core and update default options for Ampere CPUs

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

• 2d791b8: 8323170: j2dbench is using outdated javac source/target to be able to build by itself
• 3eb5517: 8315373: Change VirtualThread to unmount after freezing, re-mount before thawing
• cea29fe: 8325213: Flags introduced by configure script are not passed to ADLC build
• 677556d: 8320275: assert(_chunk->bitmap().at(index)) failed: Bit not set at index
• 8ac4313: 8324723: GHA: Upgrade some actions to avoid deprecated Node 16
• dc8759c: 8316053: Open some swing tests 3
• ef13a82: 8324817: Parallel GC does not pre-touch all heap pages when AlwaysPreTouch enabled and large page disabled
• 64b70be: 8326773: Bump update version for OpenJDK: jdk-21.0.4
• 36b5ac4: 8323664: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java still fails with JNI warning on some Windows configurations
• 4296ddf: 8325496: Make TrimNativeHeapInterval a product switch
• ... and 36 more: https://git.openjdk.org/jdk21u-dev/compare/0604ce7f383b67c372d55987ff8a7bf3a2189c55...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.

➡️ 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).

[cnqpzhang]

/integrate

[openjdk]

@cnqpzhang
Your change (at version 946256b) is now ready to be sponsored by a Committer.

[cnqpzhang]

Hi @dean-long, Could you please do me another favor and help sponsor to push this backport into jdk21u-dev? Thanks in advance.

[shipilev]

Let's not put Dean into a bit of a tough spot here :) I'll sponsor instead.

/sponsor

[openjdk]

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

• e667521: 8324123: aarch64: fix prfm literal encoding in assembler
• 76ebcc1: 8322846: Running with -Djdk.tracePinnedThreads set can hang
• 2d791b8: 8323170: j2dbench is using outdated javac source/target to be able to build by itself
• 3eb5517: 8315373: Change VirtualThread to unmount after freezing, re-mount before thawing
• cea29fe: 8325213: Flags introduced by configure script are not passed to ADLC build
• 677556d: 8320275: assert(_chunk->bitmap().at(index)) failed: Bit not set at index
• 8ac4313: 8324723: GHA: Upgrade some actions to avoid deprecated Node 16
• dc8759c: 8316053: Open some swing tests 3
• ef13a82: 8324817: Parallel GC does not pre-touch all heap pages when AlwaysPreTouch enabled and large page disabled
• 64b70be: 8326773: Bump update version for OpenJDK: jdk-21.0.4
• ... and 38 more: https://git.openjdk.org/jdk21u-dev/compare/0604ce7f383b67c372d55987ff8a7bf3a2189c55...master

Your commit was automatically rebased without conflicts.

[openjdk]

@shipilev @cnqpzhang Pushed as commit 4243aed.

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