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

8329823: RISC-V: Need to sync CPU features with related JVM flags #18668

Closed
wants to merge 1 commit into from

Conversation

zifeihan
Copy link
Member

@zifeihan zifeihan commented Apr 7, 2024

Hi, As described by 8329823, currently, "features" string is not accurate in that the RISC-V CPU features/extensions which are disabled by user on the command are still added. We need to synchronize these features with related JVM flags so that "features" string can reflect actual usable CPU features.

Testing

  • Run tier1 tests on SOPHON SG2042 (release)

Results without specifying any jvm flags(After applying this patch)

$ /home/zifeihan/jtreg/bin/jtreg -jdk:/home/zifeihan/jre/jdk /home/zifeihan/jdk/test/lib-test/jdk/test/whitebox/CPUInfoTest.java

----------System.out:(4/178)----------
WB.getCPUFeatures(): "rv64 i m a f d c v zba zbb zbs zvkn"
CPUInfo.getAdditionalCPUInfo(): ""
CPUInfo.getFeatures(): [rv64, i, m, a, f, d, c, v, zba, zbb, zbs, zvkn]
TEST PASSED

Results with specifying -XX:-UseZba(After applying this patch)

$ /home/zifeihan/jtreg/bin/jtreg -javaoption:-XX:-UseZba -jdk:/home/zifeihan/jre/jdk /home/zifeihan/jdk/test/lib-test/jdk/test/whitebox/CPUInfoTest.java

----------System.out:(4/158)----------
----------System.out:(4/169)----------
WB.getCPUFeatures(): "rv64 i m a f d c v zbb zbs zvkn"
CPUInfo.getAdditionalCPUInfo(): ""
CPUInfo.getFeatures(): [rv64, i, m, a, f, d, c, v, zbb, zbs, zvkn]
TEST PASSED

Results with specifying -XX:+UseZba(After applying this patch)

$ /home/zifeihan/jtreg/bin/jtreg -javaoption:-XX:+UseZba -jdk:/home/zifeihan/jre/jdk /home/zifeihan/jdk/test/lib-test/jdk/test/whitebox/CPUInfoTest.java

----------System.out:(4/178)----------
WB.getCPUFeatures(): "rv64 i m a f d c v zba zbb zbs zvkn"
CPUInfo.getAdditionalCPUInfo(): ""
CPUInfo.getFeatures(): [rv64, i, m, a, f, d, c, v, zba, zbb, zbs, zvkn]
TEST PASSED

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

Issue

  • JDK-8329823: RISC-V: Need to sync CPU features with related JVM flags (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18668

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 7, 2024

👋 Welcome back gcao! 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 Apr 7, 2024

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

8329823: RISC-V: Need to sync CPU features with related JVM flags

Reviewed-by: fyang, rehn

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

  • 58e39c1: 8329884: Serial: Fix build failure due to ‘Copy’ has not been declared
  • 19a99d0: 8326744: Class-File API transition to Second Preview
  • b4dddde: 8329840: Fix ZPhysicalMemorySegment::_end type
  • dfaf11a: 8329898: Revert one use of markWord.is_unlocked back to is_neutral
  • fbc1e66: 8328181: C2: assert(MaxVectorSize >= 32) failed: vector length should be >= 32
  • a887fd2: 8316991: Reduce nullable allocation merges
  • e702646: 8200566: DistributionPointFetcher fails to fetch CRLs if the DistributionPoints field contains more than one DistributionPoint and the first one fails
  • 7e5ef79: 8323116: [REDO] Computational test more than 2x slower when AVX instructions are used
  • 9467720: 8329875: Serial: Move preservedMarks.inline.hpp to serialFullGC.cpp
  • a4dd2e9: 8329766: Serial: Refactor SerialBlockOffsetTable API
  • ... and 69 more: https://git.openjdk.org/jdk/compare/e3e6c2a8991fbc4f56e051e9abe004f0aa5674a0...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 (@RealFYang, @robehn) 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
Copy link

openjdk bot commented Apr 7, 2024

@zifeihan 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 Apr 7, 2024
@zifeihan zifeihan marked this pull request as ready for review April 8, 2024 04:53
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 8, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 8, 2024

Webrevs

Copy link
Member

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 8, 2024
@zifeihan
Copy link
Member Author

zifeihan commented Apr 8, 2024

@robehn : May I ask if this makes sense to you? Thanks.

Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think so, thanks.

@zifeihan
Copy link
Member Author

zifeihan commented Apr 9, 2024

@RealFYang @robehn : Thanks for the review.
/integrate

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

openjdk bot commented Apr 9, 2024

@zifeihan
Your change (at version 897b31a) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Apr 9, 2024

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

  • 71c5bbc: 8329527: Opcode.IFNONNULL.primaryTypeKind() is not ReferenceType
  • 58e39c1: 8329884: Serial: Fix build failure due to ‘Copy’ has not been declared
  • 19a99d0: 8326744: Class-File API transition to Second Preview
  • b4dddde: 8329840: Fix ZPhysicalMemorySegment::_end type
  • dfaf11a: 8329898: Revert one use of markWord.is_unlocked back to is_neutral
  • fbc1e66: 8328181: C2: assert(MaxVectorSize >= 32) failed: vector length should be >= 32
  • a887fd2: 8316991: Reduce nullable allocation merges
  • e702646: 8200566: DistributionPointFetcher fails to fetch CRLs if the DistributionPoints field contains more than one DistributionPoint and the first one fails
  • 7e5ef79: 8323116: [REDO] Computational test more than 2x slower when AVX instructions are used
  • 9467720: 8329875: Serial: Move preservedMarks.inline.hpp to serialFullGC.cpp
  • ... and 70 more: https://git.openjdk.org/jdk/compare/e3e6c2a8991fbc4f56e051e9abe004f0aa5674a0...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 9, 2024
@openjdk openjdk bot closed this Apr 9, 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 Apr 9, 2024
@openjdk
Copy link

openjdk bot commented Apr 9, 2024

@RealFYang @zifeihan Pushed as commit b9331cd.

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

@zifeihan
Copy link
Member Author

/backport jdk22u

@openjdk
Copy link

openjdk bot commented Apr 10, 2024

@zifeihan the backport was successfully created on the branch backport-zifeihan-b9331cd2 in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by Gui Cao on 9 Apr 2024 and was reviewed by Fei Yang and Robbin Ehn.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-zifeihan-b9331cd2:backport-zifeihan-b9331cd2
$ git checkout backport-zifeihan-b9331cd2
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-zifeihan-b9331cd2

@zifeihan zifeihan deleted the JDK-8329823 branch June 19, 2024 07:04
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
3 participants