Index: buildbot/osuosl/master/config/builders.py =================================================================== --- buildbot/osuosl/master/config/builders.py +++ buildbot/osuosl/master/config/builders.py @@ -200,7 +200,6 @@ 'slavenames':["linaro-tk1-02"], 'builddir':"clang-native-arm-lnt-perf", 'factory' : ClangBuilder.getClangCMakeBuildFactory( - jobs=4, clean=False, checkout_compiler_rt=False, checkout_lld=False, @@ -212,9 +211,7 @@ '--use-perf=all', '--benchmarking-only', '--exec-multisample=3', '--exclude-stat-from-submission=compile'], - extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'", - "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'", - "-DLLVM_TARGETS_TO_BUILD='ARM'", + extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM'", "-DLLVM_PARALLEL_LINK_JOBS=2"], submitURL='http://lnt.llvm.org/submitRun', testerName='LNT-Thumb2v7-A15-O3')}, @@ -232,9 +229,7 @@ runTestSuite=True, testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -marm', '--threads=4', '--build-threads=4'], - extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'", - "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'", - "-DLLVM_TARGETS_TO_BUILD='ARM'", + extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM'", "-DLLVM_PARALLEL_LINK_JOBS=2"])}, ## Cortex-A15 check-all self-host NEON with CMake builder @@ -250,7 +245,6 @@ extra_cmake_args=["-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'", "-DLLVM_PARALLEL_LINK_JOBS=2"])}, ## Cortex-A15 check-all with CMake builder @@ -261,10 +255,7 @@ clean=False, checkout_compiler_rt=False, checkout_lld=False, - extra_cmake_args=["-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'", + extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'", "-DLLVM_PARALLEL_LINK_JOBS=2"])}, ## Cortex-A15 check-all self-host with CMake builder @@ -280,7 +271,6 @@ extra_cmake_args=["-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'", "-DLLVM_PARALLEL_LINK_JOBS=2"])}, ## AArch64 Clang+LLVM check-all + test-suite @@ -296,9 +286,7 @@ runTestSuite=True, testsuite_flags=['--cppflags', '-mcpu=cortex-a57', '--threads=8', '--build-threads=8'], - extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'", - "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'", - "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"], + extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"], )}, ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite @@ -315,8 +303,7 @@ test=True, useTwoStage=True, runTestSuite=True, - testsuite_flags=['--cppflags', - '-mcpu=cortex-a57 -fuse-ld=lld', + testsuite_flags=['--cppflags', '-mcpu=cortex-a57 -fuse-ld=lld', '--threads=8', '--build-threads=8'], extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'", "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'", @@ -336,12 +323,9 @@ test=True, useTwoStage=False, runTestSuite=True, - testsuite_flags=['--cppflags', - '-mcpu=cortex-a57 -O0 -mllvm -global-isel -mllvm -global-isel-abort=0', + testsuite_flags=['--cppflags', '-mcpu=cortex-a57 -O0 -mllvm -global-isel -mllvm -global-isel-abort=0', '--threads=8', '--build-threads=8'], - extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'", - "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'", - "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"], + extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"], )}, {'name': 'clang-x86-windows-msvc2015', @@ -1011,11 +995,8 @@ 'factory' : ClangBuilder.getClangCMakeBuildFactory( clean=False, checkout_lld=False, - extra_cmake_args=["-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'", + extra_cmake_args=["-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'", "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'", - "-DLLVM_LIT_ARGS='-sv -j4'", "-DLLVM_PARALLEL_LINK_JOBS=2"])}, ## Cortex-A15 Thumb2 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests @@ -1031,7 +1012,6 @@ "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'", "-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mthumb'", "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'", - "-DLLVM_LIT_ARGS='-sv -j2'", "-DLLVM_PARALLEL_LINK_JOBS=2"])}, # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting @@ -1308,8 +1288,6 @@ 'category': 'libcxx', 'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder( cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON', - 'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -marm', - 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -marm', 'LLVM_PARALLEL_LINK_JOBS': '2'})}, {'name': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions', @@ -1320,8 +1298,6 @@ cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON', 'LIBCXX_ENABLE_EXCEPTIONS': 'OFF', 'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF', - 'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb', - 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb', 'LLVM_PARALLEL_LINK_JOBS': '2'})}, # AArch64 LibC++ and LibC++abi tests (require Clang+RT) @@ -1331,8 +1307,6 @@ 'category': 'libcxx', 'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder( cmake_extra_opts={'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', @@ -1343,8 +1317,6 @@ cmake_extra_opts={'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'})}, ]