[tools] Update llvm version from 17.0.6 to 19.0.4 (#5991)

Uploads are likely to fail, but this is to be fixed by #5980
pytorch · Nov 27, 2024 · c1862b5 · c1862b5
1 parent 8856c07
commit c1862b5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
@@ -1,6 +1,6 @@
 self-hosted-runner:
   labels:
-    - macos-12-xl
+    - macos-13
     - macos-m1-stable
     - linux.12xlarge
     - linux.2xlarge

diff --git a/.github/workflows/clang-tidy-linux.yml b/.github/workflows/clang-tidy-linux.yml
@@ -43,7 +43,7 @@ jobs:
         with:
           name: clang-tidy
           if-no-files-found: error
-          s3-prefix: linux64/17.0.6
+          s3-prefix: linux64/19.1.4
           s3-bucket: oss-clang-format
           path: clang-tidy
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -54,7 +54,7 @@ jobs:
         with:
           name: clang-format
           if-no-files-found: error
-          s3-prefix: linux64/17.0.6
+          s3-prefix: linux64/19.1.4
           s3-bucket: oss-clang-format
           path: clang-format
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/.github/workflows/clang-tidy-macos.yml b/.github/workflows/clang-tidy-macos.yml
@@ -18,16 +18,13 @@ on:
 
 jobs:
   build-Intel:
-    runs-on: macos-12-xl
+    runs-on: macos-13
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install dependencies
         run: |
           brew install ninja
-      - name: Set xcode version
-        run: |
-            echo "DEVELOPER_DIR=/Applications/Xcode_13.3.1.app/Contents/Developer" >> "${GITHUB_ENV}"
       - name: Build
         working-directory: ./tools/clang-tidy-checks
         run: |
@@ -44,7 +41,7 @@ jobs:
         with:
           name: clang-tidy
           if-no-files-found: error
-          s3-prefix: macos-i386/17.0.6
+          s3-prefix: macos-i386/19.1.4
           s3-bucket: oss-clang-format
           path: tools/clang-tidy-checks/llvm-project/build/bin/clang-tidy
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -55,7 +52,7 @@ jobs:
         with:
           name: clang-format
           if-no-files-found: error
-          s3-prefix: macos-i386/17.0.6
+          s3-prefix: macos-i386/19.1.4
           s3-bucket: oss-clang-format
           path: tools/clang-tidy-checks/llvm-project/build/bin/clang-format
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -84,7 +81,7 @@ jobs:
         with:
           name: clang-tidy
           if-no-files-found: error
-          s3-prefix: macos-arm/17.0.6
+          s3-prefix: macos-arm/19.1.4
           s3-bucket: oss-clang-format
           path: tools/clang-tidy-checks/llvm-project/build/bin/clang-tidy
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -95,7 +92,7 @@ jobs:
         with:
           name: clang-format
           if-no-files-found: error
-          s3-prefix: macos-arm/17.0.6
+          s3-prefix: macos-arm/19.1.4
           s3-bucket: oss-clang-format
           path: tools/clang-tidy-checks/llvm-project/build/bin/clang-format
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/tools/clang-tidy-checks/setup.sh b/tools/clang-tidy-checks/setup.sh
@@ -48,14 +48,14 @@ function clone_llvm() {
   if [[ -d llvm-project ]]; then
     rm -rf llvm-project
   fi
-  git clone -b llvmorg-17.0.6 https://github.com/llvm/llvm-project.git --depth=1
+  git clone -b llvmorg-19.1.4 https://github.com/llvm/llvm-project.git --depth=1
   success
 }
 
 function apply_patches() {
   info "applying patches"
   pushd llvm-project
-  for check in ../17.x-patches/*.diff; do
+  for check in ../19.x-patches/*.diff; do
     patch -p1 -N -d . < "$check"
   done
   popd
@@ -109,7 +109,8 @@ function build() {
 
 function setup() {
   clone_llvm
-  apply_patches
+  # No need to patch llvm-19
+  # apply_patches
   build
 }