workflows/release-binaries: Enable Windows x86 builds

.github/workflows/release-binaries-all.yml

@@ -88,10 +88,7 @@ jobs:
         # We use ubuntu-22.04 rather than the latest version to make the built
         # binaries more portable (eg functional aginast older glibc).
         runs-on:
-          - ubuntu-22.04
-          - ubuntu-22.04-arm
-          - macos-13
-          - macos-14
+          - windows-2022
 
     uses: ./.github/workflows/release-binaries.yml
     with:

.github/workflows/release-binaries-setup-stage/action.yml

@@ -30,6 +30,14 @@
       with:
         arch: amd64
 
+    # In order to avoid some errors with long paths names, we need to shorten
+    # the path names for the build.
+    - name: Shorten paths on Windows
+      if: startsWith(runner.os, 'Windows')
+      shell: pwsh
+      run: |
+        subst S: ${{ github.workspace }}
+
     - name: Set Build Prefix
       id: build-prefix
       shell: bash
@@ -37,7 +45,9 @@
         build_prefix=`pwd`
         if [ "${{ runner.os }}" = "Linux" ]; then
           sudo chown $USER:$USER /mnt/
           build_prefix=/mnt/
+        elif [ "${{ runner.os }}" = "Windows" ]; then
+          build_prefix=/s/
         fi
         echo "build-prefix=$build_prefix" >> $GITHUB_OUTPUT
 

.github/workflows/release-binaries.yml

@@ -23,6 +23,7 @@ on:
           - ubuntu-22.04-arm
           - macos-13
           - macos-14
+          - windows-2022
 
   workflow_call:
     inputs:
@@ -118,9 +119,15 @@ jobs:
         echo "ref=$ref" >> $GITHUB_OUTPUT
         echo "upload=$upload" >> $GITHUB_OUTPUT
 
+        if [ "$RUNNER_OS" = "Windows" ]; then
+          release_binary_suffix="msi"
+        else
+          release_binary_suffix="tar.xz"
+        fi
+
         release_binary_basename="LLVM-$release_version-$RUNNER_OS-$RUNNER_ARCH"
         echo "release-binary-basename=$release_binary_basename" >> $GITHUB_OUTPUT
-        echo "release-binary-filename=$release_binary_basename.tar.xz" >> $GITHUB_OUTPUT
+        echo "release-binary-filename=$release_binary_basename.$release_binary_suffix" >> $GITHUB_OUTPUT
 
         target="$RUNNER_OS-$RUNNER_ARCH"
         # The hendrikmuhs/ccache-action action does not support installing sccache
@@ -159,8 +166,8 @@ jobs:
         echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT
         echo "build-flang=$build_flang" >> $GITHUB_OUTPUT
         case "${{ inputs.runs-on }}" in
-          ubuntu-22.04*)
-            build_runs_on="depot-${{ inputs.runs-on }}-16"
+          ubuntu-22.04*|windows-2022)
+            build_runs_on="depot-${{ inputs.runs-on }}-64"
             test_runs_on=$build_runs_on
             ;;
           macos-13)
@@ -229,6 +236,12 @@ jobs:
       id: setup-stage
       uses: ./workflows-main/.github/workflows/release-binaries-setup-stage
 
+    # We will use Wix to generate the installer on Windows, because this supports
+    # installers > 2GB.
+    - name: Install Wix
+      if: runner.os == 'Windows'
+      run: |
+        dotnet tool install --global wix
     - name: Configure
       id: build
       shell: bash

clang/cmake/caches/Release.cmake

@@ -30,7 +30,14 @@ endfunction()
 #
 # cmake -D LLVM_RELEASE_ENABLE_PGO=ON -C Release.cmake
 
-set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir;flang")
+if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
+  # Reduce projects built for Windows due to 2GB installer limits.
+  #set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra")
+  set (DEFAULT_PROJECTS "clang;lld")
+else()
+  set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir;flang")
+endif()
+
 # bolt only supports ELF, so only enable it for Linux.
 if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
   list(APPEND DEFAULT_PROJECTS "bolt")
@@ -56,7 +63,7 @@ set(CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "")
 set(STAGE1_PROJECTS "clang")
 
 # Build all runtimes so we can statically link them into the stage2 compiler.
-set(STAGE1_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind")
+set(STAGE1_RUNTIMES ${DEFAULT_RUNTIMES})
 
 if (LLVM_RELEASE_ENABLE_PGO)
   list(APPEND STAGE1_PROJECTS "lld")
@@ -140,7 +147,16 @@ set_final_stage_var(LLVM_ENABLE_PROJECTS "${LLVM_RELEASE_ENABLE_PROJECTS}" STRIN
 if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
   set_final_stage_var(CLANG_BOLT "INSTRUMENT" STRING)
 endif()
-set_final_stage_var(CPACK_GENERATOR "TXZ" STRING)
+# We want to generate an installer on Windows.
+if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
+  set_final_stage_var(CPACK_GENERATOR "WIX" STRING)
+else()
+  set_final_stage_var(CPACK_GENERATOR "TXZ" STRING)
+endif()
+if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
+  # Limit installation size on Windows to avoid 2GB installer limt.
+  set_final_stage_var(LLVM_INSTALL_TOOLCHAIN_ONLY "ON" BOOL)
+endif()
 set_final_stage_var(CPACK_ARCHIVE_THREADS "0" STRING)
 
 set_final_stage_var(LLVM_USE_STATIC_ZSTD "ON" BOOL)

clang/utils/perf-training/lit.site.cfg.in

@@ -1,14 +1,15 @@
 @LIT_SITE_CFG_IN_HEADER@
 
 import sys
+import shlex
 
 config.clang_tools_dir = lit_config.substitute("@CURRENT_TOOLS_DIR@")
 config.perf_helper_dir = "@CMAKE_CURRENT_SOURCE_DIR@"
 config.test_exec_root = "@CMAKE_CURRENT_BINARY_DIR@"
 config.test_source_root = "@CLANG_PGO_TRAINING_DATA@"
 config.target_triple = "@LLVM_TARGET_TRIPLE@"
 config.python_exe = "@Python3_EXECUTABLE@"
-config.cmake_exe = "@CMAKE_COMMAND@"
+config.cmake_exe = shlex.quote("@CMAKE_COMMAND@")
 config.llvm_src_dir ="@CMAKE_SOURCE_DIR@"
 config.cmake_generator ="@CMAKE_GENERATOR@"
 config.use_llvm_build = @CLANG_PGO_TRAINING_USE_LLVM_BUILD@

cmake/Modules/LLVMVersion.cmake

@@ -10,6 +10,6 @@ if(NOT DEFINED LLVM_VERSION_PATCH)
   set(LLVM_VERSION_PATCH 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_SUFFIX)
-  set(LLVM_VERSION_SUFFIX git)
+  set(LLVM_VERSION_SUFFIX)
 endif()
 

llvm/utils/lit/lit/TestRunner.py

@@ -1176,6 +1176,7 @@ def executeScriptInternal(
     test, litConfig, tmpBase, commands, cwd, debug=True
 ) -> Tuple[str, str, int, Optional[str]]:
     cmds = []
+    print(test, commands)
     for i, ln in enumerate(commands):
         # Within lit, we try to always add '%dbg(...)' to command lines in order
         # to maximize debuggability.  However, custom lit test formats might not
@@ -1205,6 +1206,7 @@ def executeScriptInternal(
             ) from None
 
     cmd = cmds[0]
+    print(cmds)
     for c in cmds[1:]:
         cmd = ShUtil.Seq(cmd, "&&", c)