Merge pull request #13879 from ziglang/ci-add-aarch64-windows

CI: add aarch64-windows coverage

Author: andrewrk

.github/workflows/ci.yaml

@@ -39,7 +39,7 @@ jobs:
         run: sh ci/aarch64-linux-release.sh
   x86_64-macos:
     runs-on: "macos-11"
-    env: 
+    env:
       ARCH: "x86_64"
     steps:
       - name: Checkout
@@ -48,7 +48,7 @@ jobs:
         run: ci/x86_64-macos.sh
   aarch64-macos:
     runs-on: [self-hosted, macOS, aarch64]
-    env: 
+    env:
       ARCH: "aarch64"
     steps:
       - name: Checkout
@@ -64,3 +64,12 @@ jobs:
         uses: actions/checkout@v3
       - name: Build and Test
         run: ci/x86_64-windows.ps1
+  aarch64-windows:
+    runs-on: [self-hosted, Windows, aarch64]
+    env:
+      ARCH: "aarch64"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build and Test
+        run: ci/aarch64-windows.ps1

CMakeLists.txt

@@ -120,13 +120,19 @@ string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_INCLUDE_DIR_ESCAPED "${ZIG_LIBC_
 set(ZIG_TARGET_TRIPLE "native" CACHE STRING "arch-os-abi to output binaries for")
 set(ZIG_TARGET_MCPU "native" CACHE STRING "-mcpu parameter to output binaries for")
 set(ZIG_SINGLE_THREADED off CACHE BOOL "limit the zig compiler to use only 1 thread")
+set(ZIG_AR_WORKAROUND off CACHE BOOL "append 'ar' subcommand to CMAKE_AR")
 
 if("${ZIG_TARGET_TRIPLE}" STREQUAL "native")
     set(ZIG_USE_LLVM_CONFIG ON CACHE BOOL "use llvm-config to find LLVM libraries")
 else()
     set(ZIG_USE_LLVM_CONFIG OFF CACHE BOOL "use llvm-config to find LLVM libraries")
 endif()
 
+if(ZIG_AR_WORKAROUND)
+  string(REPLACE "<CMAKE_AR>" "<CMAKE_AR> ar" CMAKE_C_ARCHIVE_CREATE ${CMAKE_C_ARCHIVE_CREATE})
+  string(REPLACE "<CMAKE_AR>" "<CMAKE_AR> ar" CMAKE_CXX_ARCHIVE_CREATE ${CMAKE_CXX_ARCHIVE_CREATE})
+endif()
+
 find_package(llvm 15)
 find_package(clang 15)
 find_package(lld 15)
@@ -702,6 +708,8 @@ if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64")
   set(HOST_TARGET_ARCH "x86_64")
 elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
   set(HOST_TARGET_ARCH "aarch64")
+elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64")
+  set(HOST_TARGET_ARCH "aarch64")
 else()
   string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" HOST_TARGET_ARCH)
 endif()

ci/aarch64-windows.ps1

@@ -0,0 +1,73 @@
+$TARGET = "$($Env:ARCH)-windows-gnu"
+$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.11.0-dev.670+f7fea080b"
+$MCPU = "baseline"
+$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"
+$PREFIX_PATH = "$(Get-Location)\..\$ZIG_LLVM_CLANG_LLD_NAME"
+$ZIG = "$PREFIX_PATH\bin\zig.exe"
+$ZIG_LIB_DIR = "$(Get-Location)\lib"
+
+if (!(Test-Path "..\$ZIG_LLVM_CLANG_LLD_NAME.zip")) {
+    Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
+    Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "..\$ZIG_LLVM_CLANG_LLD_NAME.zip"
+
+    Write-Output "Extracting..."
+    Add-Type -AssemblyName System.IO.Compression.FileSystem ;
+    [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\..\$ZIG_LLVM_CLANG_LLD_NAME.zip", "$PWD\..")
+}
+
+function CheckLastExitCode {
+    if (!$?) {
+        exit 1
+    }
+    return 0
+}
+
+# Make the `zig version` number consistent.
+# This will affect the `zig build` command below which uses `git describe`.
+git config core.abbrev 9
+git fetch --tags
+
+if ((git rev-parse --is-shallow-repository) -eq "true") {
+    git fetch --unshallow # `git describe` won't work on a shallow repo
+}
+
+Write-Output "Building from source..."
+Remove-Item -Path 'build-release' -Recurse -Force -ErrorAction Ignore
+New-Item -Path 'build-release' -ItemType Directory
+Set-Location -Path 'build-release'
+
+# CMake gives a syntax error when file paths with backward slashes are used.
+# Here, we use forward slashes only to work around this.
+& cmake .. `
+  -GNinja `
+  -DCMAKE_INSTALL_PREFIX="stage3-release" `
+  -DCMAKE_PREFIX_PATH="$($PREFIX_PATH -Replace "\\", "/")" `
+  -DCMAKE_BUILD_TYPE=Release `
+  -DCMAKE_C_COMPILER="$($ZIG -Replace "\\", "/");cc;-target;$TARGET;-mcpu=$MCPU" `
+  -DCMAKE_CXX_COMPILER="$($ZIG -Replace "\\", "/");c++;-target;$TARGET;-mcpu=$MCPU" `
+  -DCMAKE_AR="$ZIG" `
+  -DZIG_AR_WORKAROUND=ON `
+  -DZIG_TARGET_TRIPLE="$TARGET" `
+  -DZIG_TARGET_MCPU="$MCPU" `
+  -DZIG_STATIC=ON
+CheckLastExitCode
+
+ninja install
+CheckLastExitCode
+
+Write-Output "Main test suite..."
+& "stage3-release\bin\zig.exe" build test docs `
+  --zig-lib-dir "$ZIG_LIB_DIR" `
+  --search-prefix "$PREFIX_PATH" `
+  -Dstatic-llvm `
+  -Dskip-non-native `
+  -Denable-symlinks-windows
+CheckLastExitCode
+
+Write-Output "Testing Autodocs..."
+& "stage3-release\bin\zig.exe" test "..\lib\std\std.zig" `
+  --zig-lib-dir "$ZIG_LIB_DIR" `
+  -femit-docs `
+  -fno-emit-bin
+CheckLastExitCode
+

stage1/zig1.wasm

@@ -275,10 +275,20 @@ test "page aligned array on stack" {
     if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    // https://github.com/ziglang/zig/issues/13679
+
     if (builtin.zig_backend == .stage2_llvm and
-        builtin.cpu.arch == .aarch64 and
-        builtin.os.tag == .windows) return error.SkipZigTest;
+        builtin.cpu.arch == .aarch64 and builtin.os.tag == .windows)
+    {
+        // https://github.com/ziglang/zig/issues/13679
+        return error.SkipZigTest;
+    }
+
+    if (builtin.zig_backend == .stage2_c and
+        builtin.os.tag == .windows and builtin.cpu.arch == .aarch64)
+    {
+        // https://github.com/ziglang/zig/issues/13876
+        return error.SkipZigTest;
+    }
 
     // Large alignment value to make it hard to accidentally pass.
     var array align(0x1000) = [_]u8{ 1, 2, 3, 4, 5, 6, 7, 8 };

test/behavior/align.zig

@@ -1351,6 +1351,13 @@ test "cast f128 to narrower types" {
     if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
 
+    if (builtin.os.tag == .windows and builtin.cpu.arch == .aarch64 and
+        builtin.zig_backend == .stage2_c)
+    {
+        // https://github.com/ziglang/zig/issues/13876
+        return error.SkipZigTest;
+    }
+
     const S = struct {
         fn doTheTest() !void {
             var x: f128 = 1234.0;