Navigation Menu

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

8295066: Folding of loads is broken in C2 after JDK-8242115 #10861

Closed
wants to merge 3 commits into from

Conversation

veresov
Copy link
Contributor

@veresov veresov commented Oct 25, 2022

The fix does two things:

  1. Allow folding of pinned loads to constants with a straight line data flow (no phis).
  2. Make scalarization aware of the new shape of the barriers so that pre-loads can be ignored.

Testing is clean, Valhalla testing is clean too.


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-8295066: Folding of loads is broken in C2 after JDK-8242115

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10861

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 25, 2022

👋 Welcome back iveresov! 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 Oct 25, 2022
@openjdk
Copy link

openjdk bot commented Oct 25, 2022

@veresov The following labels will be automatically applied to this pull request:

  • hotspot
  • shenandoah

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added hotspot hotspot-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Oct 25, 2022
@veresov
Copy link
Contributor Author

veresov commented Oct 25, 2022

/label add hotspot-compiler

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Oct 25, 2022
@openjdk
Copy link

openjdk bot commented Oct 25, 2022

@veresov
The hotspot-compiler label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Oct 25, 2022

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.

Looks good.
Please, test full first 3 tier1-3 (not just hs-tier*).

@openjdk
Copy link

openjdk bot commented Oct 25, 2022

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

8295066: Folding of loads is broken in C2 after JDK-8242115

Reviewed-by: kvn, 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 4 new commits pushed to the master branch:

  • 324bec1: 8295863: JFR: Use expected size for Maps and Sets
  • 3bd3caf: 8294486: Remove vmTestbase/nsk/jvmti/ tests ported to serviceability/jvmti.
  • fec6174: 8295816: jdwp jck tests failing with "FATAL ERROR in native method: JDWP SetTag, jvmtiError=JVMTI_ERROR_WRONG_PHASE(112)"
  • e0c2930: 8295282: Use Zicboz/cbo.zero to zero-out memory on RISC-V

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 openjdk bot added the ready Pull request is ready to be integrated label Oct 25, 2022
@veresov
Copy link
Contributor Author

veresov commented Oct 26, 2022

Please, test full first 3 tier1-3 (not just hs-tier*).

Done. Looks good.

@vnkozlov
Copy link
Contributor

Please, test full first 3 tier1-3 (not just hs-tier*).

Done. Looks good.

Thank you for running them.

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.

That looks good to me too.

@veresov
Copy link
Contributor Author

veresov commented Oct 26, 2022

Thanks for the reviews!
/integrate

@openjdk
Copy link

openjdk bot commented Oct 26, 2022

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

  • a8450b3: 8295713: runtime/ParallelLoad/SuperWait/SuperWaitTest.java fails intermittently on Windows
  • 46e6aee: 8295823: Use enhanced-for cycle instead of Enumeration in java.naming
  • 8e5d680: 8293093: NPE in P11KeyStore.getID
  • 3135914: 8265441: IGV: select block nodes by clicking on it
  • 78454b6: 8295879: JFR: Remove warnings in the jdk.jfr module
  • 33ff80d: 8295402: G1: Tighten assertion in G1ScanHRForRegionClosure::scan_heap_roots
  • 303548b: 8294752: G1: Remove redundant checks in check_obj_during_refinement
  • cf121df: 8295889: NMT preinit code does not handle allocation errors
  • 772be2e: 8295868: 32-bit Windows build failures after JDK-8294466
  • e173fd7: 8295885: GHA: Bump gcc versions
  • ... and 6 more: https://git.openjdk.org/jdk/compare/d393e051e660d05b645a2d148c6cdfc21b1d347e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 26, 2022

@veresov Pushed as commit 58a7141.

💡 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 hotspot-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated shenandoah shenandoah-dev@openjdk.org
3 participants