[zorg] r320367 - [zorg] Cleanup CC/CXX settings for Linaro Arm/AArch64 bots
Diana Picus via llvm-commits
llvm-commits at lists.llvm.org
Mon Dec 11 06:31:20 PST 2017
Author: rovka
Date: Mon Dec 11 06:31:20 2017
New Revision: 320367
URL: http://llvm.org/viewvc/llvm-project?rev=320367&view=rev
Log:
[zorg] Cleanup CC/CXX settings for Linaro Arm/AArch64 bots
Move settings from environment variables to CMAKE_* parameters.
Differential Revision: https://reviews.llvm.org/D40608
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=320367&r1=320366&r2=320367&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Dec 11 06:31:20 2017
@@ -190,13 +190,14 @@ def _get_clang_builders():
test=False,
useTwoStage=False,
runTestSuite=True,
- env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
testsuite_flags=['--cppflags', '-O3 -mcpu=cortex-a15 -mthumb',
'--threads=1', '--build-threads=4',
'--use-perf=all',
'--benchmarking-only', '--exec-multisample=3',
'--exclude-stat-from-submission=compile'],
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'",
"-DLLVM_TARGETS_TO_BUILD='ARM'",
"-DLLVM_PARALLEL_LINK_JOBS=2"],
@@ -215,10 +216,11 @@ def _get_clang_builders():
test=False,
useTwoStage=False,
runTestSuite=True,
- env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -marm',
'--threads=4', '--build-threads=4'],
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM'",
"-DLLVM_PARALLEL_LINK_JOBS=2"])},
@@ -234,9 +236,10 @@ def _get_clang_builders():
checkout_lld=False,
useTwoStage=True,
testStage1=False,
- env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
- 'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
+ env={'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j2'",
@@ -251,8 +254,9 @@ def _get_clang_builders():
clean=False,
checkout_compiler_rt=False,
checkout_lld=False,
- env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j4'",
@@ -267,8 +271,9 @@ def _get_clang_builders():
clean=False,
checkout_compiler_rt=False,
checkout_lld=False,
- env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -mthumb'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -mthumb'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -mthumb'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j4'",
@@ -285,8 +290,9 @@ def _get_clang_builders():
checkout_lld=False,
useTwoStage=True,
testStage1=False,
- env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j4'",
@@ -305,9 +311,10 @@ def _get_clang_builders():
runTestSuite=True,
testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
'--threads=8', '--build-threads=8'],
- env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
- 'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+ env={'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
)},
@@ -329,8 +336,11 @@ def _get_clang_builders():
testsuite_flags=['--cppflags',
'-mcpu=cortex-a57 -fuse-ld=lld',
'--threads=8', '--build-threads=8'],
- env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_COMPILER='clang'",
+ "-DCMAKE_CXX_COMPILER='clang++'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
"-DLLVM_ENABLE_LLD=True"],
@@ -351,8 +361,9 @@ def _get_clang_builders():
testsuite_flags=['--cppflags',
'-mcpu=cortex-a57 -O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
'--threads=8', '--build-threads=8'],
- env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
)},
@@ -1022,8 +1033,9 @@ def _get_sanitizer_builders():
jobs=4,
clean=False,
checkout_lld=False,
- env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
@@ -1040,8 +1052,9 @@ def _get_sanitizer_builders():
checkout_lld=False,
useTwoStage=True,
testStage1=False,
- env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'",
"-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mthumb'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
@@ -1062,8 +1075,9 @@ def _get_sanitizer_builders():
runTestSuite=True,
testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
'--threads=8', '--build-threads=8'],
- env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
- extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+ extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+ "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
)},
@@ -1340,11 +1354,14 @@ def _get_libcxx_builders():
'builddir': 'libcxx-libcxxabi-libunwind-arm-linux',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
- env={'CC': 'clang', 'CXX': 'clang++', 'PATH': '/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin'},
# FIXME: there should be a way to merge autodetected with user-defined linker flags
# See: libcxxabi/test/lit.cfg
lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
- cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+ cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
+ 'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
+ 'CMAKE_C_COMPILER': 'clang',
+ 'CMAKE_CXX_COMPILER': 'clang++',
+ 'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -marm',
'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -marm',
'LLVM_PARALLEL_LINK_JOBS': '2'})},
@@ -1354,11 +1371,14 @@ def _get_libcxx_builders():
'builddir': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
- env={'CC': 'clang', 'CXX': 'clang++', 'PATH': '/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin'},
# FIXME: there should be a way to merge autodetected with user-defined linker flags
# See: libcxxabi/test/lit.cfg
lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
- cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+ cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
+ 'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
+ 'CMAKE_C_COMPILER': 'clang',
+ 'CMAKE_CXX_COMPILER': 'clang++',
+ 'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
@@ -1371,12 +1391,16 @@ def _get_libcxx_builders():
'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
- # FIXME: CFLAGS / CXXFLAGS are here because cmake_extra_opts doesn't quote correctly
- env={'CC': 'clang', 'CXX': 'clang++', 'CFLAGS': '-mcpu=cortex-a57', 'CXXFLAGS': '-mcpu=cortex-a57'},
# FIXME: there should be a way to merge autodetected with user-defined linker flags
# See: libcxxabi/test/lit.cfg
lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
- cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+ cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
+ 'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
+ 'CMAKE_C_COMPILER': 'clang',
+ 'CMAKE_CXX_COMPILER': 'clang++',
+ 'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+ 'CMAKE_C_FLAGS': '-mcpu=cortex-a57',
+ 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57',
'LLVM_PARALLEL_LINK_JOBS': '4'})},
{'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
@@ -1384,14 +1408,18 @@ def _get_libcxx_builders():
'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
- # FIXME: CFLAGS / CXXFLAGS are here because cmake_extra_opts doesn't quote correctly
- env={'CC': 'clang', 'CXX': 'clang++', 'CFLAGS': '-mcpu=cortex-a57', 'CXXFLAGS': '-mcpu=cortex-a57'},
# FIXME: there should be a way to merge autodetected with user-defined linker flags
# See: libcxxabi/test/lit.cfg
lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
- cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+ cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
+ 'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
+ 'CMAKE_C_COMPILER': 'clang',
+ 'CMAKE_CXX_COMPILER': 'clang++',
+ 'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
+ 'CMAKE_C_FLAGS': '-mcpu=cortex-a57',
+ 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57',
'LLVM_PARALLEL_LINK_JOBS': '4'})},
]
More information about the llvm-commits
mailing list