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

8316679: C2 SuperWord: wrong result, load should not be moved before store if not comparable #327

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Nov 6, 2023

Unclean backport to fix the vectorization bug. The patch is unclean because JDK 21u does not have JDK-8312332 refactoring, that I do not want to backport. I have reapplied the patch by renaming SWPointer again.

Note @eme64, @TobiHartmann.

Additional testing:

  • MacOS AArch64 Server fastdebug, new regression test fails without the patch, passes with it
  • MacOS AArch64 Server fastdebug, compiler/loopopts
  • Linux x86_64 server fastdebug, tier1 tier2 tier3 tier4

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-8316679 needs maintainer approval

Issue

  • JDK-8316679: C2 SuperWord: wrong result, load should not be moved before store if not comparable (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 327

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 6, 2023

👋 Welcome back shade! 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 changed the title Backport 48f1a925e528cc9f8cd6c727129918e0e49b3429 8316679: C2 SuperWord: wrong result, load should not be moved before store if not comparable Nov 6, 2023
@openjdk
Copy link

openjdk bot commented Nov 6, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 6, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 6, 2023

Webrevs

Copy link

@eme64 eme64 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. Renaming VPointer -> SWPointer is required.

@shipilev
Copy link
Member Author

shipilev commented Nov 6, 2023

/approval request Unclean backport to fix the vectorization bug. The patch is unclean because JDK 21u does not have JDK-8312332 refactoring, that I do not want to backport. JDK 21u PR is acked by Emanuel Peter.

@openjdk
Copy link

openjdk bot commented Nov 6, 2023

@shipilev
8316679: The approval request has been created successfully.

@openjdk openjdk bot added approval and removed approval labels Nov 6, 2023
@shipilev
Copy link
Member Author

shipilev commented Nov 8, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Nov 8, 2023

@shipilev This pull request has not yet been marked as ready for integration.

@shipilev
Copy link
Member Author

shipilev commented Nov 8, 2023

Dang, I need a formal (R)eviewer for this. @phohensee?

@openjdk
Copy link

openjdk bot commented Nov 8, 2023

⚠️ @shipilev 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
Copy link

openjdk bot commented Nov 8, 2023

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

8316679: C2 SuperWord: wrong result, load should not be moved before store if not comparable

Reviewed-by: epeter, phh, 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 15 new commits pushed to the master branch:

  • 0e2a520: 8318951: Additional negative value check in JPEG decoding
  • 0679922: 8294535: Add screen capture functionality to PassFailJFrame
  • 7f02e4a: 8301846: Invalid TargetDataLine after screen lock when using JFileChooser or COM library
  • 6632c8a: 8317374: Add Let's Encrypt ISRG Root X2
  • 243142c: 8314580: PhaseIdealLoop::transform_long_range_checks fails with assert "was tested before"
  • b93d884: 8318183: C2: VM may crash after hitting node limit
  • fb355df: 8309209: C2 failed "assert(_stack_guard_state == stack_guard_reserved_disabled) failed: inconsistent state"
  • 50c34ca: 8316645: RISC-V: Remove dependency on libatomic by adding cmpxchg 1b
  • eb8267d: 8316585: [REDO] runtime/InvocationTests spend a lot of time on dependency verification
  • 31c759d: 8315362: NMT: summary diff reports threads count incorrectly
  • ... and 5 more: https://git.openjdk.org/jdk21u/compare/4bbea6dde3a3b6bf07e515adb3cf7d1b22bfec91...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 Nov 8, 2023
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.

@shipilev
Copy link
Member Author

shipilev commented Nov 9, 2023

Thank you all!

/integrate

@openjdk
Copy link

openjdk bot commented Nov 9, 2023

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

  • 0e2a520: 8318951: Additional negative value check in JPEG decoding
  • 0679922: 8294535: Add screen capture functionality to PassFailJFrame
  • 7f02e4a: 8301846: Invalid TargetDataLine after screen lock when using JFileChooser or COM library
  • 6632c8a: 8317374: Add Let's Encrypt ISRG Root X2
  • 243142c: 8314580: PhaseIdealLoop::transform_long_range_checks fails with assert "was tested before"
  • b93d884: 8318183: C2: VM may crash after hitting node limit
  • fb355df: 8309209: C2 failed "assert(_stack_guard_state == stack_guard_reserved_disabled) failed: inconsistent state"
  • 50c34ca: 8316645: RISC-V: Remove dependency on libatomic by adding cmpxchg 1b
  • eb8267d: 8316585: [REDO] runtime/InvocationTests spend a lot of time on dependency verification
  • 31c759d: 8315362: NMT: summary diff reports threads count incorrectly
  • ... and 5 more: https://git.openjdk.org/jdk21u/compare/4bbea6dde3a3b6bf07e515adb3cf7d1b22bfec91...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 9, 2023

@shipilev Pushed as commit 9008889.

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

@shipilev shipilev deleted the JDK-8316679-c2-vector-not-comparable branch November 28, 2023 17:19
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
4 participants