diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -302,8 +302,7 @@ runTestSuite=True, testsuite_flags=[ '--cppflags', '-mcpu=cortex-a15 -marm', - '--threads=32', '--build-threads=32'], - extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM'"])}, + '--threads=32', '--build-threads=32'])}, ## ARMv7 check-all self-host NEON with CMake builder {'name' : "clang-cmake-armv7-selfhost-neon", @@ -318,10 +317,9 @@ testStage1=False, extra_cmake_args=[ "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'", - "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'", - "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])}, + "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'"])}, - ## ARMv7 check-all with CMake builder + ## ARMv7 Clang+LLVM check-all {'name' : "clang-cmake-armv7-quick", 'tags' : ["clang"], 'workernames':["linaro-armv7-quick"], @@ -330,7 +328,8 @@ clean=False, checkout_compiler_rt=False, checkout_lld=False, - extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])}, + test=True, + extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM'"])}, ## ARMv7 Clang + LLVM run test-suite with GlobalISel enabled {'name' : "clang-cmake-armv7-global-isel", @@ -346,8 +345,7 @@ runTestSuite=True, testsuite_flags=[ '--cppflags', '-mcpu=cortex-a15 -marm -O0 -mllvm -global-isel -mllvm -global-isel-abort=0', - '--threads=32', '--build-threads=32'], - extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])}, + '--threads=32', '--build-threads=32'])}, ## ARMv7 check-all self-host with CMake builder {'name' : "clang-cmake-armv7-selfhost", @@ -362,10 +360,9 @@ testStage1=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'"])}, + "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'"])}, - ## AArch64 Clang+LLVM check-all + test-suite + ## AArch64 Clang+LLVM check-all {'name' : "clang-cmake-aarch64-quick", 'tags' : ["clang"], 'workernames' : ["linaro-aarch64-quick"], @@ -375,11 +372,7 @@ checkout_compiler_rt=False, checkout_lld=False, test=True, - useTwoStage=False, - testsuite_flags=[ - '--cppflags', '-mcpu=cortex-a57', - '--threads=32', '--build-threads=32'], - extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])}, + extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='AArch64'"])}, ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite {'name' : "clang-cmake-aarch64-lld", @@ -399,7 +392,6 @@ extra_cmake_args=[ "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'", "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'", - "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'", "-DLLVM_ENABLE_LLD=True"])}, ## AArch64 Clang+LLVM run test-suite at -O0 (GlobalISel is now default). @@ -416,8 +408,7 @@ runTestSuite=True, testsuite_flags=[ '--cppflags', '-O0', - '--threads=32', '--build-threads=32'], - extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])}, + '--threads=32', '--build-threads=32'])}, ## ARMv7 without neon; check-all 2-stage full compiler-rt + testsuite {'name' : "clang-cmake-armv7-full", @@ -436,7 +427,6 @@ '--threads=4', '--build-threads=4'], extra_cmake_args=[ "-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'", - "-DLLVM_TARGETS_TO_BUILD='ARM'", "-DLLVM_PARALLEL_LINK_JOBS=2"])}, ## ARMv7 Thumb2 with neon; check-all 2-stage full compiler-rt + testsuite @@ -458,7 +448,6 @@ "-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'", "-DLLVM_PARALLEL_LINK_JOBS=2"])}, ## AArch32 Self-hosting Clang+LLVM check-all + LLD + test-suite @@ -480,7 +469,6 @@ extra_cmake_args=[ "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'", "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'", - "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'", "-DCOMPILER_RT_BUILD_SANITIZERS=OFF", "-DLLVM_ENABLE_LLD=True"])}, @@ -503,8 +491,25 @@ '--threads=32', '--build-threads=32'], extra_cmake_args=[ "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'", - "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'", - "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])}, + "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'"])}, + + # AArch64 Clang+LLVM+RT+LLD check-all + flang + test-suite w/SVE + {'name' : "clang-cmake-aarch64-sve-vls", + 'tags' : ["clang"], + 'workernames' : ["linaro-aarch64-sve-vls"], + 'builddir': "clang-cmake-aarch64-sve-vls", + 'factory' : ClangBuilder.getClangCMakeBuildFactory( + clean=False, + checkout_compiler_rt=True, + checkout_flang=True, + checkout_lld=True, + test=True, + useTwoStage=False, + testStage1=True, + runTestSuite=True, + testsuite_flags=[ + '--cppflags', '-mcpu=a64fx -mllvm -aarch64-sve-vector-bits-min=512', + '--threads=48', '--build-threads=48'])}, {'name' : "clang-arm64-windows-msvc-2stage", 'tags' : ["clang"], @@ -1446,7 +1451,6 @@ checks=['check-flang'], depends_on_projects=['llvm','mlir','clang','flang'], extra_configure_args=[ - "-DLLVM_TARGETS_TO_BUILD=AArch64", "-DLLVM_BUILD_LLVM_DYLIB=ON", "-DLLVM_LINK_LLVM_DYLIB=ON", "-DCMAKE_CXX_STANDARD=17", @@ -1461,7 +1465,6 @@ checks=['check-flang'], depends_on_projects=['llvm','mlir','clang','flang'], extra_configure_args=[ - "-DLLVM_TARGETS_TO_BUILD=AArch64", "-DBUILD_SHARED_LIBS=ON", "-DLLVM_BUILD_EXAMPLES=ON", "-DCMAKE_CXX_STANDARD=17", @@ -1474,7 +1477,6 @@ 'factory' : FlangBuilder.getFlangOutOfTreeBuildFactory( checks=['check-flang'], llvm_extra_configure_args=[ - "-DLLVM_TARGETS_TO_BUILD=AArch64", "-DCMAKE_CXX_STANDARD=17", "-DLLVM_ENABLE_WERROR=OFF", "-DLLVM_ENABLE_ASSERTIONS=ON", @@ -1494,7 +1496,6 @@ checks=['check-flang'], depends_on_projects=['llvm','mlir','clang','flang'], extra_configure_args=[ - "-DLLVM_TARGETS_TO_BUILD=AArch64", "-DCMAKE_BUILD_TYPE=Debug", "-DCMAKE_CXX_STANDARD=17", "-DLLVM_USE_LINKER=lld", @@ -1509,7 +1510,6 @@ checks=['check-flang'], depends_on_projects=['llvm','mlir','clang','flang'], extra_configure_args=[ - "-DLLVM_TARGETS_TO_BUILD=AArch64", "-DLLVM_INSTALL_UTILS=ON", "-DCMAKE_CXX_STANDARD=17", "-DLLVM_ENABLE_WERROR=OFF", @@ -1529,7 +1529,6 @@ checks=['check-flang'], depends_on_projects=['llvm','mlir','clang','flang'], extra_configure_args=[ - "-DLLVM_TARGETS_TO_BUILD=AArch64", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_CXX_STANDARD=17", ])}, @@ -1543,7 +1542,6 @@ checks=['check-flang'], depends_on_projects=['llvm','mlir','clang','flang'], extra_configure_args=[ - "-DLLVM_TARGETS_TO_BUILD=AArch64", "-DLLVM_ENABLE_ASSERTIONS=ON", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_CXX_STANDARD=17", @@ -1558,7 +1556,6 @@ checks=['check-flang'], depends_on_projects=['llvm','mlir','clang','flang'], extra_configure_args=[ - "-DLLVM_TARGETS_TO_BUILD=AArch64", "-DLLVM_INSTALL_UTILS=ON", "-DCMAKE_CXX_STANDARD=17", "-DLLVM_ENABLE_WERROR=OFF", diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py --- a/buildbot/osuosl/master/config/workers.py +++ b/buildbot/osuosl/master/config/workers.py @@ -44,6 +44,7 @@ create_worker("linaro-aarch64-full", properties={'jobs' : 32}, max_builds=1), create_worker("linaro-aarch64-global-isel", properties={'jobs' : 32}, max_builds=1), create_worker("linaro-aarch64-lld", properties={'jobs' : 32}, max_builds=1), + create_worker("linaro-aarch64-sve-vls", properties={'jobs' : 48}, max_builds=1), create_worker("linaro-aarch64-flang-oot", properties={'jobs' : 32}, max_builds=1), create_worker("linaro-aarch64-flang-debug", properties={'jobs' : 32}, max_builds=1), create_worker("linaro-aarch64-flang-latest-clang", properties={'jobs' : 32}, max_builds=1),