Skip to content

8319973: AArch64: Save and restore FPCR in the call stub #16637

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

Closed
wants to merge 2 commits into from

Conversation

theRealAph
Copy link
Contributor

@theRealAph theRealAph commented Nov 13, 2023

On AArch64 we don't save and restore the default floating-point control state when we enter and leave Java code. We really should, because if we're called via the JNI invocation interface with a weird FP control state we'll not be Java compatible.


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-8319973: AArch64: Save and restore FPCR in the call stub (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16637

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 13, 2023

👋 Welcome back aph! 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 added the rfr Pull request is ready for review label Nov 13, 2023
@openjdk
Copy link

openjdk bot commented Nov 13, 2023

@theRealAph 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 Nov 13, 2023
@theRealAph theRealAph marked this pull request as draft November 13, 2023 18:22
@openjdk openjdk bot removed the rfr Pull request is ready for review label Nov 13, 2023
@theRealAph theRealAph marked this pull request as ready for review November 14, 2023 09:48
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 14, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 14, 2023

Webrevs

Copy link
Contributor

@adinn adinn left a comment

Choose a reason for hiding this comment

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

All looks good.

@openjdk
Copy link

openjdk bot commented Nov 16, 2023

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

8319973: AArch64: Save and restore FPCR in the call stub

Reviewed-by: adinn, stuefe

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

  • 04fd17e: 8320410: Reflow markdown in building.md
  • 7f23110: 8319928: Exceptions thrown by cleanup actions should be handled correctly
  • a6098e4: 8320280: RISC-V: Avoid passing t0 as temp register to MacroAssembler::lightweight_lock/unlock
  • 60c8d9c: 8320300: Adjust hs_err output in malloc/mmap error cases
  • 9f6a4a3: 8320386: Remove java/nio/channels/vthread/BlockingChannelOps.java#direct-register from ProblemList
  • db1d823: 8320168: handle setsocktopt return values
  • 6c5e15c: 8316557: Make fields final in 'sun.util' package
  • de51aa1: 8283214: [macos] Screen magnifier does not show the magnified text for JcomboBox
  • 179f505: 8320361: Doc error in RemoteRecordingStream.java
  • 8ff7d6e: 8295391: Add discussion of binary <-> decimal conversion issues
  • ... and 160 more: https://git.openjdk.org/jdk/compare/8fb94fd4fe46bc12885c7cc0c7ebbbc10fba47e5...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 openjdk bot added the ready Pull request is ready to be integrated label Nov 16, 2023
Copy link
Member

@tstuefe tstuefe 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, one question inline.

@@ -141,7 +141,8 @@ class StubGenerator: public StubCodeGenerator {
// [ return_from_Java ] <--- sp
// [ argument word n ]
// ...
// -27 [ argument word 1 ]
// -29 [ argument word 1 ]
// -28 [ saved Floating-point Control Register ]
Copy link
Member

Choose a reason for hiding this comment

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

Why the 1-word gap? Alignment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, exactly. AArch64 stack is 16-aligned, and this is enforced by hardware.

@theRealAph
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 20, 2023

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

  • 04fd17e: 8320410: Reflow markdown in building.md
  • 7f23110: 8319928: Exceptions thrown by cleanup actions should be handled correctly
  • a6098e4: 8320280: RISC-V: Avoid passing t0 as temp register to MacroAssembler::lightweight_lock/unlock
  • 60c8d9c: 8320300: Adjust hs_err output in malloc/mmap error cases
  • 9f6a4a3: 8320386: Remove java/nio/channels/vthread/BlockingChannelOps.java#direct-register from ProblemList
  • db1d823: 8320168: handle setsocktopt return values
  • 6c5e15c: 8316557: Make fields final in 'sun.util' package
  • de51aa1: 8283214: [macos] Screen magnifier does not show the magnified text for JcomboBox
  • 179f505: 8320361: Doc error in RemoteRecordingStream.java
  • 8ff7d6e: 8295391: Add discussion of binary <-> decimal conversion issues
  • ... and 160 more: https://git.openjdk.org/jdk/compare/8fb94fd4fe46bc12885c7cc0c7ebbbc10fba47e5...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 20, 2023

@theRealAph Pushed as commit 6e86904.

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

3 participants