Skip to content

Commit 254dc03

Browse files
authored
update version numbers for 180 branch (#506)
1 parent ad248f4 commit 254dc03

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

CMakeLists.txt

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
cmake_minimum_required(VERSION 3.13.4)
22

3+
if(NOT DEFINED BASE_LLVM_VERSION)
4+
set(BASE_LLVM_VERSION 17)
5+
endif(NOT DEFINED BASE_LLVM_VERSION)
6+
set(OPENCL_CLANG_VERSION ${BASE_LLVM_VERSION}.0)
7+
38
if(NOT DEFINED OPENCL_CLANG_BUILD_EXTERNAL)
49
# check if we build inside llvm or not
510
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
@@ -152,9 +157,9 @@ if(NOT USE_PREBUILT_LLVM)
152157
)
153158
endif()
154159

155-
set(CLANG_BASE_REVISION master)
156-
set(SPIRV_BASE_REVISION master)
157-
set(TARGET_BRANCH "ocl-open-110")
160+
set(CLANG_BASE_REVISION release/18.x)
161+
set(SPIRV_BASE_REVISION llvm_release_180)
162+
set(TARGET_BRANCH "ocl-open-180")
158163

159164
apply_patches(${CLANG_SOURCE_DIR}
160165
${CMAKE_CURRENT_SOURCE_DIR}/patches/clang

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ Before the build all dependencies must be downloaded and laid out as follows:
2525
This can be done using the following commands:
2626
```bash
2727
cd <workspace>
28-
git clone https://github.com/llvm/llvm-project.git .
29-
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git
30-
git clone https://github.com/intel/opencl-clang.git
28+
git clone https://github.com/llvm/llvm-project.git . -b release/18.x
29+
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git -b llvm_release_180
30+
git clone https://github.com/intel/opencl-clang.git -b ocl-open-180
3131
```
3232

3333
Then we need to create a build directory and run the build:
@@ -60,7 +60,7 @@ documented in [Embedding LLVM in your project](https://llvm.org/docs/CMake.html#
6060
Commands to checkout sources and build:
6161
```bash
6262
cd <workspace>
63-
git clone https://github.com/intel/opencl-clang.git
63+
git clone https://github.com/intel/opencl-clang.git -b ocl-open-180
6464
mkdir build && cd build
6565
cmake ../opencl-clang
6666
make all -j`nproc`
@@ -70,13 +70,13 @@ make all -j`nproc`
7070

7171
##### Preferred LLVM version
7272

73-
By default, opencl-clang's cmake script is searching for LLVM which is built
74-
based on the latest verion of current branch. You can override target version of
75-
LLVM by using the `PREFERRED_LLVM_VERSION` cmake option:
73+
By default, opencl-clang's cmake script is searching for LLVM 17. You can
74+
override target version of LLVM by using the `PREFERRED_LLVM_VERSION` cmake
75+
option:
7676

7777
Example:
7878
```bash
79-
cmake -DPREFERRED_LLVM_VERSION="18" ../opencl-clang
79+
cmake -DPREFERRED_LLVM_VERSION="17" ../opencl-clang
8080
```
8181

8282
##### Custom LLVM installation

0 commit comments

Comments
 (0)