workflows/release-binaries: Enable Windows x86 builds

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

@@ -91,6 +91,7 @@ jobs:
           - ubuntu-22.04
           - ubuntu-22.04-arm
           - macos-14
+          - windows-2022
 
     uses: ./.github/workflows/release-binaries.yml
     with:

.github/workflows/release-binaries.yml

@@ -22,6 +22,7 @@ on:
           - ubuntu-22.04
           - ubuntu-22.04-arm
           - macos-14
+          - windows-2022
 
   workflow_call:
     inputs:
@@ -116,9 +117,16 @@ jobs:
         echo "ref=$ref" >> $GITHUB_OUTPUT
         echo "upload=$upload" >> $GITHUB_OUTPUT
 
+        if [ "$RUNNER_OS" = "Windows" ]; then
+          # Wix uses .msi
+          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"
 
@@ -134,13 +142,33 @@ jobs:
         fi
 
         if [ "$RUNNER_OS" = "Windows" ]; then
-          # The build times out on Windows, so we need to disable LTO.
+          # LTO causes the WiX generator to crash so we need to disable it:
+          # light.exe : error LGHT0001 : Catastrophic failure (Exception from HRESULT: 0x8000FFFF (E_UNEXPECTED))
+          # Stack Trace:
+          # at Microsoft.Tools.WindowsInstallerXml.Cab.Interop.NativeMethods.CreateCabFinish(IntPtr contextHandle, IntPtr newCabNamesCallBackAddress)
+          # at Microsoft.Tools.WindowsInstallerXml.Cab.WixCreateCab.Complete(IntPtr newCabNamesCallBackAddress)
+          # at Microsoft.Tools.WindowsInstallerXml.CabinetBuilder.CreateCabinet(CabinetWorkItem cabinetWorkItem)
           target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF"
+          # libxml2 config
+          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DBOOTSTRAP_BOOTSTRAP_CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
+
+          # We are using the Wix generator which doesn't support strings in
+          # the version, so strip out the git suffix and replace the -rc3 suffix
+          # with .3.
+          set +o pipefail
+          rc_version=`grep -o 'LLVM_VERSION_SUFFIX -rc[0-9]' cmake/Modules/LLVMVersion.cmake | cut -d ' ' -f 2 | sed 's/-rc//g'`
+          set -o pipefail
+          if [ -z "$rc_version" ]; then
+            version_suffix=""
+          else
+            version_suffix=".$rc_version"
+          fi
+          target_cmake_flags="$target_cmake_flags -DLLVM_VERSION_SUFFIX=$version_suffix"
         fi
 
         echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT
         case "${{ inputs.runs-on }}" in
-          ubuntu-22.04*)
+          ubuntu-22.04*|windows-2022)
             build_runs_on="depot-${{ inputs.runs-on }}-16"
             test_runs_on=$build_runs_on
             ;;
@@ -160,12 +188,39 @@ jobs:
         echo "build-runs-on=$build_runs_on" >> $GITHUB_OUTPUT
         echo "test-runs-on=$test_runs_on" >> $GITHUB_OUTPUT
 
+
   build-release-package:
     name: "Build Release Package"
     needs: prepare
     if: github.repository_owner == 'llvm'
     runs-on: ${{ needs.prepare.outputs.build-runs-on }}
     steps:
+    - name: Windows config
+      if: runner.os == 'Windows'
+      run: |
+        # In order to avoid some errors with long paths names, we need to shorten
+        # the path names for the build.
+        subst S: ${{ github.workspace }}
+
+        # Disable autocrlf See https://llvm.org/docs/GettingStarted.html#id4
+        git config --global core.autocrlf false
+
+        # Install Wix for creating the installer.
+        dotnet tool install --global wix
+
+        # Install libxml2
+        # Specify [core] to disable extra features so we don't add extra dll dependencies.
+        # Even with [core] there is still one dll dependency which is bcrypt.dll.
+        vcpkg install libxml2[core]:x64-windows-static
+
+    # Setup python to ensure consistency in the python version used for
+    # all steps of this job.
+    - name: Setup Python
+      id: setup-python
+      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      with:
+        python-version: '3.13'
+        pip-install: packaging psutil
 
     - name: Checkout LLVM
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -189,6 +244,8 @@ jobs:
         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
 
@@ -205,6 +262,11 @@ jobs:
 
     - name: Build
       shell: bash
+      env:
+        # Set this variable so that stage2-instrumented and stage2 configuration
+        # steps can find libxml2.  This only is used on Windows and setting
+        # this variable should have no affect on other OSes.
+        LIBXML2_ROOT: /c/vcpkg/packages/libxml2_x64-windows-static/
       run: |
         ninja -v -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-package
         release_dir=`find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname 'stage2-bins'`
@@ -221,9 +283,23 @@ jobs:
     - name: Run Tests
       # These almost always fail so don't let them fail the build and prevent the uploads.
       continue-on-error: true
+      shell: bash
+      env:
+        # Some tests seem to timeout on windows, so limit the runtime.
+        LIT_OPTS: "--timeout=300"
       run: |
         ninja -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-check-all
 
+    - name: Save logs
+      if: failure() && runner.os == 'Windows'
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      with:
+        name: ${{ runner.os }}-${{ runner.arch }}-nsis-log
+        path: |
+          S:/build/tools/clang/stage2-instrumented-bins/tools/clang/stage2-bins/_CPack_Packages/win64/NSIS/NSISOutput.log
+          S:/build/tools/clang/stage2-instrumented-bins/tools/clang/stage2-bins/_CPack_Packages/win64/WIX/wix.log
+          S:/build/tools/clang/stage2-instrumented-bins/tools/clang/stage2-bins/CPackConfig.cmake
+
   upload-release-binaries:
     name: "Upload Release Binaries"
     needs:

clang/cmake/caches/Release.cmake

@@ -30,15 +30,35 @@ endfunction()
 #
 # cmake -D LLVM_RELEASE_ENABLE_PGO=ON -C Release.cmake
 
-set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir")
+if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
+  set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra")
+  #set_instrument_and_final_stage_var(LLVM_TARGETS_TO_BUILD "AArch64;ARM;X86;BPF;WebAssembly;RISCV;NVPTX" STRING)
+  set_instrument_and_final_stage_var(LLVM_TARGETS_TO_BUILD "Native" STRING)
+  set_instrument_and_final_stage_var(Python3_FIND_REGISTRY "NEVER" STRING)
+  set_instrument_and_final_stage_var(LLDB_RELOCATABLE_PYTHON "1" STRING)
+  set_instrument_and_final_stage_var(LLDB_EMBED_PYTHON_HOME "OFF" BOOL)
+  # Enable libxml2.  This is necessary for llvm-mt.
+  set_instrument_and_final_stage_var(LLVM_ENABLE_LIBXML2 "FORCE_ON" STRING)
+  set_instrument_and_final_stage_var(LLDB_ENABLE_LIBXML2 "OFF" BOOL)
+  set_instrument_and_final_stage_var(CLANG_ENABLE_LIBXML2 "OFF" BOOL)
+  set_instrument_and_final_stage_var(LLVM_ENABLE_RPMALLOC "ON" BOOL)
+  set_final_stage_var(BUILD_LLVM_C_DYLIB "ON" STRING)
+  set_final_stage_var(LLVM_INSTALL_TOOLCHAIN_ONLY "ON" BOOL)
+  # Disable lldb tests on Windows since some aren't working.
+  set_final_stage_var(LLDB_INCLUDE_TESTS "OFF" BOOL)
+else()
+  set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir")
+endif()
+
 # bolt only supports ELF, so only enable it for Linux.
 if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
   list(APPEND DEFAULT_PROJECTS "bolt")
 endif()
 
 # Don't build flang on Darwin due to:
 # https://github.com/llvm/llvm-project/issues/160546
-if (NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
+# Skip flang build on Windows because it makes the installer too big.
+if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
   list(APPEND DEFAULT_PROJECTS "flang")
 endif()
 
@@ -164,10 +184,16 @@ endif()
 # Final Stage Config (stage2)
 set_final_stage_var(LLVM_ENABLE_RUNTIMES "${LLVM_RELEASE_ENABLE_RUNTIMES}" STRING)
 set_final_stage_var(LLVM_ENABLE_PROJECTS "${LLVM_RELEASE_ENABLE_PROJECTS}" STRING)
+
 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(NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
+  set_final_stage_var(CPACK_GENERATOR "TXZ" STRING)
+else()
+  set_final_stage_var(CPACK_GENERATOR "WIX" STRING)
+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@