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

8287091: aarch64 : guarantee(val < (1ULL << nbits)) failed: Field too big for insn #8845

Closed
wants to merge 2 commits into from

Conversation

theRealAph
Copy link
Contributor

@theRealAph theRealAph commented May 23, 2022

This is fallout from the patch for JDK-8285923.

The root cause of this bug is that there is a template definition of cmp(register, immediate) but there is not a template definition of cmn(register, immediate). Given that we are close to rampdown, this patch fixes the bug in the most minimal way possible, by using adds(zr, register, immediate), which correctly handles 64-bit operands.

In the next release cycle we should tidy up cmn() in the same way that was done for JDK-8206895.

Alternatively, we could back out JDK-8285923. I'd rather not, given that it fixes a real (if latent) bug, but if needs be I'll do so.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

  • JDK-8287091: aarch64 : guarantee(val < (1ULL << nbits)) failed: Field too big for insn

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8845

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 23, 2022

👋 Welcome back aph! 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 May 23, 2022
@openjdk
Copy link

openjdk bot commented May 23, 2022

@theRealAph 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 May 23, 2022
@mlbridge
Copy link

mlbridge bot commented May 23, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented May 24, 2022

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

8287091: aarch64 : guarantee(val < (1ULL << nbits)) failed: Field too big for insn

Reviewed-by: ngasson, shade

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

  • 4042dba: 8287138: Make VerifyOption an enum class
  • a276cd2: 8287151: Remove unused parameter in G1CollectedHeap::mark_evac_failure_object
  • cf57d72: 8287174: Remove deprecated configure arguments
  • 6458a56: 8286177: C2: "failed: non-reduction loop contains reduction nodes" assert failure
  • 1cd7850: 8287194: build failure on riscv after JDK-8286825
  • 15f1583: 8287008: Improve tests for thread dumps in JSON format
  • a5caffd: 8286786: [macos] javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java still fails
  • c1db70d: 8285973: x86_64: Improve fp comparison and cmove for eq/ne
  • 782ae38: 8286262: Windows: Cleanup deprecation warning suppression
  • 9f73fb5: 8225013: sanity/client/SwingSet/src/ScrollPaneDemoTest.java fails on Linux
  • ... and 11 more: https://git.openjdk.java.net/jdk/compare/8040aa0073e7ea22b2fdff5bddff10c244e116ef...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 May 24, 2022
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.

All right, so we just store the result to zr, which is effectively no-op, and ride on the updated flags done by add*s*. Looks fine.

@nick-arm
Copy link
Contributor

All right, so we just store the result to zr, which is effectively no-op, and ride on the updated flags done by add*s*.

It's actually the same instruction: cmn reg, imm is an alias for adds zr, reg, imm.

@shipilev
Copy link
Member

All right, so we just store the result to zr, which is effectively no-op, and ride on the updated flags done by add*s*.

It's actually the same instruction: cmn reg, imm is an alias for adds zr, reg, imm.

Nice. Even better then.

@robcasloz
Copy link
Contributor

Internal testing (hs-tier1-5 and affected JCK test case) looks good.

@theRealAph
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 25, 2022

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

  • 6585043: 8287181: Avoid redundant HashMap.containsKey calls in InternalLocaleBuilder.setExtension
  • a0cccb5: 8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect
  • 742644e: 8287263: java/nio/channels/FileChannel/LargeMapTest.java times out on Windows
  • d792cbc: 8286211: Update PCSC-Lite for Suse Linux to 1.9.5
  • 9b7e42c: 8284209: Replace remaining usages of 'a the' in source code
  • 6cc4bb1: 6725221: Standardize obtaining boolean properties with defaults
  • 194bc08: 8287249: Zero: Missing BarrierSetNMethod::arm() method
  • 25669bb: 8275170: Some jtreg sound tests should be marked with sound keyword
  • 4518063: 8281682: Redundant .ico files in Windows app-image cause unnecessary bloat
  • fdece9a: 8287169: compiler/arguments/TestCompileThresholdScaling.java fails on x86_32 after JDK-8287052
  • ... and 32 more: https://git.openjdk.java.net/jdk/compare/8040aa0073e7ea22b2fdff5bddff10c244e116ef...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 25, 2022

@theRealAph Pushed as commit 593d2b7.

💡 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
4 participants