Skip to content

Commit 2adc125

Browse files
committed
update version number and clang/spirv translator's branch name for ocl-open-110 branch
1 parent ea345a7 commit 2adc125

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ if(NOT USE_PREBUILT_LLVM)
8181

8282
if(NOT LLVM_EXTERNAL_CLANG_SOURCE_DIR)
8383
set(CLANG_SOURCE_DIR ${LLVM_SOURCE_DIR}/tools/clang)
84+
set(CLANG_BASE_REVISION release_11)
8485
elseif(EXISTS "${LLVM_EXTERNAL_CLANG_SOURCE_DIR}/CMakeLists.txt")
8586
set(CLANG_SOURCE_DIR "${LLVM_EXTERNAL_CLANG_SOURCE_DIR}")
87+
set(CLANG_BASE_REVISION release/10.x)
8688
endif()
8789
if(EXISTS ${CLANG_SOURCE_DIR})
8890
message(STATUS "Using Clang source code direcotry: ${CLANG_SOURCE_DIR}")
@@ -117,7 +119,8 @@ if(NOT USE_PREBUILT_LLVM)
117119
)
118120
endif()
119121

120-
set(CLANG_BASE_REVISION master)
122+
123+
# TODO: update after spirv translator branch for llvm 11 is created
121124
set(SPIRV_BASE_REVISION master)
122125
set(TARGET_BRANCH "ocl-open-110")
123126

README.md

Lines changed: 6 additions & 6 deletions
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/11.x
29+
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git -b llvm_release_110
30+
git clone https://github.com/intel/opencl-clang.git -b ocl-open-110
3131
```
3232

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

6969
##### Preferred LLVM version
7070

71-
By default, openclc-clang's cmake script is searching for LLVM 11.0.0. You can
71+
By default, opencl-clang's cmake script is searching for LLVM 11.0.0. You can
7272
override target version of LLVM by using the `PREFERRED_LLVM_VERSION` cmake
7373
option:
7474

7575
Example:
7676
```bash
77-
cmake -DPREFERRED_LLVM_VERSION="10.0.0" ../opencl-clang
77+
cmake -DPREFERRED_LLVM_VERSION="11.0.0" ../opencl-clang
7878
```
7979

8080
##### Custom LLVM installation

0 commit comments

Comments
 (0)