Skip to content

Commit e604963

Browse files
committed
Using SPIR-V LLVM Translator v9.0.0-1 in travis builds
Signed-off-by: Alexey Sotkin <[email protected]>
1 parent 6f8c329 commit e604963

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

.travis.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ branches:
1515
- master
1616
- ocl-open-70
1717
- ocl-open-80
18+
- ocl-open-90
1819

1920
env:
2021
matrix:
@@ -24,7 +25,7 @@ env:
2425
addons:
2526
apt:
2627
sources:
27-
- sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main'
28+
- sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
2829
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
2930
- ubuntu-toolchain-r-test
3031
packages:
@@ -33,14 +34,20 @@ addons:
3334
- libclang-9-dev
3435

3536
install:
36-
- wget https://github.com/KhronosGroup/SPIRV-LLVM-Translator/releases/download/dev-build/SPIRV-LLVM-Translator-dev-build-linux-Release.zip -O /tmp/SPIRV-LLVM-Translator-dev-build-linux-${BUILD_TYPE}.zip
37-
- unzip /tmp/SPIRV-LLVM-Translator-dev-build-linux-${BUILD_TYPE}.zip -d spirv-llvm-translator
37+
- export TAG=v9.0.0-1
38+
- export TARBALL=SPIRV-LLVM-Translator-${TAG}-linux-${BUILD_TYPE}.zip
39+
- wget https://github.com/KhronosGroup/SPIRV-LLVM-Translator/releases/download/${TAG}/${TARBALL} -O /tmp/${TARBALL}
40+
- unzip /tmp/${TARBALL} -d spirv-llvm-translator
3841

3942
compiler:
4043
- gcc
4144
- clang
4245

4346
script:
47+
# For some reason cmake expects lit-cpuid to be installed.
48+
# But llvm-9 packages in the current state do not provide it.
49+
# As a temporary workaround we create a dummy file just to pacify cmake.
50+
- sudo touch /usr/lib/llvm-9/bin/lit-cpuid
4451
- mkdir build && cd build
4552
- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DLLVM_NO_DEAD_STRIP=ON -DLLVMSPIRV_INCLUDED_IN_LLVM=OFF -DSPIRV_TRANSLATOR_DIR=./spirv-llvm-translator -DCMAKE_INSTALL_PREFIX=./install ..
4653
- make install

0 commit comments

Comments
 (0)