Skip to content

Fix issue of travis CI test and update spirv branch name #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2020
Merged

Fix issue of travis CI test and update spirv branch name #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e62630b
Fix issue of travis CI test and update spirv branch name
fzou1 Sep 10, 2020
9bb3bdb
Fix the llvm version
fzou1 Sep 10, 2020
8f80fd0
Add branch name for spirv translator in .travis.xml
fzou1 Sep 10, 2020
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
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ branches:

env:
global:
- LLVM_VERSION=12
- LLVM_VERSION=11
matrix:
- BUILD_TYPE=Release
- BUILD_TYPE=Debug

before-install:
- curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
- echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main" | sudo tee -a ${TRAVIS_ROOT}/etc/apt/sources.list
- echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" | sudo tee -a ${TRAVIS_ROOT}/etc/apt/sources.list
- sudo apt-get update
- sudo apt-get -yq --no-install-suggests --no-install-recommends install
llvm-${LLVM_VERSION}-dev
Expand All @@ -32,7 +32,7 @@ before-install:
libclang-cpp${LLVM_VERSION}-dev

install:
- git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git spirv-llvm-translator
- git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git spirv-llvm-translator -b llvm_release_${LLVM_VERSION}0
- mkdir spirv-llvm-translator/build && cd spirv-llvm-translator/build
- cmake .. -DCMAKE_INSTALL_PREFIX=./install -DBUILD_SHARED_LIBS=ON -DLLVM_BUILD_TOOLS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
- make -j`nproc` && make install
Expand Down
5 changes: 2 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
add_definitions(-DUSE_PREBUILT_LLVM)

if(NOT PREFERRED_LLVM_VERSION)
set(PREFERRED_LLVM_VERSION "12.0.0")
set(PREFERRED_LLVM_VERSION "11.0.0")
endif(NOT PREFERRED_LLVM_VERSION)
message(STATUS "Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)
Expand Down Expand Up @@ -120,8 +120,7 @@ if(NOT USE_PREBUILT_LLVM)
endif()


# TODO: update after spirv translator branch for llvm 11 is created
set(SPIRV_BASE_REVISION master)
set(SPIRV_BASE_REVISION llvm_release_110)
set(TARGET_BRANCH "ocl-open-110")

apply_patches(${CLANG_SOURCE_DIR}
Expand Down