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

8320379: C2: Sort spilling/unspilling sequence for better ld/st merging into ldp/stp on AArch64 #2535

Closed
wants to merge 2 commits into from

Conversation

pengxiaolong
Copy link
Contributor

@pengxiaolong pengxiaolong commented Jun 4, 2024

Backport JDK-8320379: C2: Sort spilling/unspilling sequence for better ld/st merging into ldp/stp on AArch64

Verification

Tested on AWS Graviton instance by running JTREG_KEYWORDS="\!headful & \!external-dep & \!printer" make test TEST=all, only saw few test failures in CAInterop.java and compiler/intrinsics.

  • CAInterop tests are known intermittently failing tests, it should be fine to ignore.
  • The test failures from compiler/intrinsics has error message "Option 'UseSHA3Intrinsics' is expected to have 'true' value Option 'UseSHA3Intrinsics' should be enabled by default", it seems a bug but not related to the backport, will follow up if we need to create a bug.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8320379 needs maintainer approval

Issue

  • JDK-8320379: C2: Sort spilling/unspilling sequence for better ld/st merging into ldp/stp on AArch64 (Enhancement - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2535/head:pull/2535
$ git checkout pull/2535

Update a local copy of the PR:
$ git checkout pull/2535
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2535/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2535

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2535.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 4, 2024

👋 Welcome back pengxiaolong! 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 Jun 4, 2024

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

8320379: C2: Sort spilling/unspilling sequence for better ld/st merging into ldp/stp on AArch64

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

  • 9056b3b: 8307193: Several Swing jtreg tests use class.forName on L&F classes
  • 257d5ef: 8316240: Open source several add/remove MenuBar manual tests
  • 8c80c8f: 8280392: java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java failed with "RuntimeException: Test failed."
  • f9c11cb: 8324668: JDWP process management needs more efficient file descriptor handling
  • 0a4f926: 8308184: Launching java with large number of jars in classpath with java.protocol.handler.pkgs system property set can lead to StackOverflowError
  • 08c3774: 8333477: Delete extra empty spaces in Makefiles
  • 938efc0: 8315437: Enable parallelism in vmTestbase/nsk/monitoring/stress/classload tests
  • 433fc2f: 8315442: Enable parallelism in vmTestbase/nsk/monitoring/stress/thread tests
  • d953de6: 8313394: Array Elements in OldObjectSample event has the incorrect description
  • bc5639a: 8325179: Race in BasicDirectoryModel.validateFileCache
  • ... and 15 more: https://git.openjdk.org/jdk17u-dev/compare/ce19e6163a388f752a9d1919ad56406865750462...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.

➡️ 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 changed the title Backport 3ccd02f14211a3384f27fba1633f9d8421378c9a 8320379: C2: Sort spilling/unspilling sequence for better ld/st merging into ldp/stp on AArch64 Jun 4, 2024
@openjdk
Copy link

openjdk bot commented Jun 4, 2024

This backport pull request has now been updated with issue from the original commit.

@pengxiaolong pengxiaolong marked this pull request as ready for review June 5, 2024 18:57
@openjdk
Copy link

openjdk bot commented Jun 5, 2024

⚠️ @pengxiaolong This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 5, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 5, 2024

Webrevs

@pengxiaolong
Copy link
Contributor Author

/approval request Backport to jdk17 to improve performance on AArch64, I have verified the the code by running all the tests, few failures not related to this PR(details in PR); Applies cleanly. Risk should be low, JDK-8320379 was merged over 6 months ago w/o known issue/bug so far.

@openjdk
Copy link

openjdk bot commented Jun 7, 2024

@pengxiaolong
8320379: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 7, 2024
@pengxiaolong
Copy link
Contributor Author

Thanks for the review! I'll start to integrate.

@pengxiaolong
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 13, 2024
@openjdk
Copy link

openjdk bot commented Jun 13, 2024

@pengxiaolong
Your change (at version 7695d7a) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 13, 2024

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

  • b46208d: 8333716: Shenandoah: Check for disarmed method before taking the nmethod lock
  • 9056b3b: 8307193: Several Swing jtreg tests use class.forName on L&F classes
  • 257d5ef: 8316240: Open source several add/remove MenuBar manual tests
  • 8c80c8f: 8280392: java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java failed with "RuntimeException: Test failed."
  • f9c11cb: 8324668: JDWP process management needs more efficient file descriptor handling
  • 0a4f926: 8308184: Launching java with large number of jars in classpath with java.protocol.handler.pkgs system property set can lead to StackOverflowError
  • 08c3774: 8333477: Delete extra empty spaces in Makefiles
  • 938efc0: 8315437: Enable parallelism in vmTestbase/nsk/monitoring/stress/classload tests
  • 433fc2f: 8315442: Enable parallelism in vmTestbase/nsk/monitoring/stress/thread tests
  • d953de6: 8313394: Array Elements in OldObjectSample event has the incorrect description
  • ... and 16 more: https://git.openjdk.org/jdk17u-dev/compare/ce19e6163a388f752a9d1919ad56406865750462...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 13, 2024
@openjdk openjdk bot closed this Jun 13, 2024
@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 Jun 13, 2024
@openjdk
Copy link

openjdk bot commented Jun 13, 2024

@TheRealMDoerr @pengxiaolong Pushed as commit dad6c6b.

💡 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
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants