Update clspv version (#635)

* Switch clspv-llvm to use github monorepo
* update linux kokoro compiler versions
* update deps
* Force llvm to not use color diagnostics in the linker

4 files changed, 16 insertions, 14 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80a249f..123bd14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,11 @@ enable_testing()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_CXX_STANDARD 11)
+if (${AMBER_USE_CLSPV})
+  set(CMAKE_CXX_STANDARD 14)
+else()
+  set(CMAKE_CXX_STANDARD 11)
+endif()
 
 include(CheckIncludeFile)
 include(GNUInstallDirs)
diff --git a/DEPS b/DEPS
index 5f93d2f..74c5270 100644
--- a/DEPS
+++ b/DEPS
@@ -3,14 +3,13 @@ use_relative_paths = True
 vars = {
   'google_git':  'https://github.com/google',
   'khronos_git': 'https://github.com/KhronosGroup',
-  'llvm_git': 'https://github.com/llvm-mirror',
+  'llvm_git': 'https://github.com/llvm',
   'lvandeve_git':  'https://github.com/lvandeve',
   'swiftshader_git': 'https://swiftshader.googlesource.com',
   'microsoft_git': 'https://github.com/Microsoft',
 
-  'clspv_clang_revision': '834a93f953ac6789f39dbeb86d8144f847807353',
-  'clspv_llvm_revision': 'e35805b8192297a81e795573614274b904785a7d',
-  'clspv_revision': '64a51387967ea2a26e4a52a22ad8640148194edc',
+  'clspv_llvm_revision': '97aa42f5dfcd10ca6df230caf9ca7868da5f25af',
+  'clspv_revision': '8132fc9122f7709149dd82b25283e244bbe666a6',
   'cpplint_revision': '9f41862c0efa7681e2147910d39629c73a2b2702',
   'dxc_revision': 'ec912b2ec95feb50925704dd631ef7abee1a5f09',
   'glslang_revision': '8aa9a7bb8f74869ab9cfd2c9bd51cef1741004e7',
@@ -28,10 +27,7 @@ deps = {
   'third_party/clspv': vars['google_git'] + '/clspv.git@' +
       vars['clspv_revision'],
 
-  'third_party/clspv-clang': vars['llvm_git'] + '/clang.git@' +
-      vars['clspv_clang_revision'],
-
-  'third_party/clspv-llvm': vars['llvm_git'] + '/llvm.git@' +
+  'third_party/clspv-llvm': vars['llvm_git'] + '/llvm-project.git@' +
       vars['clspv_llvm_revision'],
 
   'third_party/cpplint': vars['google_git'] + '/styleguide.git@' +
diff --git a/kokoro/scripts/linux/build.sh b/kokoro/scripts/linux/build.sh
index f7043fe..f5cd478 100644
--- a/kokoro/scripts/linux/build.sh
+++ b/kokoro/scripts/linux/build.sh
@@ -29,9 +29,10 @@ BUILD_TYPE="Debug"
 CMAKE_C_CXX_COMPILER=""
 if [ $COMPILER = "clang" ]
 then
-  sudo ln -s /usr/bin/clang-3.8 /usr/bin/clang
-  sudo ln -s /usr/bin/clang++-3.8 /usr/bin/clang++
-  CMAKE_C_CXX_COMPILER="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++"
+  CMAKE_C_CXX_COMPILER="-DCMAKE_C_COMPILER=/usr/bin/clang-5.0 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-5.0"
+else
+  # Use newer gcc than default.
+  CMAKE_C_CXX_COMPILER="-DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DCMAKE_CXX_COMPILER=/usr/bin/g++-5"
 fi
 
 # Possible configurations are:
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index db865ad..118a594 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -130,10 +130,11 @@ if (${AMBER_ENABLE_DXC})
 endif()
 
 if (${AMBER_ENABLE_CLSPV})
-  set(CLSPV_LLVM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-llvm" CACHE STRING "")
-  set(CLSPV_CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-clang" CACHE STRING "")
+  set(CLSPV_LLVM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-llvm/llvm" CACHE STRING "")
+  set(CLSPV_CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-llvm/clang" CACHE STRING "")
   set(SPIRV_HEADERS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers" CACHE STRING "")
   set(SPIRV_TOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools" CACHE STRING "")
+  set(LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL 0 FORCE)
 
   set(LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN ON CACHE STRING "")
   set(LLVM_BUILD_STATIC ON CACHE BOOL "")