Skip to content

Conversation

@backwaterred
Copy link
Contributor

@backwaterred backwaterred commented Dec 7, 2022

This small change adds an import to the generated ad_ppc.cpp file to allow it to find Contiuations::enabled, and sets VMContinuations to false on 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-8298225: [AIX] Disable PPC64LE continuations on AIX

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11550

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 7, 2022

👋 Welcome back tsteele! A progress list of the required criteria for merging this PR into pr/11546 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 Dec 7, 2022
@openjdk
Copy link

openjdk bot commented Dec 7, 2022

@backwaterred 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 Dec 7, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 7, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/11546 to master December 7, 2022 16:32
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout build/aix/continuation-enabled
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

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.

Mainline will get forked today. Please create a new PR in the JDK 20 stabilization
repository once it's available. This one get get closed afterwards.

AD.addInclude(AD._CPP_file, "opto/regalloc.hpp");
AD.addInclude(AD._CPP_file, "opto/regmask.hpp");
AD.addInclude(AD._CPP_file, "opto/runtime.hpp");
AD.addInclude(AD._CPP_file, "runtime/continuation.hpp");
Copy link
Contributor

Choose a reason for hiding this comment

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

This adds it for all platforms. Isn't it sufficient to add it in source %{ section of the ad file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried that first, but may have done so incorrectly. I am trying again.

@TheRealMDoerr
Copy link
Contributor

https://github.com/openjdk/jdk20 is now open for P3 bug fixes. (They will get merged into this repo after some time.)

@backwaterred
Copy link
Contributor Author

https://github.com/openjdk/jdk20 is now open for P3 bug fixes. (They will get merged into this repo after some time.)

Thanks. I am closing this PR, and will re-open one on jdk20 after learning if the ppc.ad modification is feasible. The build is looking good so far, so I suspect it was my error that kept it from working the first time.

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 rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

2 participants