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

8294578: [PPC64] C2: Missing is_oop information when using disjoint compressed oops mode #10484

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Sep 29, 2022

Fix missing is_oop information shown by assertion assert(t->base() == Type::Int || t->base() == Type::Half || t->base() == Type::FloatCon || t->base() == Type::FloatBot) failed: Unexpected type. See JBS issue for details.


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-8294578: [PPC64] C2: Missing is_oop information when using disjoint compressed oops mode

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10484

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 29, 2022

👋 Welcome back mdoerr! 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 Sep 29, 2022
@openjdk
Copy link

openjdk bot commented Sep 29, 2022

@TheRealMDoerr 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 Sep 29, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 29, 2022

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

This makes sense. Glad the assert helped :)

@openjdk
Copy link

openjdk bot commented Sep 29, 2022

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

8294578: [PPC64] C2: Missing is_oop information when using disjoint compressed oops mode

Reviewed-by: shade, lucy

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

  • 3b476a1: 8292847: Zero: Allow ergonomics to select the GC
  • 16047e8: 8292780: misc tests failed "assert(false) failed: graph should be schedulable"
  • bf39b18: 8288302: Shenandoah: SIGSEGV in vm maybe related to jit compiling xerces
  • f957ce9: 8294564: IGV: IllegalArgumentException for "Difference to current graph"
  • ae79af2: 8294740: Add cgroups keyword to TestDockerBasic.java
  • 07ed68e: 8288907: serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java fails with -XX:TieredStopAtLevel=2,3
  • 090cdfc: 8294726: Update URLs in minefield tests
  • ed40d88: 8276849: Refresh the window icon on graphics configuration changes
  • 081691a: 8294593: Check the size of the target on invocations of BigInteger::isProbablePrime
  • a4f2078: 8294437: java/nio/channels/FileChannel tests slow on Windows
  • ... and 43 more: https://git.openjdk.org/jdk/compare/ce85cac947158b4e1f554c55f726c923a49b1a41...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 Sep 29, 2022
@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review!
I just noticed that the decodeN_Disjoint_isel_Ex part is not needed and not 100% correct. (The result of decodeN_mergeDisjointNode is not guaranteed to be an oop in this case.) Only the finally assembled oop should be marked as oop.

Copy link
Contributor

@RealLucy RealLucy 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.
Thanks for finding and removing this annoyance!

@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review!
/integrate

@openjdk
Copy link

openjdk bot commented Oct 4, 2022

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

  • 3b476a1: 8292847: Zero: Allow ergonomics to select the GC
  • 16047e8: 8292780: misc tests failed "assert(false) failed: graph should be schedulable"
  • bf39b18: 8288302: Shenandoah: SIGSEGV in vm maybe related to jit compiling xerces
  • f957ce9: 8294564: IGV: IllegalArgumentException for "Difference to current graph"
  • ae79af2: 8294740: Add cgroups keyword to TestDockerBasic.java
  • 07ed68e: 8288907: serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java fails with -XX:TieredStopAtLevel=2,3
  • 090cdfc: 8294726: Update URLs in minefield tests
  • ed40d88: 8276849: Refresh the window icon on graphics configuration changes
  • 081691a: 8294593: Check the size of the target on invocations of BigInteger::isProbablePrime
  • a4f2078: 8294437: java/nio/channels/FileChannel tests slow on Windows
  • ... and 43 more: https://git.openjdk.org/jdk/compare/ce85cac947158b4e1f554c55f726c923a49b1a41...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 4, 2022

@TheRealMDoerr Pushed as commit f03934e.

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

@TheRealMDoerr TheRealMDoerr deleted the 8294578_PPC64_decodeN_mergeDisjoint branch October 4, 2022 10:15
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