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

8277906: Incorrect type for IV phi of long counted loops after CCP #6632

Closed
wants to merge 2 commits into from

Conversation

rwestrel
Copy link
Contributor

@rwestrel rwestrel commented Dec 1, 2021

This failure occurs because the iv phi of a long counted loop has the
wrong type after CCP. That happens because, during CCP, after the type
of the limit of the counted loop is updated, the type of the iv phi is
not recomputed. The fix is to apply to long counted loops the logic
that already exists for int counted loop.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8277906: Incorrect type for IV phi of long counted loops after CCP

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6632/head:pull/6632
$ git checkout pull/6632

Update a local copy of the PR:
$ git checkout pull/6632
$ git pull https://git.openjdk.java.net/jdk pull/6632/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6632

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6632.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 1, 2021

👋 Welcome back roland! 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 Dec 1, 2021
@openjdk
Copy link

openjdk bot commented Dec 1, 2021

@rwestrel 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 1, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 1, 2021

Webrevs

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Looks good to me but what about this code?

if (use_op == Op_CmpI) {
Node* phi = countedloop_phi_from_cmp((CmpINode*)use, n);
if (phi != NULL) {

@rwestrel
Copy link
Contributor Author

rwestrel commented Dec 1, 2021

Thanks for the review.

Looks good to me but what about this code?

Good catch. I didn't notice that one. I think it is specific to int counted loops when the pre/main/post loops are created.

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Okay, makes sense.

@openjdk
Copy link

openjdk bot commented Dec 1, 2021

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

8277906: Incorrect type for IV phi of long counted loops after CCP

Reviewed-by: thartmann, chagedorn

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

  • d2b16c8: 8276126: Dump time class transformation causes heap objects of non-boot classes to be archived
  • 7696897: 8276837: [macos]: Error when signing the additional launcher
  • 3d98ec1: 8273056: java.util.random does not correctly sample exponential or Gaussian distributions
  • b79554b: 8278130: Failure in jdk/javadoc/tool/CheckManPageOptions.java after JDK-8274639
  • ea905bd: 8277924: Small tweaks to foreign function and memory API
  • e002bfe: 8278049: G1: add precondition to set_remainder_to_point_to_start
  • 16cfbc4: 8278071: typos in MemorySegment::set, MemorySegment::setAtIndex javadoc
  • 84ca14d: 8277194: applications/runthese/RunThese30M.java crashes with jfrSymbolTable.cpp:305 assert(_instance != null)
  • 103da8f: 8274639: Provide a way to disable warnings for cross-modular links
  • 088b244: 8251216: Implement MD5 intrinsics on AArch64
  • ... and 78 more: https://git.openjdk.java.net/jdk/compare/3034ae87ce4b94c7dc40cfb5a96d6d1e87910bbf...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 Dec 1, 2021
Copy link
Member

@chhagedorn chhagedorn left a comment

Looks good!

@rwestrel
Copy link
Contributor Author

rwestrel commented Dec 2, 2021

@TobiHartmann @chhagedorn thanks for the reviews.

@rwestrel
Copy link
Contributor Author

rwestrel commented Dec 2, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Dec 2, 2021

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

  • d2b16c8: 8276126: Dump time class transformation causes heap objects of non-boot classes to be archived
  • 7696897: 8276837: [macos]: Error when signing the additional launcher
  • 3d98ec1: 8273056: java.util.random does not correctly sample exponential or Gaussian distributions
  • b79554b: 8278130: Failure in jdk/javadoc/tool/CheckManPageOptions.java after JDK-8274639
  • ea905bd: 8277924: Small tweaks to foreign function and memory API
  • e002bfe: 8278049: G1: add precondition to set_remainder_to_point_to_start
  • 16cfbc4: 8278071: typos in MemorySegment::set, MemorySegment::setAtIndex javadoc
  • 84ca14d: 8277194: applications/runthese/RunThese30M.java crashes with jfrSymbolTable.cpp:305 assert(_instance != null)
  • 103da8f: 8274639: Provide a way to disable warnings for cross-modular links
  • 088b244: 8251216: Implement MD5 intrinsics on AArch64
  • ... and 78 more: https://git.openjdk.java.net/jdk/compare/3034ae87ce4b94c7dc40cfb5a96d6d1e87910bbf...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 2, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 2, 2021
@openjdk
Copy link

openjdk bot commented Dec 2, 2021

@rwestrel Pushed as commit 3889af3.

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

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