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

8346706: RISC-V: Add available registers to hs_err #22845

Closed
wants to merge 6 commits into from

Conversation

robehn
Copy link
Contributor

@robehn robehn commented Dec 20, 2024

Hi please consider.

This adds below to hs_err:

Floating point state:
fcsr=1
Floating point registers:
f0=0xffffffff44a72000 | 1.84467e+19
f1=0xffffffff44a72000 | 1.84467e+19
....
f31=0xffffffff44a72000 | 1.84467e+19

Vector state:
vstart=0x0000000000000000
vl=0x0000000000000020
vtype=0x0000000000000000
vcsr=0x0000000000000000
vlenb=0x0000000000000020
Vector registers:
v0=0x0101010101010101010101010101010101010101010101010101010101010101
....
v31=0x0101010101010101010101010101010101010101010101010101010101010101

To get vector the headers need to include those structures, hence build files hackery.
This means if you compile on a kernel without RVV support the error handler will lack support for it.
We don't care about RVV option as carshing in native may still use vector even if the jit do not.

I'm doubt full about the printing as double for fp regs, maybe that should be removed.

Local testing, running t1 over weekend.

Thanks, Robbin


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-8346706: RISC-V: Add available registers to hs_err (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22845

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 20, 2024

👋 Welcome back rehn! 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 Dec 20, 2024

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

8346706: RISC-V: Add available registers to hs_err

Reviewed-by: mli, fyang, ihse

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:

  • 33f9be8: 8347083: Incomplete logging in nsk/jvmti/ResourceExhausted/resexhausted00* tests
  • 8eddf67: 8346887: DrawFocusRect() may cause an assertion failure
  • a46ae70: 8339728: [Accessibility,Windows,JAWS] Bug in the getKeyChar method of the AccessBridge class
  • 97dd06c: 8347299: Add annotations to test cases in LicenseTest
  • 0a35ebf: 8347297: Skip the RuntimeImageSymbolicLinksTest test on Windows when it is executed outside of the jtreg
  • b3e8736: 8347296: WinInstallerUiTest fails in local test runs if the path to test work directory is longer that regular
  • 1ade96b: 8347042: Remove an extra parenthesis in macro definition in jfrTraceIdMacros.hpp
  • db7fa6a: 8347289: HKDF delayed provider selection failed with non-extractable PRK
  • 0a5ef82: 8347162: Update problemlist CR for vmTestbase/nsk/jdi/VMOutOfMemoryException
  • ea49537: 8310340: assert(_thread->is_interp_only_mode() || stub_caller) failed: expected a stub-caller
  • ... and 36 more: https://git.openjdk.org/jdk/compare/08debd335e9160d20b87e06a2e83ddedd5f473b8...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk
Copy link

openjdk bot commented Dec 20, 2024

@robehn The following labels will be automatically applied to this pull request:

  • build
  • hotspot-runtime

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

@robehn
Copy link
Contributor Author

robehn commented Dec 20, 2024

Could @erikj79 or @magicus please look the build changes please, thanks!

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 20, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 20, 2024

Webrevs

Copy link

@Hamlin-Li Hamlin-Li left a comment

Choose a reason for hiding this comment

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

Thanks for adding this, it's helpful!

Some minor comments on riscv code.

src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp Outdated Show resolved Hide resolved
src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp Outdated Show resolved Hide resolved
src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp Outdated Show resolved Hide resolved
Copy link
Member

@magicus magicus left a comment

Choose a reason for hiding this comment

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

Build changes look okay. I did not look at hotspot changes so you'll need two reviewers for that as usual.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 20, 2024
src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp Outdated Show resolved Hide resolved
src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp Outdated Show resolved Hide resolved
src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp Outdated Show resolved Hide resolved
src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp Outdated Show resolved Hide resolved
src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp Outdated Show resolved Hide resolved
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jan 7, 2025
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.

Seems fine to me. Thanks for the update.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 9, 2025
Copy link

@Hamlin-Li Hamlin-Li 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!

@robehn
Copy link
Contributor Author

robehn commented Jan 9, 2025

Thanks!

@robehn
Copy link
Contributor Author

robehn commented Jan 9, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Jan 9, 2025

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

  • d66737e: 8341097: GHA: Demote Mac x86 jobs to build only
  • dff5719: 8347126: gc/stress/TestStressG1Uncommit.java gets OOM-killed
  • 82e16ba: 8347268: [ubsan] logOutput.cpp:357:21: runtime error: applying non-zero offset 1 to null pointer
  • 33f9be8: 8347083: Incomplete logging in nsk/jvmti/ResourceExhausted/resexhausted00* tests
  • 8eddf67: 8346887: DrawFocusRect() may cause an assertion failure
  • a46ae70: 8339728: [Accessibility,Windows,JAWS] Bug in the getKeyChar method of the AccessBridge class
  • 97dd06c: 8347299: Add annotations to test cases in LicenseTest
  • 0a35ebf: 8347297: Skip the RuntimeImageSymbolicLinksTest test on Windows when it is executed outside of the jtreg
  • b3e8736: 8347296: WinInstallerUiTest fails in local test runs if the path to test work directory is longer that regular
  • 1ade96b: 8347042: Remove an extra parenthesis in macro definition in jfrTraceIdMacros.hpp
  • ... and 39 more: https://git.openjdk.org/jdk/compare/08debd335e9160d20b87e06a2e83ddedd5f473b8...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 9, 2025
@openjdk openjdk bot closed this Jan 9, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 9, 2025
@openjdk
Copy link

openjdk bot commented Jan 9, 2025

@robehn Pushed as commit 765b9e6.

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

@robehn robehn deleted the vregs branch January 9, 2025 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants