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

8334560: [PPC64]: postalloc_expand_java_dynamic_call_sched does not copy all fields #19789

Conversation

reinrich
Copy link
Member

@reinrich reinrich commented Jun 19, 2024

On PPC64 we use a special feature where C2 Mach nodes get expanded after register allocation.
This pr adds copying the field MachSafePointNode::_has_ea_local_in_scope when expanding MachCallDynamicJavaNodes in postalloc_expand_java_dynamic_call_sched.

It adds also a test case that fails without the fix.

The fix passed our CI testing: JTReg tests: tier1-4 of hotspot and jdk. All of Langtools and jaxp. Renaissance Suite and SAP specific tests.
Testing was done with fastdebug and release builds on the main platforms and also on Linux/PPC64le and AIX.


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-8334560: [PPC64]: postalloc_expand_java_dynamic_call_sched does not copy all fields (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19789

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 19, 2024

👋 Welcome back rrich! 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 19, 2024

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

8334560: [PPC64]: postalloc_expand_java_dynamic_call_sched does not copy all fields

Reviewed-by: mbaesken, mdoerr

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

  • a4582a8: 8334166: Enable binary check
  • 7baddc2: 8334339: Test java/nio/file/attribute/BasicFileAttributeView/CreationTime.java fails on alinux3
  • eb110bd: 8334180: NMT gtests introduced with 8312132 should be labeled as NMT
  • 652784c: 8334392: Switch RNG in NMT's treap
  • 72ca7ba: 8334708: FFM: two javadoc problems
  • 7e55ed3: 8333748: javap crash - Fatal error: Unmatched bit position 0x2 for location CLASS
  • 1ff5acd: 8332099: since-checker - Add @ since to package-info in jdk.jsobject
  • 689cee3: 8334509: Cancelling PageDialog does not return the same PageFormat object
  • 8e1d2b0: 8334441: Mark tests in jdk_security_infra group as manual
  • 93d9802: 8334715: [riscv] Mixed use of tab and whitespace in riscv.ad
  • ... and 47 more: https://git.openjdk.org/jdk/compare/fa401f37dffe7bde27e562065dfd24381d5237cc...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
Copy link

openjdk bot commented Jun 19, 2024

@reinrich 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 Jun 19, 2024
@reinrich reinrich force-pushed the copy_sfpt_field_in_postalloc_expand_java_dynamic_call_sched branch from aa16d29 to ae72907 Compare June 20, 2024 14:09
@reinrich reinrich marked this pull request as ready for review June 21, 2024 09:18
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 21, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 21, 2024

Webrevs

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

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

Thanks for fixing it! I think we should also backport it.
Ok, the new test is a new variant of EARelockingSimpleWithAccessInOtherThread, but with a dynamic call. LGTM.

@reinrich
Copy link
Member Author

Thanks for the reviews!
/integrate

@openjdk
Copy link

openjdk bot commented Jun 24, 2024

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

  • 863b2a9: 8329994: Zap alignment padding bits for ArrayOops in non-release builds
  • a4582a8: 8334166: Enable binary check
  • 7baddc2: 8334339: Test java/nio/file/attribute/BasicFileAttributeView/CreationTime.java fails on alinux3
  • eb110bd: 8334180: NMT gtests introduced with 8312132 should be labeled as NMT
  • 652784c: 8334392: Switch RNG in NMT's treap
  • 72ca7ba: 8334708: FFM: two javadoc problems
  • 7e55ed3: 8333748: javap crash - Fatal error: Unmatched bit position 0x2 for location CLASS
  • 1ff5acd: 8332099: since-checker - Add @ since to package-info in jdk.jsobject
  • 689cee3: 8334509: Cancelling PageDialog does not return the same PageFormat object
  • 8e1d2b0: 8334441: Mark tests in jdk_security_infra group as manual
  • ... and 48 more: https://git.openjdk.org/jdk/compare/fa401f37dffe7bde27e562065dfd24381d5237cc...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 24, 2024

@reinrich Pushed as commit 13dce29.

💡 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
Development

Successfully merging this pull request may close these issues.

3 participants