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

[cnqpzhang]

Hi,

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

Not a clean merge to 17u-dev.
Manually resolved the merging conflicts due to line differences on enum Ampere_CPU_Model and Feature_Flag, removed redundant changes in order to limit the update to the code changes only from commit [9936aeea]. This can also lower the risk and limit the functionality impact to to particular Ampere new CPU cores Ampere-1/1A/1B. Same scope as that of the commit [9936aeea].

Passed pre-submit tests, ran Jtreg tier1, tier2, and gtest tests, no related issue found with the patch, also tested:
make run-test TEST="jtreg:hotspot/jtreg/compiler/onSpinWait*"
make run-test TEST="micro:ThreadOnSpinWait*"

Thanks for review.

---

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

Issue

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

Reviewers

• Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2202

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2202.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.

[mlbridge]

Webrevs

• 00: Full (c0c84a31)

[cnqpzhang]

/label add hotspot

[openjdk]

@cnqpzhang
The label hotspot is not a valid label.
These labels are valid:

[cnqpzhang]

/label add hotspot-dev

[openjdk]

@cnqpzhang
The label hotspot is not a valid label.
These labels are valid:

[cnqpzhang]

/cc hotspot hotspot-runtime

[openjdk]

@cnqpzhang
The label hotspot is not a valid label.
The label hotspot-runtime is not a valid label.
These labels are valid:

[cnqpzhang]

Could any reviewer please help review and approve this simple backport to jdk17u-dev? Not a clean merge while the code changes for conflicts resolving is very straightforward and can be a of low risk. Thanks.

[adinn]

Ok.

[cnqpzhang]

Thanks for your view @adinn ,

I noticed that the check-box of "Change must be properly reviewed (1 review required)" is still blank. Probably I need an "Approve" on it, before moving forward to ask for 17u-dev maintainer's approval of the integration, right? or Is there any code change required on this PR? Thanks.

[shipilev]

Looks good to me.

[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.

[cnqpzhang]

/approval request This backport is to CPU detection for Ampere-1B core to JDK 17 LTS, and update default options on Ampere-1/1A/1B . Jtreg tier1/tier2 and selected relevant tests passed. Not a clean merge while conflicts are due to line mismatch, the risk can be low. Thanks for approval.

[openjdk]

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

[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

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

• bfe8974: 8323519: Add applications/ctw/modules to Hotspot tiered testing
• 3add2e3: 8272903: Missing license header in ArenaAllocator.java
• ab602af: 8323210: Update the usage of cmsFLAGS_COPY_ALPHA
• 0052ab7: 8269914: Factor out heap printing for G1 young and full gc
• 85a49ed: 8311893: Interactive component with ARIA role 'tabpanel' does not have a programmatically associated name
• 2b34eeb: 8325496: Make TrimNativeHeapInterval a product switch
• 5687c5a: 8325213: Flags introduced by configure script are not passed to ADLC build
• 204ec8a: 8323717: Introduce test keyword for tests that need external dependencies
• 87e7c6e: 8326942: [17u] Backout "8325254: CKA_TOKEN private and secret keys are not necessarily sensitive"
• 8c3dcf3: 8324050: Issue store-store barrier after re-materializing objects during deoptimization
• ... and 34 more: https://git.openjdk.org/jdk17u-dev/compare/17b38577272d3813dd9738b3dd179e0668daab4b...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 (@adinn, @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).

[cnqpzhang]

/integrate

[openjdk]

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

[cnqpzhang]

Hi, @shipilev , thanks for the review, and could you please help sponsor this too? Very appreciate.

[adinn]

@sponsor

[adinn]

/sponsor

[openjdk]

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

• bfe8974: 8323519: Add applications/ctw/modules to Hotspot tiered testing
• 3add2e3: 8272903: Missing license header in ArenaAllocator.java
• ab602af: 8323210: Update the usage of cmsFLAGS_COPY_ALPHA
• 0052ab7: 8269914: Factor out heap printing for G1 young and full gc
• 85a49ed: 8311893: Interactive component with ARIA role 'tabpanel' does not have a programmatically associated name
• 2b34eeb: 8325496: Make TrimNativeHeapInterval a product switch
• 5687c5a: 8325213: Flags introduced by configure script are not passed to ADLC build
• 204ec8a: 8323717: Introduce test keyword for tests that need external dependencies
• 87e7c6e: 8326942: [17u] Backout "8325254: CKA_TOKEN private and secret keys are not necessarily sensitive"
• 8c3dcf3: 8324050: Issue store-store barrier after re-materializing objects during deoptimization
• ... and 34 more: https://git.openjdk.org/jdk17u-dev/compare/17b38577272d3813dd9738b3dd179e0668daab4b...master

Your commit was automatically rebased without conflicts.

[openjdk]

@adinn @cnqpzhang Pushed as commit f3e90af.

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