Merge pull request #171 from fzou1/110_fix_ci_issue

Fix issue of travis CI test and update spirv branch name

Author: fzou1

.travis.yml

@@ -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
@@ -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

CMakeLists.txt

@@ -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)
@@ -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}