Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:
contents: read

env:
LLVM_VERSION: 21
LLVM_VERSION: 22
LLVM_VERSION_MINOR: 0

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-push-verification-out-of-tree.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:
contents: read

env:
LLVM_VERSION: 21
LLVM_VERSION: 22
LLVM_VERSION_MINOR: 0

on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-verification.yml
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, 19, 20 ]
llvm_version: [ 14, 15, 16, 17, 18, 19, 20, 21 ]
runs-on: ubuntu-22.04
steps:

Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
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 "21.0")
set(PREFERRED_LLVM_VERSION "22.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 Expand Up @@ -152,9 +152,9 @@ if(NOT USE_PREBUILT_LLVM)
)
endif()

set(CLANG_BASE_REVISION master)
set(SPIRV_BASE_REVISION master)
set(TARGET_BRANCH "ocl-open-110")
set(CLANG_BASE_REVISION main)
set(SPIRV_BASE_REVISION main)
set(TARGET_BRANCH main)

apply_patches(${CLANG_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/patches/clang
Expand Down
2 changes: 1 addition & 1 deletion README.md
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="21.0" ../opencl-clang
cmake -DPREFERRED_LLVM_VERSION="22.0" ../opencl-clang
```

##### Custom LLVM installation
Expand Down
Loading