[NFC] Update llvm version from 19 to 20 (#549)

intel · Sep 23, 2024 · 8b4c2c3 · 8b4c2c3
1 parent bb0acfa
commit 8b4c2c3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -10,7 +10,7 @@ permissions:
   contents: read
 
 env:
-  LLVM_VERSION: 19
+  LLVM_VERSION: 20
   LLVM_VERSION_MINOR: 0
 
 jobs:
@@ -44,12 +44,15 @@ jobs:
           sudo apt-get update
           sudo apt-get -yq --no-install-suggests --no-install-recommends install \
             clang-${{ env.LLVM_VERSION }} \
+            clang-tools-${{ env.LLVM_VERSION }} \
             llvm-${{ env.LLVM_VERSION }}-dev \
+            libllvmlibc-${{ env.LLVM_VERSION }}-dev \
             libclang-${{ env.LLVM_VERSION }}-dev \
             libclang-cpp${{ env.LLVM_VERSION }}-dev \
             libpolly-${{ env.LLVM_VERSION }}-dev \
             libzstd-dev \
-            libedit-dev
+            libedit-dev \
+            mlir-${{ env.LLVM_VERSION }}-tools
 
       - name: Checkout opencl-clang sources for action files
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

diff --git a/.github/workflows/on-push-verification-out-of-tree.yml b/.github/workflows/on-push-verification-out-of-tree.yml
@@ -9,7 +9,7 @@ permissions:
   contents: read
 
 env:
-  LLVM_VERSION: 19
+  LLVM_VERSION: 20
   LLVM_VERSION_MINOR: 0
 
 on:
@@ -43,12 +43,15 @@ jobs:
           sudo apt-get update
           sudo apt-get -yq --no-install-suggests --no-install-recommends install \
             clang-${{ env.LLVM_VERSION }} \
+            clang-tools-${{ env.LLVM_VERSION }} \
             llvm-${{ env.LLVM_VERSION }}-dev \
+            libllvmlibc-${{ env.LLVM_VERSION }}-dev \
             libclang-${{ env.LLVM_VERSION }}-dev \
             libclang-cpp${{ env.LLVM_VERSION }}-dev \
             libpolly-${{ env.LLVM_VERSION }}-dev \
             libzstd-dev \
-            libedit-dev
+            libedit-dev \
+            mlir-${{ env.LLVM_VERSION }}-tools
 
       - name: Checkout SPIRV-LLVM-Translator sources
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

diff --git a/.github/workflows/scheduled-verification.yml b/.github/workflows/scheduled-verification.yml
@@ -34,7 +34,7 @@ jobs:
     name: Verify `ocl-open-${{ matrix.llvm_version }}` release branch
     strategy:
       matrix:
-        llvm_version: [ 14, 15, 16, 17, 18 ]
+        llvm_version: [ 14, 15, 16, 17, 18, 19 ]
     runs-on: ubuntu-22.04
     steps:
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,7 +39,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     add_definitions(-DUSE_PREBUILT_LLVM)
 
     if(NOT PREFERRED_LLVM_VERSION)
-        set(PREFERRED_LLVM_VERSION "19.0")
+        set(PREFERRED_LLVM_VERSION "20.0")
     endif(NOT PREFERRED_LLVM_VERSION)
     message(STATUS "[OPENCL-CLANG] Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
     find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)

diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ LLVM by using the `PREFERRED_LLVM_VERSION` cmake option:
 
 Example:
 ```bash
-cmake -DPREFERRED_LLVM_VERSION="19.0" ../opencl-clang
+cmake -DPREFERRED_LLVM_VERSION="20.0" ../opencl-clang
 ```
 
 ##### Custom LLVM installation