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

8309109: AArch64: [TESTBUG] compiler/intrinsics/sha/cli/TestUseSHA3IntrinsicsOptionOnSupportedCPU.java fails on Neoverse N2 and V1 #14551

Closed
wants to merge 2 commits into from

Conversation

shqking
Copy link
Contributor

@shqking shqking commented Jun 20, 2023

UseSHA3Intrinsics was introduced in JDK-8252204, but it was not auto-enabled due to the lack of real hardware. In JDK-8297092, the intrinsic was evaluated on existing hardware with the support of SHA3 feature (including Neoverse N2/V1 and Apple silicon), and it was auto-enabled by default on Apple silicon only. See the code [1].

As a result, test case TestUseSHA3IntrinsicsOptionOnSupportedCPU.java fails on Neoverse N2 and V1 with the following error message:

JavaTest Message: Test threw exception: java.lang.AssertionError: Option 'UseSHA3Intrinsics' is expected to have 'true' value
Option 'UseSHA3Intrinsics' should be enabled by default

The group of test cases TestUseXXXIntrinsicsOptionOnSupportedCPU.java are designed to verify that, option UseXXXIntrinsics should be enabled by default if the underlying hardware supports the corresponding CPU feature.

Apparently this check condition doesn't work for UseSHA3Intrinsics. The other expcetion case is UseSHA512Intrinsics. See JDK-8257796.

Fix: One @requires condition is added in this patch to limit that this test case is only run on macOS on Apple silicon. Note that SHA3 feature is currently supported by AArch64 only.

Test: this test case passed on Linux/Neoverse N2, Linux/Neoverse V1 and macOS on Apple silicon.

[1] https://github.com/openjdk/jdk/pull/11382/files#diff-a87e260510f34ca7d9b0feb089ad982be8268c5c8aa5a71221f6738b051ea488R338-R345


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-8309109: AArch64: [TESTBUG] compiler/intrinsics/sha/cli/TestUseSHA3IntrinsicsOptionOnSupportedCPU.java fails on Neoverse N2 and V1 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14551

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

Using diff file

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

Webrev

Link to Webrev Comment

…trinsicsOptionOnSupportedCPU.java fails on Neoverse N2 and V1

`UseSHA3Intrinsics` was introduced in JDK-8252204, but it was not
auto-enabled due to the lack of real hardware. In JDK-8297092, the
intrinsic was evaluated on existing hardware with the support of SHA3
feature (including Neoverse N2/V1 and Apple silicon), and it was
auto-enabled by default on Apple silicon only. See the code [1].

As a result, test case `TestUseSHA3IntrinsicsOptionOnSupportedCPU.java`
fails on Neoverse N2 and V1 with the following error message:

```
JavaTest Message: Test threw exception: java.lang.AssertionError: Option 'UseSHA3Intrinsics' is expected to have 'true' value
Option 'UseSHA3Intrinsics' should be enabled by default
```

The group of test cases `TestUseXXXIntrinsicsOptionOnSupportedCPU.java`
are designed to verify that, option `UseXXXIntrinsics` should be enabled
by default if the underlying hardware supports the corresponding CPU
feature.

Apparently this check condition doesn't work for `UseSHA3Intrinsics`.
The other expcetion case is `UseSHA512Intrinsics`. See JDK-8257796.

Fix: One `@requires` condition is added in this patch to limit that this
test case is only run on macOS on Apple silicon. Note that SHA3 feature
is currently supported by AArch64 only.

Test: this test case passed on Linux/Neoverse N2, Linux/Neoverse V1 and
macOS on Apple silicon.

[1] https://github.com/openjdk/jdk/pull/11382/files#diff-a87e260510f34ca7d9b0feb089ad982be8268c5c8aa5a71221f6738b051ea488R338-R345
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 20, 2023

👋 Welcome back haosun! 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 Jun 20, 2023
@openjdk
Copy link

openjdk bot commented Jun 20, 2023

@shqking 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 Jun 20, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 20, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 21, 2023

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

8309109: AArch64: [TESTBUG] compiler/intrinsics/sha/cli/TestUseSHA3IntrinsicsOptionOnSupportedCPU.java fails on Neoverse N2 and V1

Reviewed-by: aph, fyang

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

  • 87e6fab: 8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
  • 39fa4e6: 8310489: New test runtime/ClassInitErrors/TestStackOverflowDuringInit.java failed
  • 46add3f: 8310909: java.io.InvalidObjectException has redundant @since tag
  • 8f5b677: 8310908: Non-standard @since tag in com.sun.java.accessibility.util.package-info
  • a197ee7: 8310838: Correct range notations in MethodTypeDesc specification
  • 7c6a28f: 8310922: java/lang/Class/forName/ForNameNames.java fails after being added by JDK-8310242
  • 7db2f08: 8310242: Clarify the name parameter to Class::forName
  • 297c799: 8301492: Modernize equals() method of ResourceBundle.CacheKey and Bundles.CacheKey
  • a08352f: 8305671: javac rejects semicolons in compilation units with no imports
  • ff9a754: 8310459: [BACKOUT] 8304450: [vectorapi] Refactor VectorShuffle implementation
  • ... and 112 more: https://git.openjdk.org/jdk/compare/8c9b85a990d955487f9141207cc83d0051defc57...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 Jun 21, 2023
@shqking
Copy link
Contributor Author

shqking commented Jun 27, 2023

Ping? Can anyone else help review this patch? Thanks in advance.

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.

LGTM.

@shqking
Copy link
Contributor Author

shqking commented Jun 27, 2023

Thanks for your reviews, @theRealAph and @RealFYang

Two tests in GHA failed because it failed to "Get bundles". I suppose it's due to network issue. I tried to re-run the failed tests several times but it still didn't pass.

I don't think it's related to this patch.
Hence, I will integrate it tomorrow if there is no more comments.

@shqking
Copy link
Contributor Author

shqking commented Jun 28, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 28, 2023

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

  • 7f09435: 8310982: jdk/internal/util/ArchTest.java fails after JDK-8308452 failed with Method isARM()
  • f07e396: 8310914: Remove 2 malformed java/foreign ProblemList entries
  • a97f98f: 8310585: GetThreadState spec mentions undefined JVMTI_THREAD_STATE_MONITOR_WAITING
  • 2cf5c2f: 8310238: [test bug] javax/swing/JTableHeader/6889007/bug6889007.java fails
  • 269852b: 8294316: SA core file support is broken on macosx-x64 starting with macOS 12.x
  • 4bce38c: 8310830: typo in the parameter name in @throws of ClassDesc::ofDescriptor
  • 315242b: 8310975: java.util.FormatItemModifier should not be protected
  • d6dd0dc: 8308452: Extend internal Architecture enum with byte order and address size
  • fb283df: 8310828: java.sql java.sql.rowset packages have no @since info
  • ec45bd6: 8310182: DateTimeFormatter date formats (ISO_LOCAL_DATE) separated with hyphen, not dash
  • ... and 132 more: https://git.openjdk.org/jdk/compare/8c9b85a990d955487f9141207cc83d0051defc57...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 28, 2023

@shqking Pushed as commit afdaa2a.

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

@shqking shqking deleted the jdk-8309109 branch June 28, 2023 02:00
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