Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Sep 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d687af
[NFC] Update llvm version from 19 to 20
wenju-he Sep 22, 2024
b01cc38
Add clang-tools-20 libllvmlibc-20-dev mlir-20-tools which are require…
wenju-he Sep 23, 2024
d518d72
add 190 branch to scheduled-verification
wenju-he Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:
contents: read

env:
LLVM_VERSION: 19
LLVM_VERSION: 20
LLVM_VERSION_MINOR: 0

jobs:
Expand Down Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/on-push-verification-out-of-tree.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:
contents: read

env:
LLVM_VERSION: 19
LLVM_VERSION: 20
LLVM_VERSION_MINOR: 0

on:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-verification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading