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

8330213: RISC-V: C2: assert(false) failed: bad AD file after JDK-8316991 #18774

Closed

Conversation

feilongjiang
Copy link
Member

@feilongjiang feilongjiang commented Apr 14, 2024

Hi, please review this fix that adds additional CMove match rules for the riscv port.
JDK-8316991 introduces more conditional moves which reduce merges used by CmpP/CmpN. However, there is no match rule for CMove with CmpP/N on riscv, resulting in the bad AD file crash.

After this fix, the following five tests would pass without any crashes.

Testing:

  • compiler/eliminateAutobox/TestDoubleBoxing.java
  • compiler/eliminateAutobox/TestFloatBoxing.java
  • compiler/eliminateAutobox/TestLongBoxing.java
  • compiler/eliminateAutobox/TestIntBoxing.java
  • compiler/eliminateAutobox/TestShortBoxing.java
  • tier1~3 (linux-riscv64, release)
  • hotspot:tier1 (linux-riscv64, fastdebug)

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-8330213: RISC-V: C2: assert(false) failed: bad AD file after JDK-8316991 (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18774

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 14, 2024

👋 Welcome back fjiang! 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 Apr 14, 2024

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

8330213: RISC-V: C2: assert(false) failed: bad AD file after JDK-8316991

Reviewed-by: fyang, rehn

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

  • 97c1808: 8329099: Undocumented exception thrown by Instruction factory methods accepting Opcode
  • def2577: 8330215: Trim working set for OldObjectSamples
  • 2f11afd: 8330172: G1: Consolidate update_bot_for_block and update_bot_for_obj in HeapRegion
  • 31a1f9c: 8307143: CredentialsCache.cacheName should not be static
  • 274c805: 8327743: JVM crash in hotspot/share/runtime/javaThread.cpp - failed: held monitor count should be equal to jni: 0 != 1
  • 140f567: 8323220: Reassociate loop invariants involved in Cmps and Add/Subs
  • a293bdf: 8330197: Make javac/diags/example release agnostic
  • da75e01: 8330196: Make java/lang/invoke/defineHiddenClass/BasicTest release agnostic
  • ddc3921: 8330103: Compiler memory statistics should keep separate records for C1 and C2
  • 273df62: 8328792: Parallel: Refactor PSParallelCompact::summary_phase
  • ... and 8 more: https://git.openjdk.org/jdk/compare/c1c99a669bb7f9928086db6a4ecfc90c410ffbb0...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 rfr Pull request is ready for review label Apr 14, 2024
@openjdk
Copy link

openjdk bot commented Apr 14, 2024

@feilongjiang 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 Apr 14, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 14, 2024

Webrevs

Copy link
Member

@RealFYang RealFYang 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. Thanks!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 15, 2024
Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

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

Seems fine to me.

@feilongjiang
Copy link
Member Author

@RealFYang @robehn -- Thanks!

/integrate

@openjdk
Copy link

openjdk bot commented Apr 17, 2024

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

  • f6f038a: 8317368: [JVMCI] SIGSEGV in JVMCIEnv::initialize_installed_code on libgraal
  • fb4cf1c: 8329636: Deprecate -XX:+PreserveAllAnnotations
  • d1c6cd1: 8330133: libj2pkcs11.so crashes on some pkcs#11 v3.0 libraries
  • 76cbe48: 8329430: MetaspaceShared::preload_and_dump should clear pending exception
  • f7c8413: 8326116: JFR: Add help option to -XX:StartFlightRecording
  • 941bee1: 8327640: Allow NumberFormat strict parsing
  • 2ede143: 8330279: Typo in java.text.Bidi class description
  • 90df3b7: 8329190: (ch) DatagramChannel.receive should throw ClosedChannelException when called on closed channel
  • f11a496: 8180450: secondary_super_cache does not scale well
  • bfff02e: 8330165: C2: make superword consistently use PhaseIdealLoop::register_new_node()
  • ... and 24 more: https://git.openjdk.org/jdk/compare/c1c99a669bb7f9928086db6a4ecfc90c410ffbb0...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 17, 2024

@feilongjiang Pushed as commit c8702ed.

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

@feilongjiang
Copy link
Member Author

windows-x64 build failure seems not related. It is riscv only modification,

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