Add ARM64/aarch64 support #397

dennisameling · 2022-06-24T18:30:06Z

Leverages the x64 Git for Windows SDK but sets MSYSTEM to CLANGARM64 which is needed to use the native ARM64 clang compiler.

Used in git-for-windows/git#3916 - successful CI run: https://github.com/dennisameling/git/actions/runs/3073573453/jobs/4965793895

dscho

Looks good, but should we not ask pacman to install clang in that aarch64 case, too, at least as long as msys=false?

main.ts

dennisameling · 2022-09-17T14:12:54Z

Looks good, but should we not ask pacman to install clang in that aarch64 case, too, at least as long as msys=false?

I previously did that part in my git-for-windows/git PR, but I agree it makes sense to do it in this GH Action instead. Have just set that up, as well as some cleanup logic to fix #398.

Here's a run that I did on my Surface Pro X with a ~36Mbps download connection: https://github.com/dennisameling/git/actions/runs/3073573453/jobs/4965793895 - took 13m23s
Here's a run that I did on an Azure VM with Windows 11 (Standard D8pls v5 (8 vcpus, 16 GiB memory)): https://github.com/dennisameling/git/actions/runs/3073659904/jobs/4965952821 - took 9m31s

dscho · 2022-09-17T21:46:03Z

Here's a run that I did on an Azure VM with Windows 11 (Standard D8pls v5 (8 vcpus, 16 GiB memory)): https://github.com/dennisameling/git/actions/runs/3073659904/jobs/4965952821 - took 9m31s

It is really nice that these VMs are decently fast. Do you have an ARM (pun intended?) template to set up a new Azure VM that acts as a GitHub Actions build agent?

dennisameling · 2022-09-18T16:11:38Z

It is really nice that these VMs are decently fast. Do you have an ARM (pun intended?) template to set up a new Azure VM that acts as a GitHub Actions build agent?

Haha, that abbreviation is very confusing indeed. I used a VM with 8 cores, but there's VMs with up to 64 cores if you need even more performance. I installed the x64 version of Git for Windows on the machine, so once we have a first native ARM64 version in place, the clone/preparation step will most likely be quite a bit faster.

Good call regarding the ARM template. I just created one. Took some effort to get it right, but it works now! It comes with a post-deployment script that:

Enables Windows Developer Mode (for symlinks)
Adds a Windows Defender exclusion for the entire C:\ drive
Installs Git for Windows (x64)
Installs and configures the GitHub Actions runner as a Windows service

Here's a fresh run (8m25s) with the latest changes from this PR, ran on a VM that I deployed using the ARM template above 🚀 https://github.com/dennisameling/git/actions/runs/3077779847/jobs/4972879838

Think we're good to go now with this PR, right?

dscho

One last concern, as the test run shows that the post action does add a full minute...

main.ts

dennisameling · 2022-09-24T08:36:06Z

I just went ahead and moved the cleanup logic into a completely separate PR to make things easier to review.

Another successful run of just the ARM64 logic: https://github.com/dennisameling/git/actions/runs/3117529361/jobs/5056244750

dennisameling · 2022-09-25T20:07:09Z

main.ts

+      // Some binaries aren't available yet in the /clangarm64/bin folder, but Windows 11 ARM64
+      // has support for x64 emulation, so let's add /mingw64/bin as a fallback.
+      ...(msystem === 'CLANGARM64' ? ['/mingw64/bin'] : []),


I was specifically missing git.exe and friends. This fallback will no longer be needed once a first version of Git for Windows ARM64 has been released and this binary becomes available in the /clangarm64 folder (assuming that ARM64 will get its own SDK at some point)

dscho · 2022-09-27T20:56:56Z

@dennisameling I adjusted this PR branch a bit, could you have a look (and verify that it still works as intended)?

dennisameling

Thanks for the updates and for adding the commit description! Just left one minor comment/question. This basic test is working fine, thank you 👍🏼

dennisameling · 2022-09-28T08:15:16Z

main.ts

+    if (architecture === 'aarch64') {
+      // Some binaries aren't available yet in the /clangarm64/bin folder, but Windows 11 ARM64
+      // has support for x64 emulation, so let's add /mingw64/bin as a fallback.
+      binPaths.splice(binPaths.length - 2, 0, '/mingw64/bin')


This results in the following array:

[ '/usr/bin/core_perl', '/mingw64/bin', '/usr/bin', '/clangarm64/bin' ]

... which will eventually end up in the path as follows:

/clangarm64/bin:/usr/bin:/mingw64/bin:/usr/bin/core_perl:${PATH}

Is it intended to put /usr/bin before /mingw64/bin in this case? I always thought it's preferred to put /mingw64/bin first and fallback to /usr/bin only if really needed, but I lack any clear background info/reasoning on that. No strong preference on my side for this one - just curious!

Oh no, this is an off-by-one... 😱

@dennisameling could I bother you to test again?

@dscho thanks! I also tested with makepkg-git instead of full this time, and with cleanup: true. Everything is working as expected 🎉 https://github.com/dennisameling/git/actions/runs/3159629157/jobs/5143099298

This does not install the Git for Windows/ARM64 SDK, of course, because such a thing does not exist. However, it _does_ install the Git for Windows SDK targeting x86_64 (which Windows/ARM64 11 can use) and then adds MINGW versions of `clang` targeting aarch64. Signed-off-by: Dennis Ameling <dennis@dennisameling.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

dscho · 2022-10-04T07:41:12Z

@dennisameling thank you so much for your tireless work. This is now live, as v1.5.0.

dennisameling requested a review from dscho as a code owner June 24, 2022 18:30

dennisameling mentioned this pull request Jun 24, 2022

Add support for CLANGARM64 target git-for-windows/git#3916

Merged

dscho reviewed Jun 24, 2022

View reviewed changes

dennisameling force-pushed the windows-arm64 branch from 0187206 to 8bbc989 Compare September 17, 2022 12:21

dennisameling changed the title ~~Add basic ARM64/aarch64 support~~ Add basic ARM64/aarch64 support and cleanup logic Sep 17, 2022

dennisameling force-pushed the windows-arm64 branch 3 times, most recently from bce7786 to 2737d10 Compare September 17, 2022 13:20

dennisameling changed the title ~~Add basic ARM64/aarch64 support and cleanup logic~~ Add ARM64/aarch64 support and cleanup logic Sep 17, 2022

dennisameling commented Sep 17, 2022

View reviewed changes

main.ts Outdated Show resolved Hide resolved

dennisameling commented Sep 17, 2022

View reviewed changes

main.ts Show resolved Hide resolved

dennisameling force-pushed the windows-arm64 branch 2 times, most recently from 6478010 to 88fd47f Compare September 18, 2022 09:47

dscho reviewed Sep 22, 2022

View reviewed changes

main.ts Outdated Show resolved Hide resolved

main.ts Outdated Show resolved Hide resolved

dennisameling force-pushed the windows-arm64 branch from 88fd47f to 7ac9460 Compare September 24, 2022 07:37

dennisameling changed the title ~~Add ARM64/aarch64 support and cleanup logic~~ Add ARM64/aarch64 support Sep 24, 2022

dennisameling requested a review from dscho September 24, 2022 08:36

dennisameling mentioned this pull request Sep 24, 2022

mingw-w64-git: Add ARM64 support git-for-windows/MINGW-packages#56

Merged

dennisameling force-pushed the windows-arm64 branch from 7ac9460 to 3497754 Compare September 24, 2022 21:45

dennisameling mentioned this pull request Sep 24, 2022

portable + installer: add CLANGARM64 support git-for-windows/build-extra#437

Merged

dennisameling force-pushed the windows-arm64 branch from 3497754 to ad66c9d Compare September 25, 2022 11:08

dennisameling mentioned this pull request Sep 25, 2022

Tracking issue for Windows ARM64 support git-for-windows/git#3107

Closed

dennisameling force-pushed the windows-arm64 branch 2 times, most recently from 0781689 to ef3a752 Compare September 25, 2022 20:06

dennisameling commented Sep 25, 2022

View reviewed changes

dscho force-pushed the windows-arm64 branch from ef3a752 to a4ceb1b Compare September 27, 2022 20:26

dennisameling commented Sep 28, 2022

View reviewed changes

dscho force-pushed the windows-arm64 branch from a4ceb1b to 97cefe9 Compare September 30, 2022 12:04

dscho added 2 commits October 4, 2022 09:23

npm run build && npm run package

3072056

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

dscho force-pushed the windows-arm64 branch from 97cefe9 to 3072056 Compare October 4, 2022 07:24

dscho merged commit 9980f36 into git-for-windows:main Oct 4, 2022

dennisameling deleted the windows-arm64 branch October 4, 2022 08:10

Add ARM64/aarch64 support #397

Add ARM64/aarch64 support #397

Uh oh!

Conversation

dennisameling commented Jun 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dscho left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dennisameling commented Sep 17, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dscho commented Sep 17, 2022

Uh oh!

dennisameling commented Sep 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dscho left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dennisameling commented Sep 24, 2022

Uh oh!

dennisameling Sep 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dscho commented Sep 27, 2022

Uh oh!

dennisameling left a comment

Choose a reason for hiding this comment

Uh oh!

dennisameling Sep 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dscho Sep 30, 2022

Choose a reason for hiding this comment

Uh oh!

dscho Sep 30, 2022

Choose a reason for hiding this comment

Uh oh!

dennisameling Sep 30, 2022

Choose a reason for hiding this comment

Uh oh!

dscho commented Oct 4, 2022

Uh oh!

Uh oh!

dennisameling commented Jun 24, 2022 •

edited

Loading

dennisameling commented Sep 17, 2022 •

edited

Loading

dennisameling commented Sep 18, 2022 •

edited

Loading

dennisameling Sep 25, 2022 •

edited

Loading

dennisameling Sep 28, 2022 •

edited

Loading