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

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

Closed
wants to merge 1 commit into from

Conversation

cnqpzhang
Copy link
Contributor

@cnqpzhang cnqpzhang commented Feb 6, 2024

Added CPU detection for Ampere-1B, and updated the default options for AmpereOne, Ampere-1A/1B to have -XX:+UseSIMDForMemoryOps and -XX:OnSpinWaitInst=isb -XX:OnSpinWaitInstCount=2.

Tests done:

  1. GitHub Actions (GHA) sanity tests: https://github.com/cnqpzhang/jdk/actions/runs/7786881426
  2. OpenJDK bundled JMH, make run-test TEST="jtreg:hotspot/jtreg/compiler/onSpinWait*" , make run-test TEST="micro:ThreadOnSpinWait*", no issue found, and ThreadOnSpinWaitProducerConsumer.trial showed ~3x better scores (us/op).
  3. Jtreg tier1/tier2 sanity check on AmpereOne AArch64 platforms, Ampere-1A systems as well, no new issues found.

Signed-off-by: Patrick Zhang patrick@os.amperecomputing.com


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

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

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17722/head:pull/17722
$ git checkout pull/17722

Update a local copy of the PR:
$ git checkout pull/17722
$ git pull https://git.openjdk.org/jdk.git pull/17722/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17722

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17722.diff

Webrev

Link to Webrev Comment

…r Ampere CPUs

Signed-off-by: Patrick Zhang <patrick@os.amperecomputing.com>
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 6, 2024

👋 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 openjdk bot changed the title 8324824 8324824: AArch64: Detect Ampere-1B core and update default options for Ampere CPUs Feb 6, 2024
@openjdk
Copy link

openjdk bot commented Feb 6, 2024

@cnqpzhang The following label will be automatically applied to this pull request:

  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Feb 6, 2024
@cnqpzhang cnqpzhang marked this pull request as ready for review February 6, 2024 07:19
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 6, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 6, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Feb 6, 2024

@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: dlong, thartmann

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

  • 43089bf: 8325399: Add tests for virtual threads doing Selector operations
  • d109903: 8325028: (ch) Pipe channels should lazily set socket to non-blocking mode on first use by virtual thread
  • 1fb9e3d: 8325304: Several classes in java.util.jar and java.util.zip don't specify the behaviour for null arguments
  • 9cccf05: 8325367: Rename nsk_list.h
  • be7cc1c: 8323681: SA PointerFinder code should support G1
  • fbd15b2: 8325189: Enable this-escape javac warning in java.base
  • 299a8ee: 8325302: Files.move(REPLACE_EXISTING) throws NoSuchFileException on deleted target
  • 3a1f4d0: 8325268: Add policy statement to langtools makefiles concerning warnings
  • 18e24d0: 8325109: Sort method modifiers in canonical order
  • a3a2b1f: 8324881: ObjectSynchronizer::inflate(Thread* current...) is invoked for non-current thread
  • ... and 39 more: https://git.openjdk.org/jdk/compare/d395ac287900f2c22739751e39831dea8a189b5c...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 (@dean-long, @TobiHartmann) 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 added the ready Pull request is ready to be integrated label Feb 6, 2024
@cnqpzhang
Copy link
Contributor Author

cnqpzhang commented Feb 7, 2024

Thanks for your review, @dean-long , could you please help sponsor and integrate it?

@cnqpzhang
Copy link
Contributor Author

/integrate

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

openjdk bot commented Feb 7, 2024

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

@dean-long
Copy link
Member

Normally I would say that this looks trivial, but Oracle was recently bit by JDK-8325264, because aarch64 changes in JDK-8324724 caused problems on macos-aarch64, and for some reason github testing did not catch the problem.

@dean-long
Copy link
Member

/reviewers 2

@openjdk
Copy link

openjdk bot commented Feb 7, 2024

@dean-long
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@openjdk openjdk bot removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated labels Feb 7, 2024
@cnqpzhang
Copy link
Contributor Author

It is of lower risk since the updates are limited to particular Ampere new CPU cores.

@TobiHartmann
Copy link
Member

I've submitted testing and will report back once it passed.

@dcubed-ojdk
Copy link
Member

@dean-long:

for some reason github testing did not catch the problem.

GHA was not doing macosx-aarch64 testing until yesterday (2024.02.06) at 0830 ET.

@TobiHartmann
Copy link
Member

All tests passed.

@openjdk openjdk bot added sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated labels Feb 8, 2024
@dean-long
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 8, 2024

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

Your commit was automatically rebased without conflicts.

@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 sponsor Pull request is ready to be sponsored labels Feb 8, 2024
@openjdk
Copy link

openjdk bot commented Feb 8, 2024

@dean-long @cnqpzhang Pushed as commit 9936aee.

💡 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
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants