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

8255606: Enable concurrent stack processing on x86_32 platforms #945

Closed

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Oct 29, 2020


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Testing

Linux x64 Linux x86 Windows x64 macOS x64
Build ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed)

Issue

  • JDK-8255606: Enable concurrent stack processing on x86_32 platforms

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/945/head:pull/945
$ git checkout pull/945

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 29, 2020

👋 Welcome back zgu! 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 Oct 29, 2020

@zhengyu123 The following label will be automatically applied to this pull request:

  • hotspot

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 hotspot hotspot-dev@openjdk.org rfr Pull request is ready for review labels Oct 29, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 29, 2020

Webrevs

@zhengyu123
Copy link
Contributor Author

/label add hotspot-gc-dev
/label add shenandoah-dev

@openjdk openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Nov 2, 2020
@openjdk
Copy link

openjdk bot commented Nov 2, 2020

@zhengyu123
The hotspot-gc label was successfully added.

@openjdk openjdk bot added the shenandoah shenandoah-dev@openjdk.org label Nov 2, 2020
@openjdk
Copy link

openjdk bot commented Nov 2, 2020

@zhengyu123
The shenandoah label was successfully added.

@zhengyu123
Copy link
Contributor Author

/cc hotspot-gc shenandoah

@openjdk
Copy link

openjdk bot commented Nov 2, 2020

@zhengyu123 The hotspot-gc label was already applied.
The shenandoah label was already applied.

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.

I have minor comments.

@@ -653,8 +653,9 @@ void MachEpilogNode::format( PhaseRegAlloc *ra_, outputStream* st ) const {
}
st->print_cr("POPL EBP"); st->print("\t");
if (do_polling() && C->is_method_compilation()) {
st->print("TEST PollPage,EAX\t! Poll Safepoint");
st->cr(); st->print("\t");
st->print("cmpptr rsp, poll_offset[thread] \n\t"
Copy link
Member

Choose a reason for hiding this comment

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

Let's say CMPL here? I don't think we reference cmpptr in outputs here. Also, note every instruction is capitalized in x86_32.ad.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the review. Updated according to your suggestions.

@@ -930,8 +930,8 @@ void MachEpilogNode::format(PhaseRegAlloc* ra_, outputStream* st) const
st->print_cr("popq rbp");
if (do_polling() && C->is_method_compilation()) {
st->print("\t");
st->print_cr("cmpq poll_offset[r15_thread], rsp\n\t"
"ja #safepoint_stub\t"
st->print_cr("cmpptr rsp, poll_offset[r15_thread] \n\t"
Copy link
Member

Choose a reason for hiding this comment

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

Ditto, leave cmpq here.

Copy link
Contributor

@rkennke rkennke 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 to me! Thanks!

@openjdk
Copy link

openjdk bot commented Nov 3, 2020

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

8255606: Enable concurrent stack processing on x86_32 platforms

Reviewed-by: shade, rkennke, eosterlund

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

  • ca216ba: 8255810: Zero: build fails without JVMTI
  • d47336b: 8248320: Provide a unique accessible name for
  • 64a9811: 8255798: Remove dead headless code in CompileJavaModules.gmk
  • 364b0fe: 8255801: Race when building ct.sym build tools
  • f389a71: 8255737: Zero: DO_UPDATE_INSTRUCTION_COUNT should only update when relevant VM flags are set
  • 93ef009: 8255762: Shenandoah: Consolidate/streamline interpreter LRBs
  • 63461d5: 8255072: [TESTBUG] com/sun/jdi/EATests.java should not fail if expected VMOutOfMemoryException is not thrown
  • b8d4e02: 8255374: Add a dropReturn MethodHandle combinator
  • 1d0bd50: 8254758: Change G1ServiceThread to be task based
  • 9a0cf58: 8255615: Zero: demote ZeroStack::abi_stack_available guarantee to assert
  • ... and 75 more: https://git.openjdk.java.net/jdk/compare/5c520c3fdd62745deb4145061e75949e74450a3f...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 Nov 3, 2020
Copy link
Contributor

@fisk fisk 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. Nice to see one more platform support this. Hoping that eventually all platforms will support this.

@zhengyu123
Copy link
Contributor Author

Looks good. Nice to see one more platform support this. Hoping that eventually all platforms will support this.

Thanks, Erik.

@zhengyu123
Copy link
Contributor Author

/integrate

@openjdk openjdk bot closed this Nov 3, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 3, 2020
@zhengyu123 zhengyu123 deleted the JDK-8255606-conc-stack-x86_32 branch November 3, 2020 17:24
@openjdk
Copy link

openjdk bot commented Nov 3, 2020

@zhengyu123 Since your change was applied there have been 85 commits pushed to the master branch:

  • ca216ba: 8255810: Zero: build fails without JVMTI
  • d47336b: 8248320: Provide a unique accessible name for
  • 64a9811: 8255798: Remove dead headless code in CompileJavaModules.gmk
  • 364b0fe: 8255801: Race when building ct.sym build tools
  • f389a71: 8255737: Zero: DO_UPDATE_INSTRUCTION_COUNT should only update when relevant VM flags are set
  • 93ef009: 8255762: Shenandoah: Consolidate/streamline interpreter LRBs
  • 63461d5: 8255072: [TESTBUG] com/sun/jdi/EATests.java should not fail if expected VMOutOfMemoryException is not thrown
  • b8d4e02: 8255374: Add a dropReturn MethodHandle combinator
  • 1d0bd50: 8254758: Change G1ServiceThread to be task based
  • 9a0cf58: 8255615: Zero: demote ZeroStack::abi_stack_available guarantee to assert
  • ... and 75 more: https://git.openjdk.java.net/jdk/compare/5c520c3fdd62745deb4145061e75949e74450a3f...master

Your commit was automatically rebased without conflicts.

Pushed as commit 134e22a.

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

openjdk-notifier bot referenced this pull request Nov 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated shenandoah shenandoah-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

4 participants