[zorg] r306993 - [sanitizers] Use CCACHE on android bot and minimize llvm_build64 cmake calls

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Sun Jul  2 14:54:33 2017
New Revision: 306993

URL: http://llvm.org/viewvc/llvm-project?rev=306993&view=rev
Log:
[sanitizers] Use CCACHE on android bot and minimize llvm_build64 cmake calls

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh?rev=306993&r1=306992&r2=306993&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh Sun Jul  2 14:54:33 2017
@@ -21,7 +21,12 @@ STAGE1_DIR=llvm_build0
 STAGE1_CLOBBER="llvm_build64 compiler_rt_build_android_* llvm_build_android_*"
 LLVM=$ROOT/llvm
 CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_PARALLEL_LINK_JOBS=20 -DLLVM_APPEND_VC_REV=OFF"
-BUILD_TYPE=Release
+
+export CCACHE_DIR=$ROOT/ccache
+export CCACHE_COMPILERCHECK=content
+if ccache -sM 20 ; then
+  CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_CCACHE_BUILD=ON"
+fi
 
 if [ "$BUILDBOT_CLOBBER" != "" ]; then
   echo @@@BUILD_STEP clobber@@@
@@ -48,12 +53,12 @@ CMAKE_COMMON_OPTIONS="$CMAKE_COMMON_OPTI
 CMAKE_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_ENABLE_WERROR=ON -DCMAKE_C_COMPILER=${CLANG_PATH}/clang -DCMAKE_CXX_COMPILER=${CLANG_PATH}/clang++ -DCMAKE_C_FLAGS=-gmlt -DCMAKE_CXX_FLAGS=-gmlt"
 
 echo @@@BUILD_STEP bootstrap clang@@@
-if [ ! -d llvm_build64 ]; then
-  mkdir llvm_build64
+if  [[ "$(cat llvm_build64/CMAKE_OPTIONS)" != ${CMAKE_OPTIONS} ]] ; then
+  mkdir -p llvm_build64
+  (cd llvm_build64 && cmake ${CMAKE_OPTIONS} -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON $LLVM && \
+     echo ${CMAKE_OPTIONS} > llvm_build64/CMAKE_OPTIONS) || echo @@@STEP_FAILURE@@
 fi
-(cd llvm_build64 && cmake ${CMAKE_OPTIONS} -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON $LLVM && ninja) || echo @@@STEP_FAILURE@@
-
-CMAKE_COMMON_OPTIONS=-DLLVM_ENABLE_ASSERTIONS=ON
+ninja -C llvm_build64 || echo @@@STEP_FAILURE@@
 
 build_android_ndk aarch64 arm64
 build_android_ndk arm arm

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=306993&r1=306992&r2=306993&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Sun Jul  2 14:54:33 2017
@@ -45,10 +45,15 @@ function configure_android { # ARCH trip
   local ANDROID_EXEC_OUTPUT_DIR=$ROOT/llvm_build64/bin
   local ANDROID_FLAGS="--target=$_triple --sysroot=$ANDROID_TOOLCHAIN/sysroot -B$ANDROID_TOOLCHAIN"
 
+  # Always clobber android build tree.
+  # It has a hidden dependency on clang (through CXX) which is not known to
+  # the build system.
+  rm -rf compiler_rt_build_android_$_arch
+  mkdir -p compiler_rt_build_android_$_arch
   rm -rf llvm_build_android_$_arch
   mkdir -p llvm_build_android_$_arch
-  (cd llvm_build_android_$_arch && cmake -GNinja \
-    -DCMAKE_BUILD_TYPE=Release \
+
+  (cd llvm_build_android_$_arch && cmake \
     -DLLVM_ENABLE_WERROR=OFF \
     -DCMAKE_C_COMPILER=$ROOT/llvm_build64/bin/clang \
     -DCMAKE_CXX_COMPILER=$ROOT/llvm_build64/bin/clang++ \
@@ -61,12 +66,7 @@ function configure_android { # ARCH trip
     ${CMAKE_COMMON_OPTIONS} \
     $LLVM || echo @@@STEP_FAILURE@@@) &
   
-  # Always clobber android build tree.
-  # It has a hidden dependency on clang (through CXX) which is not known to
-  # the build system.
-  rm -rf compiler_rt_build_android_$_arch
-  mkdir compiler_rt_build_android_$_arch
-  (cd compiler_rt_build_android_$_arch && cmake -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+  (cd compiler_rt_build_android_$_arch && cmake \
     -DCMAKE_C_COMPILER=$ROOT/llvm_build64/bin/clang \
     -DCMAKE_CXX_COMPILER=$ROOT/llvm_build64/bin/clang++ \
     -DLLVM_CONFIG_PATH=$ROOT/llvm_build64/bin/llvm-config \