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

8296821: compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java fails after JDK-8262901 #11114

Closed
wants to merge 1 commit into from

Conversation

omikhaltsova
Copy link

@omikhaltsova omikhaltsova commented Nov 11, 2022

This is a fix for a bug in the test that was added by JDK-8262901.
The root cause of the issue was because the test returns 'int' while 'float' was expected.

In addition the stack growth considering 16 bytes alignment in AMD64TestAssembler is fixed (similar to AArch64TestAssembler).

Tested on macOS x64 / AArch64, Linux x64 / AArch64 as follow:
$JTREG_HOME/bin/jtreg -ea -jdk:$BUILD_HOME -nativepath:$NATIVE_PATH ./test/hotspot/jtreg/compiler/jvmci/


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-8296821: compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java fails after JDK-8262901

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11114

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 11, 2022

👋 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
Copy link

openjdk bot commented Nov 11, 2022

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

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Nov 11, 2022
@omikhaltsova omikhaltsova marked this pull request as ready for review November 12, 2022 23:33
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 12, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 12, 2022

Webrevs

@omikhaltsova
Copy link
Author

1 test failed on Linux x86: compiler/c2/TestVerifyGraphEdges.java
Seems it's already been fixed by JDK-8295867 (JDK-8295936).

Copy link
Contributor

@vnkozlov vnkozlov 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.
I submitted testing.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

My tier1-3 testing passed.

@openjdk
Copy link

openjdk bot commented Nov 13, 2022

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

8296821: compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java fails after JDK-8262901

Reviewed-by: kvn, thartmann

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

  • 34d10f1: 8296243: [IR Framework] Fix issues with IRNode.ALLOC* regexes
  • 8eb90e2: 8296797: java/nio/channels/vthread/BlockingChannelOps.testSocketChannelWriteAsyncClose failed with ClosedChannelException
  • a2cdcdd: 8296630: Fix SkipIfEqual on AArch64 and RISC-V
  • 657a0b2: 8295865: Several issues with os::realloc
  • ff2c987: 8294378: URLPermission constructor exception when using tr locale
  • 34a499d: 8294033: x86_64: libm stubs are missing
  • f0b648b: 8296758: [BACKOUT] Revert 8296115
  • 7f587e5: 8296872: gtest is built with the build-jdk
  • 819c691: 8295867: TestVerifyGraphEdges.java fails with exit code -1073741571 when using AlwaysIncrementalInline
  • ced88a2: 8296733: JFR: File Read event for RandomAccessFile::write(byte[]) is incorrect
  • ... and 6 more: https://git.openjdk.org/jdk/compare/12e76cbc725ff87577e2ef23267590eae37a82d1...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 (@vnkozlov, @TobiHartmann) 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 added the ready Pull request is ready to be integrated label Nov 13, 2022
@omikhaltsova
Copy link
Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 14, 2022
@openjdk
Copy link

openjdk bot commented Nov 14, 2022

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

Copy link
Member

@TobiHartmann TobiHartmann 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 to me too.

@TobiHartmann
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 14, 2022

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

  • 34d10f1: 8296243: [IR Framework] Fix issues with IRNode.ALLOC* regexes
  • 8eb90e2: 8296797: java/nio/channels/vthread/BlockingChannelOps.testSocketChannelWriteAsyncClose failed with ClosedChannelException
  • a2cdcdd: 8296630: Fix SkipIfEqual on AArch64 and RISC-V
  • 657a0b2: 8295865: Several issues with os::realloc
  • ff2c987: 8294378: URLPermission constructor exception when using tr locale
  • 34a499d: 8294033: x86_64: libm stubs are missing
  • f0b648b: 8296758: [BACKOUT] Revert 8296115
  • 7f587e5: 8296872: gtest is built with the build-jdk
  • 819c691: 8295867: TestVerifyGraphEdges.java fails with exit code -1073741571 when using AlwaysIncrementalInline
  • ced88a2: 8296733: JFR: File Read event for RandomAccessFile::write(byte[]) is incorrect
  • ... and 6 more: https://git.openjdk.org/jdk/compare/12e76cbc725ff87577e2ef23267590eae37a82d1...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 14, 2022

@TobiHartmann @omikhaltsova Pushed as commit 277f0c2.

💡 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-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants