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

8310308: IR Framework: check for type and size of vector nodes #29

Closed
wants to merge 4 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 14, 2023

I backport this to improve testing of C2 in 22u. It will simplify backporting tests of fixes to C2, as, e.g. " 8313720: C2 SuperWord: wrong result with -XX:+UseVectorCmov -XX:+UseCMoveUnconditionally"

I had to trivially resolve three files:

test/hotspot/jtreg/compiler/loopopts/superword/TestDependencyOffsets.java
Resolved the bugid in comment.

patching file test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
patching file test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java
These had to be resolved because "8308340: C2: Idealize Fma nodes" is not in 21. Trivial.
That change is huge thus not a candidate for backport.

Further I include "8314513: [IR Framework] Some internal IR Framework tests are failing after JDK-8310308 on PPC and Cascade Lake". This is a follow-up fix of the tests.

All tests passed locally.

It's a test-only change.


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
  • JDK-8314513 needs maintainer approval
  • JDK-8310308 needs maintainer approval

Issues

  • JDK-8310308: IR Framework: check for type and size of vector nodes (Enhancement - P4 - Approved)
  • JDK-8314513: [IR Framework] Some internal IR Framework tests are failing after JDK-8310308 on PPC and Cascade Lake (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/29/head:pull/29
$ git checkout pull/29

Update a local copy of the PR:
$ git checkout pull/29
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/29/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 29

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/29.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 14, 2023

👋 Welcome back goetz! 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.

@GoeLin GoeLin changed the title Goetz backport 8310308 Backport a02d65efccaab5bb7c2f2aad4a2eb5062f545ef8 Dec 14, 2023
@openjdk openjdk bot changed the title Backport a02d65efccaab5bb7c2f2aad4a2eb5062f545ef8 8310308: IR Framework: check for type and size of vector nodes Dec 14, 2023
@openjdk
Copy link

openjdk bot commented Dec 14, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport label Dec 14, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Dec 14, 2023

/issue 8314513

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 14, 2023
@openjdk
Copy link

openjdk bot commented Dec 14, 2023

@GoeLin
Adding additional issue to issue list: 8314513: [IR Framework] Some internal IR Framework tests are failing after JDK-8310308 on PPC and Cascade Lake.

@mlbridge
Copy link

mlbridge bot commented Dec 14, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Dec 14, 2023

Pre-submit: compiler/c2/irTests/TestVectorizationMismatchedAccess failed.

@GoeLin
Copy link
Member Author

GoeLin commented Dec 18, 2023

TestVectorizationMismatchedAccess.java was failing.
This is because in head, subtest testByteByte2 was enabled by 8310308. But in 21, it is disabled.
If I enable it in 21 without this change, it fails with the same message as with the change. So I disabled it again.

As I understand, 21 does not generate vector nodes for the test method, and in 22 there was a functional improvement.

@openjdk
Copy link

openjdk bot commented Dec 19, 2023

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label Dec 22, 2023
@openjdk
Copy link

openjdk bot commented Dec 22, 2023

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

8310308: IR Framework: check for type and size of vector nodes
8314513: [IR Framework] Some internal IR Framework tests are failing after JDK-8310308 on PPC and Cascade Lake

Reviewed-by: mbaesken

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

  • 7927315: 8321972: test runtime/Unsafe/InternalErrorTest.java timeout on linux-riscv64 platform
  • aaee2d7: 8322040: Missing array bounds check in ClassReader.parameter
  • 636607b: 8313816: Accessing jmethodID might lead to spurious crashes
  • e4056b9: 8321409: Console read line with zero out should zero out underlying buffer in JLine (redux)
  • 12915c3: 8261837: SIGSEGV in ciVirtualCallTypeData::translate_from
  • e0de68e: 8209595: MonitorVmStartTerminate.java timed out
  • 2f65dda: 8316462: sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java ignores VM flags
  • 840724b: 8317188: G1: Make TestG1ConcRefinementThreads use createTestJvm
  • a6c2398: 8317218: G1: Make TestG1HeapRegionSize use createTestJvm
  • a565d49: 8317316: G1: Make TestG1PercentageOptions use createTestJvm
  • ... and 51 more: https://git.openjdk.org/jdk21u-dev/compare/fb34573636079ff1ddbf193f86e72b4fb55c1e7d...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 ready Pull request is ready to be integrated and removed approval labels Dec 22, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Dec 22, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 22, 2023

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

  • 506c4de: 8313854: Some tests in serviceability area fail on localized Windows platform
  • 7927315: 8321972: test runtime/Unsafe/InternalErrorTest.java timeout on linux-riscv64 platform
  • aaee2d7: 8322040: Missing array bounds check in ClassReader.parameter
  • 636607b: 8313816: Accessing jmethodID might lead to spurious crashes
  • e4056b9: 8321409: Console read line with zero out should zero out underlying buffer in JLine (redux)
  • 12915c3: 8261837: SIGSEGV in ciVirtualCallTypeData::translate_from
  • e0de68e: 8209595: MonitorVmStartTerminate.java timed out
  • 2f65dda: 8316462: sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java ignores VM flags
  • 840724b: 8317188: G1: Make TestG1ConcRefinementThreads use createTestJvm
  • a6c2398: 8317218: G1: Make TestG1HeapRegionSize use createTestJvm
  • ... and 52 more: https://git.openjdk.org/jdk21u-dev/compare/fb34573636079ff1ddbf193f86e72b4fb55c1e7d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 22, 2023

@GoeLin Pushed as commit 6b938b8.

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

@GoeLin GoeLin deleted the goetz_backport_8310308 branch December 22, 2023 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants