Fixes

Author: tstellar

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

@@ -88,6 +88,9 @@ 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
 
     uses: ./.github/workflows/release-binaries.yml

.github/workflows/release-binaries.yml

@@ -1,5 +1,5 @@
 name: Release Binaries
-# TEST
+
 on:
   workflow_dispatch:
     inputs:
@@ -120,7 +120,6 @@ jobs:
         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
-        enable_pgo=1
 
         target="$RUNNER_OS-$RUNNER_ARCH"
 
@@ -142,7 +141,6 @@ jobs:
           target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF"
         fi
 
-        echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT
         case "${{ inputs.runs-on }}" in
           ubuntu-22.04*)
             build_runs_on="depot-${{ inputs.runs-on }}-16"
@@ -169,11 +167,11 @@ jobs:
             build_runs_on=$test_runs_on
             ;;
         esac
-        
+
         case "$build_runs_on" in
           # These runners cannot build the full release package faster than
           # the 6 hours timeout limit, so we need to use a configuration
-          # that builds more quickly. 
+          # that builds more quickly.
           macos-13 | macos-14)
             bootstrap_prefix="BOOTSTRAP"
             target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF -DLLVM_RELEASE_ENABLE_PGO=OFF -D${bootstrap_prefix}-LLVM_TARGETS_TO_BUILD=Native"
@@ -183,44 +181,9 @@ jobs:
             ;;
         esac
 
-        target="$RUNNER_OS-$RUNNER_ARCH"
-        # The hendrikmuhs/ccache-action action does not support installing sccache
-        # on arm64 Linux.
-        if [ "$target" = "Linux-ARM64" ]; then
-          echo ccache=ccache >> $GITHUB_OUTPUT
-        else
-          echo ccache=sccache >> $GITHUB_OUTPUT
-        fi
-
-        # The macOS builds try to cross compile some libraries so we need to
-        # add extra CMake args to disable them.
-        # See https://github.com/llvm/llvm-project/issues/99767
-        if [ "$RUNNER_OS" = "macOS" ]; then
-          target_cmake_flags="$target_cmake_flags -D${bootstrap_prefix}_COMPILER_RT_ENABLE_IOS=OFF"
-          if [ "$RUNNER_ARCH" = "ARM64" ]; then
-            arches=arm64
-          else
-            arches=x86_64
-            # Disable Flang builds on macOS x86_64.  The FortranLower library takes
-            # 2-3 hours to build on macOS, much slower than on Linux.
-            # The long build time causes the release build to time out on x86_64,
-            # so we need to disable flang there.
-            target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_PROJECTS='clang;lld;lldb;clang-tools-extra;polly;mlir'"
-          fi
-          target_cmake_flags="$target_cmake_flags -D${bootstrap_prefix}_DARWIN_osx_ARCHS=$arches -D${bootstrap_prefix}_DARWIN_osx_BUILTIN_ARCHS=$arches"
-        fi
-
-        build_flang="true"
-
-        if [ "$RUNNER_OS" = "Windows" ]; then
-          # The build times out on Windows, so we need to disable LTO.
-          target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF"
-        fi
-        
         target_cmake_flags="$target_cmake_flags -D${bootstrap_prefix}_CPACK_PACKAGE_FILE_NAME=$release_binary_basename"
 
         echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT
-        echo "build-flang=$build_flang" >> $GITHUB_OUTPUT
         echo "build-runs-on=$build_runs_on" >> $GITHUB_OUTPUT
         echo "test-runs-on=$test_runs_on" >> $GITHUB_OUTPUT
 
@@ -264,8 +227,7 @@ jobs:
         # so we need to set some extra cmake flags to disable this.
         cmake -G Ninja -S llvm -B ${{ steps.setup-stage.outputs.build-prefix }}/build \
             ${{ needs.prepare.outputs.target-cmake-flags }} \
-            -C clang/cmake/caches/Release.cmake \
-            -DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"
+            -C clang/cmake/caches/Release.cmake
 
     - name: Build
       shell: bash
@@ -288,8 +250,9 @@ jobs:
       run: |
         ninja -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-check-all
 
-  test-release-package-mac-flang:
-    name: "Test Release Package Mac OS (flang)"
+  # Use a separate job to test some of the projects when running on the smaller runners.
+  test-release-package-mac-flang-mlir:
+    name: "Test Release Package Mac OS (flang + mlir)"
     needs:
       - prepare
     # Flang is currently disabled on Mac due to