diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py index 0be26ae96..d0d13fa8d 100644 --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -697,39 +697,50 @@ def collapseRequestsDoxygen(master, builder, req1, req2): '-DLLVM_TARGETS_TO_BUILD=Mips'])}, {'name' : "clang-ppc64le-linux-test-suite", - 'tags' : ["clang", "ppc", "ppc64le"], + 'tags' : ["clang", "llvm", "compiler-rt", "clang-tools-extra", "flang", + "flang-rt", "mlir", "openmp", "ppc", "ppc64le"], 'workernames' : ["ppc64le-clang-test-suite"], 'builddir': "clang-ppc64le-test-suite", 'factory' : TestSuiteBuilder.getTestSuiteBuildFactory( - depends_on_projects=["llvm", "clang", "clang-tools-extra", - "compiler-rt"], - checks=['check-all'], + depends_on_projects=['llvm', "clang", "clang-tools-extra", + 'compiler-rt', 'mlir', 'clang', + 'flang','flang-rt','openmp'], + checks=['check-all', 'check-flang', + 'check-flang-rt','check-mlir', 'check-openmp'], extra_configure_args=[ "-DLLVM_ENABLE_ASSERTIONS=ON", "-DCMAKE_BUILD_TYPE=Release", "-DLLVM_LIT_ARGS=-v", + '-DLLVM_INSTALL_UTILS=ON', + '-DFLANG_ENABLE_WERROR=ON', "-DCMAKE_C_COMPILER_LAUNCHER=ccache", - "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"])}, + "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" + ], + env={ + 'CC': 'clang', + 'CXX': 'clang++', + 'LD': 'lld', + 'LD_LIBRARY_PATH': '/usr/lib64', + })}, {'name' : "clang-ppc64le-linux-multistage", - 'tags' : ["clang", "ppc", "ppc64le"], + 'tags' : ["clang", "llvm", "lld", "compiler-rt", "clang-tools-extra", "ppc", "ppc64le"], 'workernames' : ["ppc64le-clang-multistage-test"], 'builddir': "clang-ppc64le-multistage", - 'factory' : ClangBuilder.getClangCMakeBuildFactory( - clean=False, - checks=['check-all'], - checkout_lld=False, - useTwoStage=True, - stage1_config='Release', - stage2_config='Release', - extra_cmake_args=[ + 'factory' : UnifiedTreeBuilder.getCmakeWithNinjaMultistageBuildFactory( + extra_configure_args=[ '-DLLVM_ENABLE_ASSERTIONS=ON', + '-DLLVM_LIT_ARGS=-sv', '-DBUILD_SHARED_LIBS=ON', '-DCMAKE_C_COMPILER_LAUNCHER=ccache', - '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache'])}, + '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache'], + clean=False, + checks=['check-all'], + depends_on_projects=['llvm', 'clang', 'lld', 'compiler-rt', + 'clang-tools-extra'])}, {'name' : "clang-ppc64le-rhel", - 'tags' : ["clang", "ppc", "ppc64le"], + 'tags' : ["clang", "llvm", "lld", "compiler-rt", "clang-tools-extra", "ppc", "ppc64le"], 'workernames' : ["ppc64le-clang-rhel-test"], 'builddir': "clang-ppc64le-rhel", 'factory' : TestSuiteBuilder.getTestSuiteBuildFactory( @@ -1368,18 +1379,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2): # LLD builders. - {'name' : "ppc64le-lld-multistage-test", - 'tags' : ["lld", "ppc", "ppc64le"], - 'workernames' : ["ppc64le-lld-multistage-test"], - 'builddir': "ppc64le-lld-multistage-test", - 'factory' : UnifiedTreeBuilder.getCmakeWithNinjaMultistageBuildFactory( - extra_configure_args=[ - '-DLLVM_ENABLE_ASSERTIONS=ON', - '-DLLVM_LIT_ARGS=-svj 256', - '-DCMAKE_C_COMPILER_LAUNCHER=ccache', - '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache'], - depends_on_projects=['llvm', 'clang', 'lld'])}, - {'name' : "lld-x86_64-ubuntu-fast", 'tags' : ["lld"], 'collapseRequests': False, @@ -1498,32 +1497,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2): 'CXX': 'g++-7', })}, - {'name' : 'ppc64le-mlir-rhel-clang', - 'tags' : ["mlir", "ppc", "ppc64le"], - 'collapseRequests' : False, - 'workernames' : ['ppc64le-mlir-rhel-test'], - 'builddir': 'ppc64le-mlir-rhel-clang-build', - 'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory( - clean=True, - depends_on_projects=['llvm', 'mlir'], - targets = ['check-mlir-build-only'], - checks = ['check-mlir'], - extra_configure_args=[ - '-DLLVM_TARGETS_TO_BUILD=PowerPC', - '-DLLVM_INSTALL_UTILS=ON', - '-DCMAKE_CXX_STANDARD=17', - '-DLLVM_ENABLE_PROJECTS=mlir', - '-DLLVM_LIT_ARGS=-vj 256', - '-DCMAKE_C_COMPILER_LAUNCHER=ccache', - '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache', - ], - env={ - 'CC': 'clang', - 'CXX': 'clang++', - 'LD': 'lld', - 'LD_LIBRARY_PATH': '/usr/lib64', - })}, - {'name' : 'mlir-s390x-linux', 'tags' : ["mlir", "s390x"], 'workernames' : ["systemz-1"], @@ -2443,30 +2416,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2): "-DCMAKE_CXX_STANDARD=17", ])}, - {'name' : 'ppc64le-flang-rhel-clang', - 'tags' : ["flang", "ppc", "ppc64le"], - 'workernames' : ['ppc64le-flang-rhel-test'], - 'builddir': 'ppc64le-flang-rhel-clang-build', - 'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory( - clean=True, - depends_on_projects=['llvm', 'mlir', 'clang', 'flang','flang-rt','openmp'], - checks=['check-flang','check-flang-rt'], - extra_configure_args=[ - '-DLLVM_TARGETS_TO_BUILD=PowerPC', - '-DLLVM_INSTALL_UTILS=ON', - '-DCMAKE_CXX_STANDARD=17', - '-DLLVM_LIT_ARGS=-vj 256', - '-DFLANG_ENABLE_WERROR=ON', - '-DLLVM_ENABLE_ASSERTIONS=ON', - '-DCMAKE_C_COMPILER_LAUNCHER=ccache', - '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache' - ], - env={ - 'CC': 'clang', - 'CXX': 'clang++', - 'LD': 'lld' - })}, - {'name' : "flang-x86_64-windows", 'tags' : ["flang"], 'workernames' : ["minipc-ryzen-win"], diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py index 8d8c557a3..10505c25f 100644 --- a/buildbot/osuosl/master/config/workers.py +++ b/buildbot/osuosl/master/config/workers.py @@ -71,10 +71,7 @@ def get_all(): create_worker("ppc64le-clang-test-suite", max_builds=1), create_worker("ppc64le-clang-multistage-test", properties={'jobs': 8}, max_builds=1), create_worker("ppc64le-sanitizer", properties={'jobs': 4}, max_builds=1), - create_worker("ppc64le-lld-multistage-test", max_builds=1), create_worker("ppc64le-clang-rhel-test", properties={'jobs': 192}, max_builds=1), - create_worker("ppc64le-flang-rhel-test", max_builds=1), - create_worker("ppc64le-mlir-rhel-test", max_builds=1), # SPARC 64-bit big endian (sparc64) create_worker("debian-stadler-sparc64", properties={'jobs': 48}, max_builds=1),