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

8345471: Clean up compiler/intrinsics/sha/cli tests #22517

Closed
wants to merge 1 commit into from

Conversation

djelinski
Copy link
Member

@djelinski djelinski commented Dec 3, 2024

Merge all the GenericTestCaseForUnsupportedXXXCPU and GenericTestCaseForOtherCPU into GenericTestCaseForUnsupportedCPU.java.

The CPU-specific files are almost identical; I chose to resolve the differences in favor of the AArch64 version. The OtherCPU version looks wrong, and it wasn't executed on any supported platform.

The tests continue to pass on linux-aarch64/x64, windows-x64 and mac-aarch64. I didn't test other platforms.

After the change, the tests will start running on PPC and S390. They will also automatically run on any new architectures.

For those interested in historical background, when the tests were introduced, there were only 2 supported CPU architectures. X86 did not support any of the intrinsics, and the X86 test case did not even call getPredicateForOption. The call to getPredicateForOption was added in f2e9b82, and since then all the cases are the same.


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-8345471: Clean up compiler/intrinsics/sha/cli tests (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22517

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 3, 2024

👋 Welcome back djelinski! 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 3, 2024

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

8345471: Clean up compiler/intrinsics/sha/cli tests

Reviewed-by: kvn

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

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 3, 2024

@djelinski 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 Dec 3, 2024
@djelinski djelinski changed the title Unify GenericTestCaseForUnsupportedCPU 8345471 Dec 4, 2024
@openjdk openjdk bot changed the title 8345471 8345471: Clean up compiler/intrinsics/sha/cli tests Dec 4, 2024
@djelinski djelinski marked this pull request as ready for review December 4, 2024 10:11
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 4, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 4, 2024

Webrevs

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.

Good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 4, 2024
@djelinski
Copy link
Member Author

Thanks for the review @vnkozlov. Still waiting for a second reviewer...

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2025

@djelinski 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!

@djelinski
Copy link
Member Author

I'd like to merge this early next week; if anyone still wants to review this but needs more time, please leave a note.

@djelinski
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 13, 2025

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

  • ed0b555: 8344035: Replace predicate walking code in Loop Unswitching with a predicate visitor
  • b37f123: 8347407: [BACKOUT] C1/C2 don't handle allocation failure properly during initialization (RuntimeStub::new_runtime_stub fatal crash)
  • 1f7925c: 8347270: Remove unix_getParentPidAndTimings, unix_getChildren and unix_getCmdlineAndUserInfo
  • 9fafd63: 8346828: javax/swing/JScrollBar/4865918/bug4865918.java still fails in CI
  • f04a642: 8346717: serviceability/dcmd/vm/SystemDumpMapTest.java failing on Windows with "Stack base not yet set for thread id"
  • 3145278: 8346727: JvmtiVTMSTransitionDisabler deadlock
  • 761774a: 8346143: add ClearAllFramePops function to speedup debugger single stepping in some cases
  • 6f1f2f2: 8347063: Add comments in ClassFileFormatVersion for class file format evolution history
  • 10f7142: 8347295: Fix WinResourceTest to make it work with WiX v4.0+
  • 01c8ba2: 8347298: Bug in JPackageCommand.ignoreFakeRuntime()
  • ... and 423 more: https://git.openjdk.org/jdk/compare/dfa5620ff3d57b71ccaf09ca8e71fa85d93ceb00...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 13, 2025

@djelinski Pushed as commit 3b9732e.

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

@djelinski djelinski deleted the sha-unsupported branch February 10, 2025 07:42
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
Development

Successfully merging this pull request may close these issues.

2 participants