8254827: JVMCI: Enable it for Windows+AArch64 #307

rnkovacs · 2021-09-01T12:59:03Z

Changes are almost identical to the original commit, only that JVMCI and Graal are enabled in hotspot.m4 instead of jvm-features.m4.

Depends on #301.

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-8254827: JVMCI: Enable it for Windows+AArch64

Reviewers

Andrew Haley (@theRealAph - Reviewer)

Contributors

Bernhard Urban-Forster <burban@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 307

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

Using diff file

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

bridgekeeper · 2021-09-01T12:59:50Z

👋 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 · 2021-09-01T13:00:51Z

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

rnkovacs · 2021-09-01T13:01:46Z

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

openjdk · 2021-09-01T13:03:39Z

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

mlbridge · 2021-09-01T13:09:00Z

Webrevs

theRealAph

This patch seems also to include a great many non-JVMCI changes.

rnkovacs · 2021-10-05T16:39:18Z

Forgot to rebase after the recent changes - sorry about that. Could you please check again?

bridgekeeper · 2021-11-02T18:15:01Z

@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 · 2021-11-26T21:50:50Z

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 · 2021-11-26T21:52:11Z

@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 8254827-jvmci
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

rnkovacs · 2021-11-30T23:52:30Z

Rebased.

lewurm · 2021-12-13T08:13:44Z

@theRealAph since the dependencies are resolved for this, could you have another look? Thank you

theRealAph · 2021-12-13T09:45:45Z

@theRealAph since the dependencies are resolved for this, could you have another look? Thank you

Sure, but you have to address review comments.

lewurm · 2021-12-13T14:49:29Z

@theRealAph since the dependencies are resolved for this, could you have another look? Thank you

Sure, but you have to address review comments.

I think @rnkovacs addressed it in this comment: #307 (comment)

theRealAph · 2021-10-06T08:14:03Z

...es/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java

        RegisterArray allRegisters = arch.getAvailableValueRegisters();
-        Register[] registers = new Register[allRegisters.size() - reservedRegisters.size() - (reserveForHeapBase ? 1 : 0)];
+        Register[] registers = new Register[allRegisters.size() - reservedRegisters.size() - (reserveForHeapBase ? 1 : 0) - (!canUsePlatformRegister ? 1 : 0)];


This is confusing and complicated. If you set platformRegister to be either r18 or Register.None depending on the OS, you don't need a separate boolean canUsePlatformRegister.

I agree, it doesn't read nice. However the code around the definition of platformRegister doesn't know which platform we are dealing with. We could potentially pass down the config object via the constructor... or use the boolean flag as proposed here. Do you think it's worth changing it? I'm mostly worried about diverging from tip.

OK, I see. Let it stand.

theRealAph · 2021-12-14T10:15:44Z

@theRealAph since the dependencies are resolved for this, could you have another look? Thank you

Sure, but you have to address review comments.

I think @rnkovacs addressed it in this comment: #307 (comment)

Argh! My review comment was stuck in the "pending" queue.

openjdk · 2021-12-15T15:59:54Z

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

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

8254827: JVMCI: Enable it for Windows+AArch64

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

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

ec89f1b: 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily
b07b90f: 8278309: [windows] use of uninitialized OSThread::_state
86c2995: 8202142: jfr/event/io/TestInstrumentation is unstable
4b68145: Merge
d665a4e: 8277529: SIGSEGV in C2 CompilerThread Node::rematerialize() compiling Packet::readUnsignedTrint
90c933e: 8207793: [TESTBUG] runtime/Metaspace/FragmentMetaspace.java fails: heap needs to be increased
9363d55: 8211170: AArch64: Warnings in C1 and template interpreter
c94151b: 8273575: memory leak in appendBootClassPath(), paths must be deallocated
ba1a0e8: 8266187: Memory leak in appendBootClassPath()
c8c546b: 8240904: Screen flashes on test failures when running tests from make
... and 34 more: https://git.openjdk.java.net/jdk11u-dev/compare/596816e1a927c404e70d0d563bd52d6037bba9c0...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.

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 (@theRealAph) 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).

rnkovacs · 2021-12-15T17:41:07Z

Thank you both. I tagged the JBS issue.

rnkovacs · 2021-12-20T20:41:14Z

Thank you @GoeLin.

/integrate

openjdk · 2021-12-20T20:42:39Z

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

VladimirKempik · 2021-12-27T07:37:49Z

/sponsor

openjdk · 2021-12-27T07:38:50Z

Going to push as commit 994276c.
Since your change was applied there have been 52 commits pushed to the master branch:

8989823: 8276314: [JVMCI] check alignment of call displacement during code installation
fdf21b6: 8265150: AsyncGetCallTrace crashes on ResourceMark
2893731: 8276177: nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption failed with "assert(def_ik->is_being_redefined()) failed: should be being redefined to get here"
cd8ea37: 8273638: javax/swing/JTable/4235420/bug4235420.java fails in GTK L&F
fc54784: 8258554: javax/swing/JTable/4235420/bug4235420.java fails in GTK L&F
bf7c965: 8277385: Zero: Enable CompactStrings support
bd97b56: 8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx
d3c2dc0: 8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx
ec89f1b: 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily
b07b90f: 8278309: [windows] use of uninitialized OSThread::_state
... and 42 more: https://git.openjdk.java.net/jdk11u-dev/compare/596816e1a927c404e70d0d563bd52d6037bba9c0...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-12-27T07:39:07Z

@VladimirKempik @rnkovacs Pushed as commit 994276c.

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

rnkovacs · 2021-12-29T19:32:05Z

Thank you @VladimirKempik!

openjdk bot changed the title ~~Backport 88ee973334e6a155719bd2486da73567d59a7f1e~~ 8254827: JVMCI: Enable it for Windows+AArch64 Sep 1, 2021

openjdk bot added the backport label Sep 1, 2021

rnkovacs marked this pull request as ready for review September 1, 2021 13:02

rnkovacs mentioned this pull request Sep 1, 2021

JDK-8253947: Implementation: JEP 388: Windows AArch64 Support #222

Closed

3 tasks

openjdk bot added the rfr Pull request is ready for review label Sep 1, 2021

openjdk-notifier bot force-pushed the pr/301 branch from f7f50ab to 142c38d Compare October 4, 2021 22:36

rnkovacs mentioned this pull request Oct 4, 2021

8248238: Implementation: JEP 388: Windows AArch64 Support #301

Closed

3 tasks

theRealAph reviewed Oct 5, 2021

View reviewed changes

openjdk-notifier bot force-pushed the pr/301 branch from 142c38d to bd1adc8 Compare October 5, 2021 16:30

rnkovacs force-pushed the 8254827-jvmci branch from fadd5b9 to fd1e620 Compare October 5, 2021 16:37

openjdk-notifier bot force-pushed the pr/301 branch 2 times, most recently from 7ae8001 to 609ad26 Compare October 19, 2021 04:57

openjdk-notifier bot force-pushed the pr/301 branch from 609ad26 to 6700588 Compare November 1, 2021 19:49

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 bot changed the base branch from pr/301 to master November 26, 2021 21:50

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Nov 26, 2021

Backport 88ee973

3c30abb

rnkovacs force-pushed the 8254827-jvmci branch from fd1e620 to 3c30abb Compare November 30, 2021 23:51

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Nov 30, 2021

theRealAph reviewed Dec 14, 2021

View reviewed changes

theRealAph approved these changes Dec 15, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 15, 2021

openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 20, 2021

openjdk bot added the integrated Pull request has been integrated label Dec 27, 2021

openjdk bot closed this Dec 27, 2021

openjdk bot 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 Dec 27, 2021

8254827: JVMCI: Enable it for Windows+AArch64 #307

8254827: JVMCI: Enable it for Windows+AArch64 #307

Uh oh!

Conversation

rnkovacs commented Sep 1, 2021 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Contributors

Reviewing

Uh oh!

bridgekeeper bot commented Sep 1, 2021

Uh oh!

openjdk bot commented Sep 1, 2021

Uh oh!

rnkovacs commented Sep 1, 2021

Uh oh!

openjdk bot commented Sep 1, 2021

Uh oh!

mlbridge bot commented Sep 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

theRealAph left a comment

Choose a reason for hiding this comment

Uh oh!

rnkovacs commented Oct 5, 2021

Uh oh!

bridgekeeper bot commented Nov 2, 2021

Uh oh!

openjdk-notifier bot commented Nov 26, 2021

Uh oh!

openjdk bot commented Nov 26, 2021

Uh oh!

rnkovacs commented Nov 30, 2021

Uh oh!

lewurm commented Dec 13, 2021

Uh oh!

theRealAph commented Dec 13, 2021

Uh oh!

lewurm commented Dec 13, 2021

Uh oh!

theRealAph Oct 6, 2021

Choose a reason for hiding this comment

Uh oh!

lewurm Dec 15, 2021

Choose a reason for hiding this comment

Uh oh!

theRealAph Dec 15, 2021

Choose a reason for hiding this comment

Uh oh!

theRealAph commented Dec 14, 2021

Uh oh!

openjdk bot commented Dec 15, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rnkovacs commented Dec 15, 2021

Uh oh!

rnkovacs commented Dec 20, 2021

Uh oh!

openjdk bot commented Dec 20, 2021

Uh oh!

VladimirKempik commented Dec 27, 2021

Uh oh!

openjdk bot commented Dec 27, 2021

Uh oh!

openjdk bot commented Dec 27, 2021

Uh oh!

rnkovacs commented Dec 29, 2021

Uh oh!

Uh oh!

rnkovacs commented Sep 1, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 1, 2021 •

edited

Loading

openjdk bot commented Dec 15, 2021 •

edited

Loading