Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Dec 21, 2021

See the reproducer and the analysis in the bug.

The fix is simple: Matcher::match_rule_supported should handle the predicates for current SqrtF and SqrtD match rules.

Additional testing:

  • Linux x86_32 -XX:UseAVX=0 -XX:UseSSE=0, new test now passes
  • Linux x86_32 -XX:UseAVX=0 -XX:UseSSE=1, new test passes
  • Linux x86_32 -XX:UseAVX=0 -XX:UseSSE=2, new test passes
  • Linux x86_32 -XX:UseAVX=0 -XX:UseSSE=0, jdk/incubator/vector/ now passes
  • Linux x86_32 -XX:UseAVX=0 -XX:UseSSE=1, jdk/incubator/vector/ passes
  • Linux x86_32 -XX:UseAVX=0 -XX:UseSSE=2, jdk/incubator/vector/ passes (some unrelated failures)
  • Linux x86_64, new test passes

Progress

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

Issue

  • JDK-8279076: C2: Bad AD file when matching SqrtF with UseSSE=0

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 60

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 21, 2021

👋 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
Copy link

openjdk bot commented Dec 21, 2021

@shipilev 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.java.net label Dec 21, 2021
@shipilev shipilev marked this pull request as ready for review December 21, 2021 19:43
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 21, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 21, 2021

Webrevs

Copy link

@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.

Good.

@openjdk
Copy link

openjdk bot commented Dec 21, 2021

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

8279076: C2: Bad AD file when matching SqrtF with UseSSE=0

Reviewed-by: kvn, sviswanathan

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

  • 9ee3ccf: 8279045: Intrinsics missing vzeroupper instruction
  • 84d3333: 8279081: ProblemList jdk/jfr/event/oldobject/TestLargeRootSet.java on 2 platforms
  • 1128674: 8278627: Shenandoah: TestHeapDump test failed
  • 54517fa: 8279074: ProblemList compiler/codecache/jmx/PoolsIndependenceTest.java on macosx-aarch64
  • ac7430c: 8278044: ObjectInputStream methods invoking the OIF.CFG.getSerialFilterFactory() silent about error cases.

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 Dec 21, 2021
Copy link

@sviswa7 sviswa7 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.

@shipilev
Copy link
Member Author

Thanks for reviews! I see all GHA failures are known, not related to this patch, and reported as bugs already. I will integrate this after 24 hrs expire.

@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 22, 2021

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

  • 04ee921: 8278967: rmiregistry fails to start because SecurityManager is disabled
  • 2be3e7e: 8278239: vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine failed with EXCEPTION_ACCESS_VIOLATION at 0x000000000000000d
  • dfb15c3: 8274315: JFR: One closed state per file or stream
  • e49d4a9: 8271447: java.nio.file.InvalidPathException: Malformed input or input contains unmappable characters
  • 713fbeb: 8278987: RunThese24H.java failed with EXCEPTION_ACCESS_VIOLATION in write_sample_info
  • 7341439: 8279007: jstatd fails to start because SecurityManager is disabled
  • 97c5cd7: 8278508: Enable X86 maskAll instruction pattern for 32 bit JVM.
  • 9ee3ccf: 8279045: Intrinsics missing vzeroupper instruction
  • 84d3333: 8279081: ProblemList jdk/jfr/event/oldobject/TestLargeRootSet.java on 2 platforms
  • 1128674: 8278627: Shenandoah: TestHeapDump test failed
  • ... and 2 more: https://git.openjdk.java.net/jdk18/compare/db3d6d772411c4e7bc81d6411abb139462e1581f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 22, 2021

@shipilev Pushed as commit 9d5ae2e.

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

@shipilev shipilev deleted the JDK-8279076-c2-sqrtf branch December 23, 2021 16:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

hotspot-compiler hotspot-compiler-dev@openjdk.java.net integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants