8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but was:<3.02668882E10> #10238

omikhaltsova · 2022-09-12T14:35:30Z

This PR is opened as a follow-up for [1] and included the "must-done" fixes pointed by @teshull.

This patch for JVMCI includes the following fixes related to the macOS AArch64 calling convention:

arguments may consume slots on the stack that are not multiples of 8 bytes [2]
natural alignment of stack arguments [2]
stack must remain 16-byte aligned [3][4]

Tested with tier1 on macOS AArch64 and Linux AArch64.

[1] #6641
[2] https://developer.apple.com/documentation/xcode/writing-arm64-code-for-apple-platforms
[3] https://docs.microsoft.com/en-us/cpp/build/arm64-windows-abi-conventions?view=msvc-160#stack
[4] https://docs.microsoft.com/en-us/cpp/build/stack-usage?view=msvc-170

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-8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but was:<3.02668882E10>

Reviewers

Andrew Haley (@theRealAph - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10238

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

Using diff file

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

…was:<3.02668882E10>

bridgekeeper · 2022-09-12T14:36:36Z

👋 Welcome back omikhaltcova! 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 · 2022-09-12T14:40:06Z

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

hotspot-compiler

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.

mlbridge · 2022-09-12T15:55:49Z

Webrevs

theRealAph · 2022-09-12T16:54:38Z

...es/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java

+                    ValueKind<?> valueKind = valueKindFactory.getValueKind(kind);
+                    locations[i] = StackSlot.get(valueKind, currentStackOffset, !type.out);
+                    currentStackOffset += Math.max(valueKind.getPlatformKind().getSizeInBytes(), target.wordSize);
+                }
            }


So I'm curious: why not subclass AArch64HotSpotRegisterConfig here, or maybe even use an interface, rather than the boolean?

I tried to be closer to the original review #6641 that requires only 2 fixes and tried to do only this in order to continue easily.

Could you clarify please what boolean you talk about? private final boolean macOS; that was pushed into class AArch64HotSpotRegisterConfig, right? I'm hesitating a bit because of the highlighted code.

Yes, that macOS boolean.

Maybe it's not worth the effort, but it seems to me as though the use of the boolean in several places is something of a code smell, and this patch makes it more so. The control flow is not easy to follow.
I am wondering if refactoring it so that the code between L269 and L291 were broken out into two methods, one for MacOS and one for the others. I might be wrong, but I'd try it.

Thanks for the tip! Absolutely agree, it's worth doing refactoring here. I'll try to follow this way.

@theRealAph could you please take a look! I've made some additional refactoring in order to get rid of those "boolean"s where it's possible. I moved them from AArch64HotSpotVMConfig to TargetDescription. This makes an access to them easier across the code. As a 2nd step it's possible to substitute these "boolean"s with "enum" if it's needed. But imho it's better to keep them as "boolean"s at the moment.
In addition I see a new class RISCV64HotSpotVMConfig (committed after this pr) that also declared the same boolean:
final boolean linuxOs = Services.getSavedProperty("os.name", "").startsWith("Linux");
If this refactoring is made, this "boolean" won't be needed as well because it can be accessed from TargetDescription.

This looks reasonable enough.

omikhaltsova · 2022-09-20T13:54:51Z

The pre-submit tests for linux-x64-hs-minimal and macos-aarch64 were reran manually and succeeded.

bridgekeeper · 2022-10-18T23:55:11Z

@omikhaltsova This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

omikhaltsova · 2022-11-07T13:31:15Z

@teshull could you please take a look! I tried to make fixes according to your comments in #6641

theRealAph

Looks good. Thanks.

theRealAph · 2022-11-07T16:58:47Z

...es/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java

+                    ValueKind<?> valueKind = valueKindFactory.getValueKind(kind);
+                    locations[i] = StackSlot.get(valueKind, currentStackOffset, !type.out);
+                    currentStackOffset += Math.max(valueKind.getPlatformKind().getSizeInBytes(), target.wordSize);
+                }
            }


This looks reasonable enough.

openjdk · 2022-11-07T17:01:30Z

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

8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but was:<3.02668882E10>

Reviewed-by: aph

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

4a68210: 6972078: Can not select single directory with GTKLookAndFeel
4465361: 8295948: Support for Zicbop/prefetch instructions on RISC-V
f2acdfd: 8296638: RISC-V: NegVI node emits wrong code when vector element basic type is T_BYTE/T_SHORT
bfc5816: 8295475: Move non-resource allocation strategies out of ResourceObj
e802b12: 8296196: Class.getEnumConstants() throws undocumented ClassCastException and NullPointerException
78a08a0: 8295430: Use cmsDoTransformLineStride instead of cmsDoTransform in the loop
f0a6e71: 8295812: Skip the "half float" support in LittleCMS during the build
79c0092: 8285635: javax/swing/JRootPane/DefaultButtonTest.java failed with Default Button not pressed for L&F: com.sun.java.swing.plaf.motif.MotifLookAndFeel
0981bfb: 8296156: [macos] Resize DMG windows and background to fit additional DMG contents
93fed9b: 8296448: RISC-V: Fix temp usages of heapbase register killed by MacroAssembler::en/decode_klass_not_null
... and 895 more: https://git.openjdk.org/jdk/compare/30def49c7286e2a6c2585bc85084b003eec4543a...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 (@theRealAph) 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).

teshull · 2022-11-10T16:10:45Z

@omikhaltsova Your changes look good to me. Thanks!

omikhaltsova · 2022-11-10T16:26:15Z

@theRealAph @teshull thanks for the review!

omikhaltsova · 2022-11-10T16:26:44Z

/integrate

openjdk · 2022-11-10T16:29:04Z

@omikhaltsova
Your change (at version 8b9922a) is now ready to be sponsored by a Committer.

AntonKozlov · 2022-11-10T21:05:01Z

/sponsor

openjdk · 2022-11-10T21:06:28Z

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

e1badb7: 8295871: G1: Use different explicit claim marks for CLDs
9ef7852: 8290714: Make com.sun.jndi.dns.DnsClient virtual threads friendly
d6468be: 8293886: The abstract keyword can be removed in AESCipher
54c986e: 8296715: CLDR v42 update for tzdata 2022f
4a68210: 6972078: Can not select single directory with GTKLookAndFeel
4465361: 8295948: Support for Zicbop/prefetch instructions on RISC-V
f2acdfd: 8296638: RISC-V: NegVI node emits wrong code when vector element basic type is T_BYTE/T_SHORT
bfc5816: 8295475: Move non-resource allocation strategies out of ResourceObj
e802b12: 8296196: Class.getEnumConstants() throws undocumented ClassCastException and NullPointerException
78a08a0: 8295430: Use cmsDoTransformLineStride instead of cmsDoTransform in the loop
... and 899 more: https://git.openjdk.org/jdk/compare/30def49c7286e2a6c2585bc85084b003eec4543a...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-11-10T21:06:48Z

@AntonKozlov @omikhaltsova Pushed as commit 6b456f7.

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

8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but …

181c2f1

…was:<3.02668882E10>

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Sep 12, 2022

omikhaltsova marked this pull request as ready for review September 12, 2022 15:50

openjdk bot added the rfr Pull request is ready for review label Sep 12, 2022

theRealAph reviewed Sep 12, 2022

View reviewed changes

Refactoring

6f8b321

Refactoring

8b9922a

theRealAph approved these changes Nov 7, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 7, 2022

openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 10, 2022

openjdk bot added the integrated Pull request has been integrated label Nov 10, 2022

openjdk bot closed this Nov 10, 2022

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 Nov 10, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but was:<3.02668882E10> #10238

8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but was:<3.02668882E10> #10238

omikhaltsova commented Sep 12, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Sep 12, 2022

openjdk bot commented Sep 12, 2022

mlbridge bot commented Sep 12, 2022 •

edited

Loading

theRealAph Sep 12, 2022

omikhaltsova Sep 13, 2022

theRealAph Sep 14, 2022 •

edited

Loading

omikhaltsova Sep 14, 2022

omikhaltsova Nov 7, 2022

theRealAph Nov 7, 2022

omikhaltsova commented Sep 20, 2022

bridgekeeper bot commented Oct 18, 2022

omikhaltsova commented Nov 7, 2022

theRealAph left a comment

theRealAph Nov 7, 2022

openjdk bot commented Nov 7, 2022 •

edited

Loading

teshull commented Nov 10, 2022

omikhaltsova commented Nov 10, 2022

omikhaltsova commented Nov 10, 2022

openjdk bot commented Nov 10, 2022

AntonKozlov commented Nov 10, 2022

openjdk bot commented Nov 10, 2022

openjdk bot commented Nov 10, 2022

8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but was:<3.02668882E10> #10238

8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but was:<3.02668882E10> #10238

Conversation

omikhaltsova commented Sep 12, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Sep 12, 2022

openjdk bot commented Sep 12, 2022

mlbridge bot commented Sep 12, 2022 • edited Loading

Webrevs

theRealAph Sep 12, 2022

Choose a reason for hiding this comment

omikhaltsova Sep 13, 2022

Choose a reason for hiding this comment

theRealAph Sep 14, 2022 • edited Loading

Choose a reason for hiding this comment

omikhaltsova Sep 14, 2022

Choose a reason for hiding this comment

omikhaltsova Nov 7, 2022

Choose a reason for hiding this comment

theRealAph Nov 7, 2022

Choose a reason for hiding this comment

omikhaltsova commented Sep 20, 2022

bridgekeeper bot commented Oct 18, 2022

omikhaltsova commented Nov 7, 2022

theRealAph left a comment

Choose a reason for hiding this comment

theRealAph Nov 7, 2022

Choose a reason for hiding this comment

openjdk bot commented Nov 7, 2022 • edited Loading

teshull commented Nov 10, 2022

omikhaltsova commented Nov 10, 2022

omikhaltsova commented Nov 10, 2022

openjdk bot commented Nov 10, 2022

AntonKozlov commented Nov 10, 2022

openjdk bot commented Nov 10, 2022

openjdk bot commented Nov 10, 2022

omikhaltsova commented Sep 12, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 12, 2022 •

edited

Loading

theRealAph Sep 14, 2022 •

edited

Loading

openjdk bot commented Nov 7, 2022 •

edited

Loading