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

8297697: RISC-V: Add support for SATP mode detection #19

Closed
wants to merge 2 commits into from

Conversation

zifeihan
Copy link
Member

@zifeihan zifeihan commented Apr 8, 2024

Hi,
Please review this backport to riscv-port-jdk11u.
Backport of JDK-8297697, and JDK-8301067. JDK-8301067 only modifies the log description information introduced by JDK-8297697.

After this patch, If it is an unsupported satp.mode , the message will be as follows:

root@qemuriscv64:~/jdk/bin# ./java -version
Error occurred during initialization of VM
Unsupported satp mode: sv57

root@qemuriscv64:~/jdk/bin# cat /proc/cpuinfo
processor       : 0
hart            : 0
isa             : rv64imafdch_zicbom_zicboz_zicntr_zicsr_zifencei_zihintpause_zihpm_zba_zbb_zbs_sstc
mmu             : sv57
mvendorid       : 0x0
marchid         : 0x0
mimpid          : 0x0

Testing:

  • Run tier1 tests on SOPHON SG2042 (release)

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

Issues

  • JDK-8297697: RISC-V: Add support for SATP mode detection (Enhancement - P4)
  • JDK-8301067: RISC-V: better error message when reporting unsupported satp modes (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/riscv-port-jdk11u.git pull/19/head:pull/19
$ git checkout pull/19

Update a local copy of the PR:
$ git checkout pull/19
$ git pull https://git.openjdk.org/riscv-port-jdk11u.git pull/19/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/riscv-port-jdk11u/pull/19.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 8, 2024

👋 Welcome back gcao! A progress list of the required criteria for merging this PR into riscv-port will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@zifeihan
Copy link
Member Author

zifeihan commented Apr 8, 2024

/issue JDK-8301067

@openjdk
Copy link

openjdk bot commented Apr 8, 2024

@zifeihan This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8297697: RISC-V: Add support for SATP mode detection
8301067: RISC-V: better error message when reporting unsupported satp modes

Reviewed-by: fyang, fjiang

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 14 new commits pushed to the riscv-port branch:

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) 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 f49acd52594be3ec1e9682bda3ad69970dfd750d 8297697: RISC-V: Add support for SATP mode detection Apr 8, 2024
@openjdk
Copy link

openjdk bot commented Apr 8, 2024

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

@openjdk openjdk bot added backport clean ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 8, 2024
@openjdk
Copy link

openjdk bot commented Apr 8, 2024

@zifeihan
Adding additional issue to issue list: 8301067: RISC-V: better error message when reporting unsupported satp modes.

@mlbridge
Copy link

mlbridge bot commented Apr 8, 2024

Webrevs

@openjdk openjdk bot removed the clean label Apr 9, 2024
Copy link
Member

@feilongjiang feilongjiang left a comment

Choose a reason for hiding this comment

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

looks good, thanks.

@zifeihan
Copy link
Member Author

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

@RealFYang
Copy link
Member

/sponsor

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

openjdk bot commented Apr 10, 2024

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

@openjdk
Copy link

openjdk bot commented Apr 10, 2024

Going to push as commit e14708a.
Since your change was applied there have been 14 commits pushed to the riscv-port branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 10, 2024

@RealFYang @zifeihan Pushed as commit e14708a.

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

@zifeihan zifeihan deleted the backport-JDK-8297697 branch April 10, 2024 02:03
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.

3 participants