This is an archive of the discontinued LLVM Phabricator instance.

Differential D25058

Remove code duplication
ClosedPublic

Authored by vitalybuka on Sep 28 2016, 5:30 PM.

Details

Reviewers
eugenis
Commits
rZORG3e67d6a47b4c: Remove code duplication
rL282677: Remove code duplication

Diff Detail

Event Timeline

vitalybuka updated this revision to Diff 72933.Sep 28 2016, 5:30 PM
vitalybuka retitled this revision from to Remove code duplication.
vitalybuka updated this object.
vitalybuka added a reviewer: eugenis.
Herald added subscribers: mgorny, beanz, srhines and 2 others. · View Herald TranscriptSep 28 2016, 5:30 PM
eugenis accepted this revision.Sep 28 2016, 5:38 PM
eugenis edited edge metadata.

LGTM,
please make sure that the new tests this adds pass

zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
264

it's called "triple" :)

This revision is now accepted and ready to land.Sep 28 2016, 5:38 PM
vitalybuka updated this revision to Diff 72934.Sep 28 2016, 5:42 PM
vitalybuka edited edge metadata.

spelling

vitalybuka updated this revision to Diff 72944.Sep 28 2016, 8:00 PM

Update

Closed by commit rL282677: Remove code duplication (authored by vitalybuka). · Explain WhySep 28 2016, 8:01 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
zorg/
buildbot/
builders/
sanitizers/
181 lines

Diff 72934

zorg/buildbot/builders/sanitizers/buildbot_cmake.sh

Show First 20 Lines • Show All 129 Lines • ▼ Show 20 Lines
if [ ! -z ${ENABLE_LIBCXX_FLAG} ]; then if [ ! -z ${ENABLE_LIBCXX_FLAG} ]; then
(cd clang_build && make -C ${LLVM_CHECKOUT}/projects/libcxx installheaders \ (cd clang_build && make -C ${LLVM_CHECKOUT}/projects/libcxx installheaders \
HEADER_DIR=${PWD}/include) || echo @@@STEP_FAILURE@@@ HEADER_DIR=${PWD}/include) || echo @@@STEP_FAILURE@@@
fi fi
# Do a sanity check on Linux: build and test sanitizers using gcc as a host # Do a sanity check on Linux: build and test sanitizers using gcc as a host
# compiler. # compiler.
if [ "$PLATFORM" == "Linux" ]; then if [ "$PLATFORM" == "Linux" ]; then
echo @@@BUILD_STEP check-sanitizer in gcc build@@@ check_in_gcc() {
(cd clang_build && make -j$MAKE_JOBS check-sanitizer) || echo @@@STEP_FAILURE@@@ CONDITION=$1
if [ "$CHECK_ASAN" == "1" ]; then SANITIZER=$2
echo @@@BUILD_STEP check-asan in gcc build@@@ if [ "$CONDITION" == "1" ]; then
(cd clang_build && make -j$MAKE_JOBS check-asan) || echo @@@STEP_FAILURE@@@ echo @@@BUILD_STEP check-$SANITIZER in gcc build@@@
fi (cd clang_build && make -j$MAKE_JOBS check-$SANITIZER) || echo @@@STEP_FAILURE@@@
if [ "$CHECK_UBSAN" == "1" ]; then fi
echo @@@BUILD_STEP check-ubsan in gcc build@@@ }
(cd clang_build && make -j$MAKE_JOBS check-ubsan) || echo @@@STEP_FAILURE@@@ check_in_gcc 1 sanitizer
fi check_in_gcc $CHECK_ASAN asan
if [ "$CHECK_LSAN" == "1" ]; then check_in_gcc $CHECK_CFI cfi-and-supported
echo @@@BUILD_STEP check-lsan in gcc build@@@ check_in_gcc $CHECK_DFSAN dfsan
(cd clang_build && make -j$MAKE_JOBS check-lsan) || echo @@@STEP_FAILURE@@@ check_in_gcc $CHECK_LSAN lsan
fi check_in_gcc $CHECK_MSAN msan
if [ "$CHECK_MSAN" == "1" ]; then check_in_gcc $CHECK_TSAN tsan
echo @@@BUILD_STEP check-msan in gcc build@@@ check_in_gcc $CHECK_UBSAN ubsan
(cd clang_build && make -j$MAKE_JOBS check-msan) || echo @@@STEP_FAILURE@@@
fi
if [ "$CHECK_TSAN" == "1" ]; then
echo @@@BUILD_STEP check-tsan in gcc build@@@
(cd clang_build && make -j$MAKE_JOBS check-tsan) || echo @@@STEP_FAILURE@@@
fi
if [ "$CHECK_DFSAN" == "1" ]; then
echo @@@BUILD_STEP check-dfsan in gcc build@@@
(cd clang_build && make -j$MAKE_JOBS check-dfsan) || echo @@@STEP_WARNINGS@@@
fi
if [ "$CHECK_CFI" == "1" ]; then
echo @@@BUILD_STEP check-cfi-and-supported in gcc build@@@
(cd clang_build && make -j$MAKE_JOBS check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
fi
fi fi
### From now on we use just-built Clang as a host compiler ### ### From now on we use just-built Clang as a host compiler ###
CLANG_PATH=${ROOT}/clang_build/bin CLANG_PATH=${ROOT}/clang_build/bin
# Build self-hosted tree with fresh Clang and -Werror. # Build self-hosted tree with fresh Clang and -Werror.
CMAKE_CLANG_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" CMAKE_CLANG_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"
BUILD_TYPE=Release BUILD_TYPE=Release
echo @@@BUILD_STEP bootstrap clang@@@ echo @@@BUILD_STEP bootstrap clang@@@
if [ ! -d llvm_build64 ]; then if [ ! -d llvm_build64 ]; then
mkdir llvm_build64 mkdir llvm_build64
fi fi
(cd llvm_build64 && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ (cd llvm_build64 && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
${CMAKE_CLANG_OPTIONS} -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \ ${CMAKE_CLANG_OPTIONS} -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
${ENABLE_LIBCXX_FLAG} $LLVM_CHECKOUT) ${ENABLE_LIBCXX_FLAG} $LLVM_CHECKOUT)
# First, build only Clang. # First, build only Clang.
(cd llvm_build64 && make -j$MAKE_JOBS clang) || echo @@@STEP_FAILURE@@@ (cd llvm_build64 && make -j$MAKE_JOBS clang) || echo @@@STEP_FAILURE@@@
# If needed, install the headers to clang_build/include. # If needed, install the headers to clang_build/include.
if [ ! -z ${ENABLE_LIBCXX_FLAG} ]; then if [ ! -z ${ENABLE_LIBCXX_FLAG} ]; then
(cd llvm_build64 && make -C ${LLVM_CHECKOUT}/projects/libcxx installheaders \ (cd llvm_build64 && make -C ${LLVM_CHECKOUT}/projects/libcxx installheaders \
HEADER_DIR=${PWD}/include) || echo @@@STEP_FAILURE@@@ HEADER_DIR=${PWD}/include) || echo @@@STEP_FAILURE@@@
fi fi
# Now build everything else. # Now build everything else.
(cd llvm_build64 && make -j$MAKE_JOBS) || echo @@@STEP_FAILURE@@@ (cd llvm_build64 && make -j$MAKE_JOBS) || echo @@@STEP_FAILURE@@@
# FIXME: Make these true dependencies of check-cfi-and-supported when
# compiler-rt is configured as an external project.
(cd llvm_build64 && make -j$MAKE_JOBS LLVMgold opt sanstats) || echo @@@STEP_FAILURE@@@
FRESH_CLANG_PATH=${ROOT}/llvm_build64/bin FRESH_CLANG_PATH=${ROOT}/llvm_build64/bin
COMPILER_RT_BUILD_PATH=projects/compiler-rt/src/compiler-rt-build COMPILER_RT_BUILD_PATH=projects/compiler-rt/src/compiler-rt-build
if [ "$CHECK_ASAN" == "1" ]; then check_64bit() {
echo @@@BUILD_STEP run asan tests@@@ CONDITION=$1
(cd llvm_build64 && make -j$MAKE_JOBS check-asan) || echo @@@STEP_FAILURE@@@ SANITIZER=$2
fi if ["$CONDITION" == "1" ]; then
echo @@@BUILD_STEP 64-bit check-$SANITIZER@@@
if [ "$PLATFORM" == "Linux" -a "$CHECK_ASAN" == "1" ]; then (cd llvm_build64 && make -j$MAKE_JOBS check-$SANITIZER) || echo @@@STEP_FAILURE@@@
echo @@@BUILD_STEP run asan-dynamic tests@@@
(cd llvm_build64 && make -j$MAKE_JOBS check-asan-dynamic) || echo @@@STEP_FAILURE@@@
fi
if [ "$PLATFORM" == "Linux" -a "$CHECK_MSAN" == "1" ]; then
echo @@@BUILD_STEP run msan unit tests@@@
(cd llvm_build64 && make -j$MAKE_JOBS check-msan) || echo @@@STEP_FAILURE@@@
fi
if [ "$PLATFORM" == "Linux" -a "$CHECK_TSAN" == "1" ]; then
echo @@@BUILD_STEP run 64-bit tsan unit tests@@@
(cd llvm_build64 && make -j$MAKE_JOBS check-tsan) || echo @@@STEP_FAILURE@@@
fi
if [ "$PLATFORM" == "Linux" -a "$CHECK_LSAN" == "1" ]; then
echo @@@BUILD_STEP run 64-bit lsan unit tests@@@
(cd llvm_build64 && make -j$MAKE_JOBS check-lsan) || echo @@@STEP_FAILURE@@@
fi
if [ "$PLATFORM" == "Linux" -a "$CHECK_DFSAN" == "1" ]; then
echo @@@BUILD_STEP run 64-bit dfsan unit tests@@@
(cd llvm_build64 && make -j$MAKE_JOBS check-dfsan) || echo @@@STEP_FAILURE@@@
fi fi
}
if [ "$PLATFORM" == "Linux" -a "$CHECK_CFI" == "1" ]; then check_64bit 1 sanitizer
echo @@@BUILD_STEP run 64-bit cfi unit tests@@@ check_64bit $CHECK_ASAN asan
# FIXME: Make these true dependencies of check-cfi-and-supported when if [ "$PLATFORM" == "Linux" ]; then
# compiler-rt is configured as an external project. check_64bit $CHECK_ASAN asan-dynamic
(cd llvm_build64 && make -j$MAKE_JOBS LLVMgold opt sanstats && make -j$MAKE_JOBS check-cfi-and-supported) || echo @@@STEP_FAILURE@@@ check_64bit $CHECK_CFI cfi-and-supported
check_64bit $CHECK_DFSAN dfsan
check_64bit $CHECK_LSAN lsan
check_64bit $CHECK_MSAN msan
check_64bit $CHECK_TSAN tsan
check_64bit $CHECK_UBSAN ubsan
fi fi
echo @@@BUILD_STEP run sanitizer_common tests@@@ echo @@@BUILD_STEP run sanitizer_common tests@@@
(cd llvm_build64 && make -j$MAKE_JOBS check-sanitizer) || echo @@@STEP_FAILURE@@@ (cd llvm_build64 && make -j$MAKE_JOBS check-sanitizer) || echo @@@STEP_FAILURE@@@
echo @@@BUILD_STEP build standalone compiler-rt@@@ echo @@@BUILD_STEP build standalone compiler-rt@@@
if [ ! -d compiler_rt_build ]; then if [ ! -d compiler_rt_build ]; then
mkdir compiler_rt_build mkdir compiler_rt_build
Show All 16 Linesif [ "$PLATFORM" == "Linux" -a $HAVE_NINJA == 1 ]; then
if [ ! -d llvm_build_ninja ]; then if [ ! -d llvm_build_ninja ]; then
mkdir llvm_build_ninja mkdir llvm_build_ninja
fi fi
CMAKE_NINJA_OPTIONS="${CMAKE_CLANG_OPTIONS} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja" CMAKE_NINJA_OPTIONS="${CMAKE_CLANG_OPTIONS} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja"
(cd llvm_build_ninja && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ (cd llvm_build_ninja && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
${CMAKE_NINJA_OPTIONS} $LLVM_CHECKOUT) ${CMAKE_NINJA_OPTIONS} $LLVM_CHECKOUT)
ln -sf llvm_build_ninja/compile_commands.json $LLVM_CHECKOUT ln -sf llvm_build_ninja/compile_commands.json $LLVM_CHECKOUT
(cd llvm_build_ninja && ninja) || echo @@@STEP_FAILURE@@@ (cd llvm_build_ninja && ninja) || echo @@@STEP_FAILURE@@@
echo @@@BUILD_STEP ninja check-sanitizer@@@
(cd llvm_build_ninja && ninja check-sanitizer) || echo @@@STEP_FAILURE@@@ check_ninja() {
if [ "$CHECK_ASAN" == 1 ]; then CONDITION=$1
echo @@@BUILD_STEP ninja check-asan@@@ SANITIZER=$2
(cd llvm_build_ninja && ninja check-asan) || echo @@@STEP_FAILURE@@@ if ["$CONDITION" == "1" ]; then
fi echo @@@BUILD_STEP ninja check-$SANITIZER@@@
if [ "$CHECK_UBSAN" == 1 ]; then (cd llvm_build_ninja && ninja check-$SANITIZER) || echo @@@STEP_FAILURE@@@
echo @@@BUILD_STEP ninja check-ubsan@@@ fi
(cd llvm_build_ninja && ninja check-ubsan) || echo @@@STEP_FAILURE@@@ }
fi
if [ "$CHECK_TSAN" == 1 ]; then check_ninja 1 sanitizer
echo @@@BUILD_STEP ninja check-tsan@@@ check_ninja $CHECK_ASAN asan
(cd llvm_build_ninja && ninja check-tsan) || echo @@@STEP_FAILURE@@@ check_ninja $CHECK_CFI cfi-and-supported
fi check_ninja $CHECK_DFSAN dfsan
if [ "$CHECK_SCUDO" == 1 ]; then check_ninja $CHECK_LSAN lsan
echo @@@BUILD_STEP ninja check-scudo@@@ check_ninja $CHECK_MSAN msan
(cd llvm_build_ninja && ninja check-scudo) || echo @@@STEP_FAILURE@@@ check_ninja $CHECK_TSAN tsan
fi check_ninja $CHECK_UBSAN ubsan
if [ "$CHECK_MSAN" == 1 ]; then
echo @@@BUILD_STEP ninja check-msan@@@
(cd llvm_build_ninja && ninja check-msan) || echo @@@STEP_FAILURE@@@
fi
if [ "$CHECK_LSAN" == 1 ]; then
echo @@@BUILD_STEP ninja check-lsan@@@
(cd llvm_build_ninja && ninja check-lsan) || echo @@@STEP_FAILURE@@@
fi
if [ "$CHECK_DFSAN" == 1 ]; then
echo @@@BUILD_STEP ninja check-dfsan@@@
(cd llvm_build_ninja && ninja check-dfsan) || echo @@@STEP_WARNINGS@@@
fi
if [ "$CHECK_CFI" == 1 ]; then
echo @@@BUILD_STEP ninja check-cfi-and-supported@@@
(cd llvm_build_ninja && ninja check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
fi
fi fi
if [ $BUILD_ANDROID == 1 ] ; then if [ $BUILD_ANDROID == 1 ] ; then
build_android() {
CPU=$1
TRIPLE=$2
echo @@@BUILD_STEP build compiler-rt android/$CPU@@@
build_compiler_rt $CPU $TRIPLE
eugenisUnsubmitted
Not Done
ReplyInline Actions

it's called "triple" :)

eugenis: it's called "triple" :)
echo @@@BUILD_STEP build llvm-symbolizer android/$CPU@@@
build_llvm_symbolizer $CPU $TRIPLE
}
# Testing armv7 instead of plain arm to work around # Testing armv7 instead of plain arm to work around
# https://code.google.com/p/android/issues/detail?id=68779 # https://code.google.com/p/android/issues/detail?id=68779
echo @@@BUILD_STEP build compiler-rt android/arm@@@ build_android arm armv7-linux-androideabi
build_compiler_rt arm armv7-linux-androideabi build_android x86 i686-linux-android
echo @@@BUILD_STEP build llvm-symbolizer android/arm@@@ build_android aarch64 aarch64-linux-android
build_llvm_symbolizer arm armv7-linux-androideabi
echo @@@BUILD_STEP build compiler-rt android/x86@@@
build_compiler_rt x86 i686-linux-android
echo @@@BUILD_STEP build llvm-symbolizer android/x86@@@
build_llvm_symbolizer x86 i686-linux-android
echo @@@BUILD_STEP build compiler-rt android/aarch64@@@
build_compiler_rt aarch64 aarch64-linux-android
echo @@@BUILD_STEP build llvm-symbolizer android/aarch64@@@
build_llvm_symbolizer aarch64 aarch64-linux-android
fi fi
if [ $RUN_ANDROID == 1 ] ; then if [ $RUN_ANDROID == 1 ] ; then
test_android arm armeabi-v7a @@@STEP_FAILURE@@@ test_android arm armeabi-v7a @@@STEP_FAILURE@@@
test_android x86 x86 @@@STEP_FAILURE@@@ test_android x86 x86 @@@STEP_FAILURE@@@
test_android aarch64 arm64-v8a @@@STEP_FAILURE@@@ test_android aarch64 arm64-v8a @@@STEP_FAILURE@@@
fi fi