From 7d687af7e4d53017cee023cd2590c0c6c293554b Mon Sep 17 00:00:00 2001 From: Wenju He Date: Mon, 23 Sep 2024 07:30:14 +0800 Subject: [PATCH 1/3] [NFC] Update llvm version from 19 to 20 --- .github/workflows/codeql.yml | 2 +- .github/workflows/on-push-verification-out-of-tree.yml | 2 +- CMakeLists.txt | 2 +- README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c2b92d43..71fd9503 100644 --- 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: diff --git a/.github/workflows/on-push-verification-out-of-tree.yml b/.github/workflows/on-push-verification-out-of-tree.yml index e5ec3a41..f5bd2ce0 100644 --- 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: diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e7f2900..40d5427a 100644 --- 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 index 5ea6c216..dc2db90c 100644 --- 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 From b01cc38d101c725eff94d0002b9439c767a45615 Mon Sep 17 00:00:00 2001 From: Wenju He Date: Mon, 23 Sep 2024 08:38:12 +0800 Subject: [PATCH 2/3] Add clang-tools-20 libllvmlibc-20-dev mlir-20-tools which are required for linking --- .github/workflows/codeql.yml | 5 ++++- .github/workflows/on-push-verification-out-of-tree.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 71fd9503..6497608b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -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 index f5bd2ce0..dd595471 100644 --- a/.github/workflows/on-push-verification-out-of-tree.yml +++ b/.github/workflows/on-push-verification-out-of-tree.yml @@ -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 From d518d7215556216cb1e5da06f8942354d321c726 Mon Sep 17 00:00:00 2001 From: Wenju He Date: Mon, 23 Sep 2024 10:59:10 +0800 Subject: [PATCH 3/3] add 190 branch to scheduled-verification --- .github/workflows/scheduled-verification.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scheduled-verification.yml b/.github/workflows/scheduled-verification.yml index 9d6e6942..6e64155d 100644 --- 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: