try simplifying

awakecoding · Nov 8, 2023 · 9603013 · 9603013
1 parent adc8493
commit 9603013
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 85 deletions.
diff --git a/.github/workflows/halide-prebuilt.yml b/.github/workflows/halide-prebuilt.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         arch: [ x86_64, aarch64 ]
         os: [ windows, macos, ubuntu-20.04, ubuntu-22.04 ]
-        version: [ 16.0.0 ]
+        version: [ 14.0.0, 16.0.0 ]
 
         include:
           - os: windows
@@ -88,11 +88,9 @@ jobs:
             tar -xvf "${LlvmName}.tar.xz" -C $TempDir
             sudo mv "$TempDir/${LlvmName}" $LLVM_PREFIX
           }
-          $LLVM_BIN_PATH="$LLVM_PREFIX/bin"
+          $LLVM_BIN_DIR="$LLVM_PREFIX/bin"
           $LLVM_DIR="$LLVM_PREFIX/lib/cmake/llvm"
           $CLANG_DIR="$LLVM_PREFIX/lib/cmake/clang"
-          echo "LLVM_X86_64_DIR=$LLVM_DIR" >> $Env:GITHUB_ENV
-          echo "CLANG_X86_64_DIR=$CLANG_DIR" >> $Env:GITHUB_ENV
 
           echo "LLVM_HOST_DIR=$LLVM_DIR" >> $Env:GITHUB_ENV
           echo "CLANG_HOST_DIR=$CLANG_DIR" >> $Env:GITHUB_ENV
@@ -102,8 +100,10 @@ jobs:
             echo "CLANG_TARGET_DIR=$CLANG_DIR" >> $Env:GITHUB_ENV
           }
 
-          echo "LLVM_HOST_BIN_DIR=$LLVM_BIN_PATH" >> $Env:GITHUB_ENV
-          echo "PATH=$LLVM_BIN_PATH$([IO.Path]::PathSeparator)$Env:PATH" >> $Env:GITHUB_ENV
+          echo "LLVM_HOST_BIN_DIR=$LLVM_BIN_DIR" >> $Env:GITHUB_ENV
+          if (-Not (('${{matrix.version}}' -eq "14.0.0") -and ('${{matrix.os}}' -eq "windows"))) {
+            echo "PATH=$LLVM_BIN_DIR$([IO.Path]::PathSeparator)$Env:PATH" >> $Env:GITHUB_ENV
+          }
 
       - name: Install target clang+llvm
         if: matrix.arch == 'aarch64'
@@ -133,25 +133,18 @@ jobs:
             tar -xf "${LlvmName}.tar.xz" -C $TempDir
             sudo mv "$TempDir/${LlvmName}" $LLVM_PREFIX
           }
-          $LLVM_BIN_PATH="$LLVM_PREFIX/bin"
+          $LLVM_BIN_DIR="$LLVM_PREFIX/bin"
           $LLVM_DIR="$LLVM_PREFIX/lib/cmake/llvm"
           $CLANG_DIR="$LLVM_PREFIX/lib/cmake/clang"
-          echo "LLVM_AARCH64_DIR=$LLVM_DIR" >> $Env:GITHUB_ENV
-          echo "CLANG_AARCH64_DIR=$LLVM_DIR" >> $Env:GITHUB_ENV
-
           echo "LLVM_TARGET_DIR=$LLVM_DIR" >> $Env:GITHUB_ENV
           echo "CLANG_TARGET_DIR=$CLANG_DIR" >> $Env:GITHUB_ENV
 
           $LLVM_HOST_BIN_DIR=$Env:LLVM_HOST_BIN_DIR
-          $LLVM_TARGET_BIN_DIR=$LLVM_BIN_PATH
-          if ($IsWindows) {
-            @('llvm-as.exe', 'clang.exe', 'clang-format.exe') | ForEach-Object {
-              Copy-Item -Path "${LLVM_HOST_BIN_DIR}\$_" -Destination "${LLVM_TARGET_BIN_DIR}\$_" -Force
-            }
-          } else {
-            @('llvm-as', 'clang', 'clang-format') | ForEach-Object {
-              Copy-Item -Path "${LLVM_HOST_BIN_DIR}/$_" -Destination "${LLVM_TARGET_BIN_DIR}/$_" -Force
-            }
+          $LLVM_TARGET_BIN_DIR=$LLVM_BIN_DIR
+          $ExeSuffix = if ($IsWindows) { ".exe" } else { "" }
+          @('llvm-as', 'clang', 'clang-format') | ForEach-Object {
+              $ExeFileName = "$_${ExeSuffix}"
+              Copy-Item -Path "${LLVM_HOST_BIN_DIR}/$ExeFileName" -Destination "${LLVM_TARGET_BIN_DIR}/$ExeFileName" -Force
           }
 
       - name: Clone project
@@ -177,7 +170,6 @@ jobs:
           } else {
             git -C halide apply ../llvm-prebuilt/patches/halide-16-add-halide-host-tools-dir-cmake-option.patch
             git -C halide apply ../llvm-prebuilt/patches/halide-16-disable-autoschedulers.patch
-            git -C halide apply ../llvm-prebuilt/patches/halide-16-add-llvm-host-bin-dir-cmake-option.patch
             git -C halide apply ../llvm-prebuilt/patches/halide-16-disable-clang-verbose-build-warnings.patch
           }
 
@@ -247,19 +239,15 @@ jobs:
         run: cmake --install halide-build
 
       - name: Package Halide
-        if: runner.os != 'Windows'
-        run: |
-          PACKAGE_NAME="halide-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}"
-          mv halide-install ./${PACKAGE_NAME}
-          tar -cJf ${PACKAGE_NAME}.tar.xz ${PACKAGE_NAME}
-
-      - name: Package Halide
-        if: runner.os == 'Windows'
         shell: pwsh
         run: |
-          $PACKAGE_NAME="halide-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}"
-          mv halide-install $PACKAGE_NAME
-          cmd.exe /c "7z a -ttar -snl -so $PACKAGE_NAME.tar $PACKAGE_NAME | 7z a -si $PACKAGE_NAME.tar.xz"
+          $PackageName="halide-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}"
+          Move-Item halide-install $PackageName
+          if ($IsWindows) {
+            cmd.exe /c "7z a -ttar -snl -so $PackageName.tar $PackageName | 7z a -si $PackageName.tar.xz"
+          } else {
+            tar -cJf "${PackageName}.tar.xz" "${PackageName}"
+          }
 
       - name: Upload Halide package
         uses: actions/upload-artifact@v3

diff --git a/patches/halide-16-add-llvm-host-bin-dir-cmake-option.patch b/patches/halide-16-add-llvm-host-bin-dir-cmake-option.patch