win-arm64-vulkan build

Author: cmdr2

cmake/arm64-windows-llvm.cmake

@@ -0,0 +1,13 @@
+set( CMAKE_SYSTEM_NAME Windows )
+set( CMAKE_SYSTEM_PROCESSOR arm64 )
+
+set( target arm64-pc-windows-msvc )
+
+set( CMAKE_C_COMPILER_TARGET   ${target} )
+set( CMAKE_CXX_COMPILER_TARGET ${target} )
+
+set( arch_c_flags "-march=armv8.7-a -fvectorize -ffp-model=fast -fno-finite-math-only" )
+set( warn_c_flags "-Wno-format -Wno-unused-variable -Wno-unused-function -Wno-gnu-zero-variadic-macro-arguments" )
+
+set( CMAKE_C_FLAGS_INIT   "${arch_c_flags} ${warn_c_flags}" )
+set( CMAKE_CXX_FLAGS_INIT "${arch_c_flags} ${warn_c_flags}" )

cmake/x64-windows-llvm.cmake

@@ -0,0 +1,2 @@
+set( CMAKE_SYSTEM_NAME Windows )
+set( CMAKE_SYSTEM_PROCESSOR x86_64 )

scripts/build/common.py

@@ -210,20 +210,22 @@ def build_project(
     if not variants:
         variants = [{"name": "any", "compile_flags": []}]
 
+    # Get target for "any" variant to use for additional files
+    target_any = get_target(get_platform_name_func, "any", arch)
+
     # Get environment for cmake
-    env = get_env_func() if get_env_func else None
+    env = get_env_func(target_any) if get_env_func else None
 
     # Build for each variant
     for variant in variants:
         variant_name = variant["name"]
         variant_compile_flags = variant.get("compile_flags", [])
 
         target = get_target(get_platform_name_func, variant_name, arch)
-        target_any = get_target(get_platform_name_func, "any", arch)
         project_root, build_dir = prepare_build(target, check_func)
 
         # Combine base compile flags with variant-specific flags
-        base_options = get_compile_flags_func()
+        base_options = get_compile_flags_func(target_any)
         options = base_options + variant_compile_flags
 
         # Resolve additional files if available

scripts/build/platform_cpu.py

@@ -4,7 +4,7 @@ def check_environment():
     return True
 
 
-def get_compile_flags():
+def get_compile_flags(target_any):
     """Get compile flags for CPU."""
     return []
 

scripts/build/platform_cuda.py

@@ -19,7 +19,7 @@ def check_environment():
     return False
 
 
-def get_compile_flags():
+def get_compile_flags(target_any):
     """Get compile flags for CUDA."""
     return ["-DSD_CUDA=ON"]
 

scripts/build/platform_metal.py

@@ -10,7 +10,7 @@ def check_environment():
     return False
 
 
-def get_compile_flags():
+def get_compile_flags(target_any):
     """Get compile flags for Metal."""
     return ["-DSD_METAL=ON", "-DGGML_ACCELERATE=ON", "-DGGML_AVX2=ON", "-DCMAKE_OSX_ARCHITECTURES=arm64"]
 

scripts/build/platform_vulkan.py

@@ -1,5 +1,5 @@
 import os
-import platform
+import re
 import subprocess
 
 
@@ -16,11 +16,36 @@ def check_environment():
     return False
 
 
-def get_compile_flags():
+def get_compile_flags(target_any):
     """Get compile flags for Vulkan."""
-    return ["-DSD_VULKAN=ON"]
+    flags = ["-DSD_VULKAN=ON"]
+
+    if target_any.startswith("win-arm64"):
+        vulkan_sdk_path = os.environ["VULKAN_SDK"].replace("\\", "/")
+
+        flags.append("-G Ninja")
+        flags.append("-DCMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake")
+        flags.append(f"-DVulkan_LIBRARY={vulkan_sdk_path}/Lib-ARM64/vulkan-1.lib")
+
+    return flags
 
 
 def get_platform_name():
     """Get platform name for Vulkan."""
     return "vulkan"
+
+
+def get_env(target_any):
+    """Get environment variables for Vulkan build."""
+    if target_any.startswith("win-arm64"):
+        env = os.environ.copy()
+
+        print(env["PATH"])
+        # Prevent ggml-vulkan's cmake from picking up MSVC tools
+        env["PATH"] = re.sub(r"Tools\\MSVC\\[\d\.]+\\bin\\Hostx64\\x64", r"Tools\\Llvm\\x64\\bin", env["PATH"])
+
+        print("env", env["PATH"])
+
+        return env
+
+    return None

scripts/build_all.py

@@ -6,17 +6,18 @@
 
 BUILD_PLATFORMS = {
     "Windows": [
-        "cpu",
-        "cuda",
-        "vulkan",
+        ("cpu", "x64"),
+        ("cuda", "x64"),
+        ("vulkan", "x64"),
+        ("vulkan", "arm64"),
     ],
     "Linux": [
-        "cpu",
-        "cuda",
-        "vulkan",
+        ("cpu", "x64"),
+        ("cuda", "x64"),
+        ("vulkan", "x64"),
     ],
     "Darwin": [
-        "metal",
+        ("metal", "arm64"),
     ],
 }
 
@@ -26,8 +27,8 @@
 
 
 def main():
-    for platform_name in platforms:
-        cmd = [sys.executable, "-m", "scripts.build", "--platform", platform_name]
+    for platform_name, arch in platforms:
+        cmd = [sys.executable, "-m", "scripts.build", "--platform", platform_name, "--arch", arch]
 
         print(f"Running build script: {cmd}")
         result = subprocess.run(cmd)