Skip to content

8301838: PPC: continuation yield intrinsic: exception check not needed if yield succeeded #12450

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

Conversation

reinrich
Copy link
Member

@reinrich reinrich commented Feb 7, 2023

This small enhancement let's the continuation yield intrinsic return if the yield succeeded.
Doing so is ok because there will never be a pending exception if the yield succeeded.

All continuation tests succeeded.

GHA: some cross compiles failed because packages could not be downloaded. I tried to restart these but that didn't work.


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-8301838: PPC: continuation yield intrinsic: exception check not needed if yield succeeded

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12450

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 7, 2023

👋 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 Feb 7, 2023

@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 Feb 7, 2023
@reinrich reinrich marked this pull request as ready for review February 7, 2023 09:19
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 7, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 7, 2023

Webrevs

__ ld(R0, _abi0(lr), R1_SP); // Return pc
__ mtlr(R0);
__ blr();

Copy link
Contributor

Choose a reason for hiding this comment

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

This newly introduced code is an exact duplicate from below. I would prefer code reuse by treating the "L_pinned" part as "out-of-line". Instead of branching over forward_exception_entry, you could branch back to the return code. If you do so, the pop&return code below becomes obsolete.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good idea. I've done that.

@@ -1980,34 +1980,38 @@ static void gen_continuation_yield(MacroAssembler* masm,

Label L_pinned;

__ cmpdi(CCR0, R3_RET, 0);
__ cmpwi(CCR0, R3_RET, 0);
Copy link
Member Author

Choose a reason for hiding this comment

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

Since I'm at it: the call above returns int so it is better to use a 32bit compare.

Copy link
Member Author

Choose a reason for hiding this comment

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

@RealLucy please note this change.

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

LGTM now.

@openjdk
Copy link

openjdk bot commented Feb 8, 2023

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

8301838: PPC: continuation yield intrinsic: exception check not needed if yield succeeded

Reviewed-by: lucy, goetz

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

  • 4e327db: 8301499: Replace NULL with nullptr in cpu/zero
  • 0458d38: 6513512: MetalLookAndFeel.initClassDefaults does not install an entry for MetalMenuBarUI
  • f4b140b: 8296410: HttpClient throws java.io.IOException: no statuscode in response for HTTP2
  • 5d39d14: 8299970: Speed up compiler/arraycopy/TestArrayCopyConjoint.java
  • d1c87a0: 8302203: IR framework should detect non-compilable test methods early
  • 1fec6b5: 8301852: RISC-V: Optimize class atomic when order is memory_order_relaxed
  • 7c233bc: 8302114: RISC-V: Several foreign jtreg tests fail with debug build after JDK-8301818
  • 8049e59: 8301833: Add wide-ranging tests for FDLIBM porting
  • 6a44120: 8301269: Update Commons BCEL to Version 6.7.0
  • 6f9f2b5: 8301737: java/rmi/server/UnicastRemoteObject/serialFilter/FilterUROTest.java fail with -Xcomp
  • ... and 106 more: https://git.openjdk.org/jdk/compare/5962226cc33de047946aca6522f020c97d663d2f...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 Feb 8, 2023
Copy link
Member

@GoeLin GoeLin left a comment

Choose a reason for hiding this comment

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

LGTM

@reinrich
Copy link
Member Author

Thanks for the reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Feb 13, 2023

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

  • df93880: 8301942: java/net/httpclient/DigestEchoClientSSL.java fail with -Xcomp
  • 0025764: 8040793: vmTestbase/nsk/monitoring/stress/lowmem fails on calling isCollectionUsageThresholdExceeded()
  • 1f9c110: 8301958: Reduce Arrays.copyOf/-Range overheads
  • cb81073: 8300139: [AIX] Use pthreads to avoid JNI_createVM call from primordial thread
  • bbd8ae7: 8294194: [AArch64] Create intrinsics compress and expand
  • 4e327db: 8301499: Replace NULL with nullptr in cpu/zero
  • 0458d38: 6513512: MetalLookAndFeel.initClassDefaults does not install an entry for MetalMenuBarUI
  • f4b140b: 8296410: HttpClient throws java.io.IOException: no statuscode in response for HTTP2
  • 5d39d14: 8299970: Speed up compiler/arraycopy/TestArrayCopyConjoint.java
  • d1c87a0: 8302203: IR framework should detect non-compilable test methods early
  • ... and 111 more: https://git.openjdk.org/jdk/compare/5962226cc33de047946aca6522f020c97d663d2f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 13, 2023

@reinrich Pushed as commit 57aef85.

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

@reinrich reinrich deleted the 8301838_exception_check_is_redundant_if_continuation_yield_succeeds branch February 20, 2023 12:15
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