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

8252114: Windows-AArch64: Enable and test ZGC and ShenandoahGC #304

Closed
wants to merge 1 commit into from

Conversation

rnkovacs
Copy link
Contributor

@rnkovacs rnkovacs commented Aug 31, 2021

The original commit and the backport don't have a lot to do with each other quite honestly, but they both fit under the JBS issue. The original commit enabled ZGC for Windows/AArch64 (Shenandoah was already enabled on all AArch64 platforms), while this one enables Shenandoah.

Depends on #301.

This is part of the Windows/AArch64 port.


Progress

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

Issue

  • JDK-8252114: Windows-AArch64: Enable and test ZGC and ShenandoahGC

Reviewers

Contributors

  • Bernhard Urban-Forster <burban@openjdk.org>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/304/head:pull/304
$ git checkout pull/304

Update a local copy of the PR:
$ git checkout pull/304
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/304/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 304

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/304.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 31, 2021

👋 Welcome back rnkovacs! A progress list of the required criteria for merging this PR into pr/301 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 changed the title Backport 96f722cf63ae0e115612d816aa339d38074d3ade 8252114: Windows-AArch64: Enable and test ZGC and ShenandoahGC Aug 31, 2021
@openjdk
Copy link

openjdk bot commented Aug 31, 2021

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

@openjdk openjdk bot added the backport label Aug 31, 2021
@rnkovacs
Copy link
Contributor Author

/contributor add Bernhard Urban-Forster burban@openjdk.org

@openjdk
Copy link

openjdk bot commented Aug 31, 2021

@rnkovacs
Contributor Bernhard Urban-Forster <burban@openjdk.org> successfully added.

@rnkovacs rnkovacs marked this pull request as ready for review August 31, 2021 13:38
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 31, 2021
@mlbridge
Copy link

mlbridge bot commented Aug 31, 2021

Webrevs

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 a question. Upstream version checks OPENJDK_TARGET_CPU directly. Why not to do the same here? The only reason off the top of my head is to avoid accidentally enabling macos-aarch64, but that port is not yet in 11u, and Shenandoah is supposed to work there anyway.

@rnkovacs rnkovacs force-pushed the 8252114-enable-shenandoah branch from e70c0d8 to 2836aff Compare August 31, 2021 14:19
@rnkovacs
Copy link
Contributor Author

I have a question. Upstream version checks OPENJDK_TARGET_CPU directly. Why not to do the same here? The only reason off the top of my head is to avoid accidentally enabling macos-aarch64, but that port is not yet in 11u, and Shenandoah is supposed to work there anyway.

I thought about it, but wasn't sure if there are any risks I'm not aware of. Thanks - updated.

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.

Thanks! Looks good.

@rnkovacs
Copy link
Contributor Author

rnkovacs commented Oct 5, 2021

Rebased on top of the latest changes.

@rnkovacs
Copy link
Contributor Author

rnkovacs commented Oct 5, 2021

Also, tagged.

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 3, 2021

@rnkovacs This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk-notifier openjdk-notifier bot force-pushed the pr/301 branch 2 times, most recently from 512177c to 697c339 Compare November 9, 2021 23:10
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/301 to master November 26, 2021 21:50
@openjdk-notifier
Copy link

The dependent pull request 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 8248238-win-aarch64
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Nov 26, 2021

@rnkovacs this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8252114-enable-shenandoah
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Nov 26, 2021
@GoeLin
Copy link
Member

GoeLin commented Nov 29, 2021

Hi Reka,
if this is targeted to 11.0.14, please rebase it. You need to push before 18:00 CET on 30.11. to get it into 11.0.14.
Best regards,
Goetz.

@rnkovacs rnkovacs force-pushed the 8252114-enable-shenandoah branch from 9765b13 to fd1e0dc Compare November 29, 2021 17:11
@openjdk
Copy link

openjdk bot commented Nov 29, 2021

@rnkovacs This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8252114: Windows-AArch64: Enable and test ZGC and ShenandoahGC

Co-authored-by: Bernhard Urban-Forster <burban@openjdk.org>
Reviewed-by: shade

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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. Possible candidates are the reviewers of this PR (@shipilev) but any other Committer may sponsor as well.

➡️ 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 added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Nov 29, 2021
@rnkovacs
Copy link
Contributor Author

Thank you for the reminder, @GoeLin. Could you or @shipilev please sponsor the change?

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 29, 2021
@openjdk
Copy link

openjdk bot commented Nov 29, 2021

@rnkovacs
Your change (at version fd1e0dc) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 29, 2021

Going to push as commit d92b103.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 5d99c71: 8255264: Support for identifying the full range of IPv4 localhost addresses on Windows

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 29, 2021
@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 sponsor Pull request is ready to be sponsored labels Nov 29, 2021
@openjdk
Copy link

openjdk bot commented Nov 29, 2021

@RealCLanger @rnkovacs Pushed as commit d92b103.

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

Successfully merging this pull request may close these issues.

4 participants