Skip to content

Conversation

@zhengxiaolinX
Copy link
Contributor

@zhengxiaolinX zhengxiaolinX commented Nov 10, 2022

The backend encounters the same assertion failure as JDK-8295414. This patch is a similar fix.

Same, partialSubtypeCheck uses iRegP_R15 as a result while its use iRegP doesn't match the iRegP_R15, causing this failure.

The details are in the JBS issue JDK-8296771.

Tested the failed compiler/types/TestSubTypeCheckMacroTrichotomy.java, and a hotspot tier1 is running now.

Thanks,
Xiaolin


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-8296771: RISC-V: C2: assert(false) failed: bad AD file

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11085

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 10, 2022

👋 Welcome back xlinzheng! 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 Nov 10, 2022
@openjdk
Copy link

openjdk bot commented Nov 10, 2022

@zhengxiaolinX 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 Nov 10, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 10, 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.

Looks fine to me. I do wonder if there are similar lurking bugs with other iRegP_* that should probably also be part of operand iRegP; this limited fix is okay, though, as riscv.ad only has iRegP_R15 and iRegP_R10 as result registers in existing match rules.

@openjdk
Copy link

openjdk bot commented Nov 10, 2022

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

8296771: RISC-V: C2: assert(false) failed: bad AD file

Reviewed-by: shade, fyang

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

  • 2f9a94f: 8296824: ProblemList compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java
  • 43ebd96: 8296822: ProblemList jdk/jfr/api/consumer/TestRecordingFileWrite.java
  • 84e1224: 8296496: Overzealous check in sizecalc.h prevents large memory allocation
  • 27527b4: 8296612: CertAttrSet is useless
  • 6b456f7: 8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but was:<3.02668882E10>
  • e1badb7: 8295871: G1: Use different explicit claim marks for CLDs
  • 9ef7852: 8290714: Make com.sun.jndi.dns.DnsClient virtual threads friendly
  • d6468be: 8293886: The abstract keyword can be removed in AESCipher
  • 54c986e: 8296715: CLDR v42 update for tzdata 2022f
  • 4a68210: 6972078: Can not select single directory with GTKLookAndFeel
  • ... and 3 more: https://git.openjdk.org/jdk/compare/e802b124b7a363ca4cb56f8072b4dde5176ef96a...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@shipilev, @RealFYang) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 10, 2022
@zhengxiaolinX
Copy link
Contributor Author

Looks

Yes, it seems to me as well that only iRegP_R10 and iRegP_R15 are result registers after some checking.
And thanks for the fast review!

@zhengxiaolinX
Copy link
Contributor Author

Tier1 says okay. Thanks for reviewing!

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 11, 2022
@openjdk
Copy link

openjdk bot commented Nov 11, 2022

@zhengxiaolinX
Your change (at version b7eacaa) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 11, 2022

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

  • 956d75b: 8295099: vmTestbase/nsk/stress/strace/strace013.java failed with "TestFailure: wrong lengths of stack traces: strace013Thread0: NNN strace013Thread83: MMM"
  • 2f9a94f: 8296824: ProblemList compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java
  • 43ebd96: 8296822: ProblemList jdk/jfr/api/consumer/TestRecordingFileWrite.java
  • 84e1224: 8296496: Overzealous check in sizecalc.h prevents large memory allocation
  • 27527b4: 8296612: CertAttrSet is useless
  • 6b456f7: 8262901: [macos_aarch64] NativeCallTest expected:<-3.8194101E18> but was:<3.02668882E10>
  • e1badb7: 8295871: G1: Use different explicit claim marks for CLDs
  • 9ef7852: 8290714: Make com.sun.jndi.dns.DnsClient virtual threads friendly
  • d6468be: 8293886: The abstract keyword can be removed in AESCipher
  • 54c986e: 8296715: CLDR v42 update for tzdata 2022f
  • ... and 4 more: https://git.openjdk.org/jdk/compare/e802b124b7a363ca4cb56f8072b4dde5176ef96a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 11, 2022

@RealFYang @zhengxiaolinX Pushed as commit 7244eac.

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

@kuaiwei
Copy link
Contributor

kuaiwei commented Mar 5, 2024

/backport port-riscv-jdk11u

@openjdk
Copy link

openjdk bot commented Mar 5, 2024

@kuaiwei To use the /backport command, you need to be in the OpenJDK census and your GitHub account needs to be linked with your OpenJDK username (how to associate your GitHub account with your OpenJDK username).

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

Development

Successfully merging this pull request may close these issues.

4 participants