Skip to content

Commit c78c1f8

Browse files
authored
[CI] Prepare release branch for LLVM 15 (#375)
Signed-off-by: Haonan Yang <[email protected]>
1 parent 5d903e3 commit c78c1f8

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/check-in-tree-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
- cron: 0 0 * * 0
2222

2323
env:
24-
LLVM_VERSION: 14
24+
LLVM_VERSION: 15
2525

2626
jobs:
2727
build_and_test_linux:
@@ -42,13 +42,13 @@ jobs:
4242
uses: actions/checkout@v2
4343
with:
4444
repository: llvm/llvm-project
45-
ref: release/14.x
45+
ref: release/15.x
4646
path: llvm-project
4747
- name: Checkout the translator sources
4848
uses: actions/checkout@v2
4949
with:
5050
repository: KhronosGroup/SPIRV-LLVM-Translator
51-
ref: llvm_release_140
51+
ref: llvm_release_150
5252
path: llvm-project/SPIRV-LLVM-Translator
5353
- name: Checkout opencl-clang sources
5454
uses: actions/checkout@v2

CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
2525
add_definitions(-DUSE_PREBUILT_LLVM)
2626

2727
if(NOT PREFERRED_LLVM_VERSION)
28-
set(PREFERRED_LLVM_VERSION "14.0.0")
28+
set(PREFERRED_LLVM_VERSION "15.0.0")
2929
endif(NOT PREFERRED_LLVM_VERSION)
3030
message(STATUS "[OPENCL-CLANG] Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
3131
find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)
@@ -85,13 +85,13 @@ set(TARGET_NAME ${COMMON_CLANG_LIBRARY_NAME}${BUILD_PLATFORM} )
8585
if(NOT USE_PREBUILT_LLVM)
8686

8787
if(NOT LLVM_EXTERNAL_CLANG_SOURCE_DIR)
88-
set(LLVM_BASE_REVISION release_14)
88+
set(LLVM_BASE_REVISION release_15)
8989
set(CLANG_SOURCE_DIR ${LLVM_SOURCE_DIR}/tools/clang)
90-
set(CLANG_BASE_REVISION release_14)
90+
set(CLANG_BASE_REVISION release_15)
9191
elseif(EXISTS "${LLVM_EXTERNAL_CLANG_SOURCE_DIR}/CMakeLists.txt")
92-
set(LLVM_BASE_REVISION release/14.x)
92+
set(LLVM_BASE_REVISION release/15.x)
9393
set(CLANG_SOURCE_DIR "${LLVM_EXTERNAL_CLANG_SOURCE_DIR}")
94-
set(CLANG_BASE_REVISION release/14.x)
94+
set(CLANG_BASE_REVISION release/15.x)
9595
endif()
9696
if(EXISTS ${CLANG_SOURCE_DIR})
9797
message(STATUS "[OPENCL-CLANG] Using Clang source code direcotry: ${CLANG_SOURCE_DIR}")
@@ -126,8 +126,8 @@ if(NOT USE_PREBUILT_LLVM)
126126
)
127127
endif()
128128

129-
set(SPIRV_BASE_REVISION llvm_release_140)
130-
set(TARGET_BRANCH "ocl-open-140")
129+
set(SPIRV_BASE_REVISION llvm_release_150)
130+
set(TARGET_BRANCH "ocl-open-150")
131131
get_filename_component(LLVM_MONOREPO_DIR ${LLVM_SOURCE_DIR} DIRECTORY)
132132
set(LLVM_PATCHES_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm
133133
${CMAKE_CURRENT_SOURCE_DIR}/patches/clang)

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ Before the build all dependencies must be downloaded and laid out as follows:
2323
This can be done using the following commands:
2424
```bash
2525
cd <workspace>
26-
git clone https://github.com/llvm/llvm-project.git . -b release/14.x
27-
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git -b llvm_release_140
28-
git clone https://github.com/intel/opencl-clang.git -b ocl-open-140
26+
git clone https://github.com/llvm/llvm-project.git . -b release/15.x
27+
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git -b llvm_release_150
28+
git clone https://github.com/intel/opencl-clang.git -b ocl-open-150
2929
```
3030

3131
Then we need to create a build directory and run the build:
@@ -56,7 +56,7 @@ documented in [Embedding LLVM in your project](https://llvm.org/docs/CMake.html#
5656
Commands to checkout sources and build:
5757
```bash
5858
cd <workspace>
59-
git clone https://github.com/intel/opencl-clang.git -b ocl-open-140
59+
git clone https://github.com/intel/opencl-clang.git -b ocl-open-150
6060
mkdir build && cd build
6161
cmake ../opencl-clang
6262
make all -j`nproc`
@@ -66,7 +66,7 @@ make all -j`nproc`
6666

6767
##### Preferred LLVM version
6868

69-
By default, opencl-clang's cmake script is searching for LLVM 14.0.0. You can
69+
By default, opencl-clang's cmake script is searching for LLVM 15.0.0. You can
7070
override target version of LLVM by using the `PREFERRED_LLVM_VERSION` cmake
7171
option:
7272

0 commit comments

Comments
 (0)