[powerpc] Reorganize buildbots

[seurer]

Summary

This patch reorganizes the powerpc64 buildbots. A redundant bot is removed, another bot is switched to use cmake, the jobs parameters are tweaked to take better advantage of available CPUs, and the names are cleaned up and regularized.

[seurer]

Galina, once this is approved you will need to warn me when you are going to restart the master so I can create and start the bots with the correct names.

[gkistanova]

LGTM

Thanks

Galina

[seurer]

Committed: http://llvm.org/viewvc/llvm-project?view=revision&revision=257650

buildbot/osuosl/master/config/builders.py

 
 from zorg.buildbot.builders import ABITestsuitBuilder
 reload(ABITestsuitBuilder)
 from zorg.buildbot.builders import ABITestsuitBuilder
 
 # Plain LLVM builders.
 def _get_llvm_builders():
     return [
-        {'name': "llvm-ppc64-linux1",
-         'slavenames':["ppc64be-llvm"],
-         'builddir':"llvm-ppc64",
-         'factory': LLVMBuilder.getLLVMBuildFactory("ppc64-linux-gnu", jobs=4, clean=False, timeout=20, config_name='Release+Asserts')},
-
-        {'name': "ppc64le-llvm",
-         'slavenames':["ppc64le-llvm"],
-         'builddir':"llvm-ppc64le-1",
-         'factory': LLVMBuilder.getLLVMBuildFactory("ppc64le-linux-gnu", jobs=2, clean=False, timeout=20, config_name='Release+Asserts')},
-
         {'name': "llvm-s390x-linux1",
          'slavenames':["systemz-1"],
          'builddir':"llvm-s390x-linux1",
          'factory': LLVMBuilder.getLLVMBuildFactory("s390x-linux-gnu", jobs=4, clean=False, timeout=20, config_name='Release+Asserts')},
 
         {'name': "llvm-mips-linux",
          'slavenames':["mipsswbrd002"],
          'builddir':"llvm-mips-linux",
return [
                                         "-DLLVM_TOOL_COMPILER_RT_BUILD:BOOL=OFF",
                                         "-DLLVM_BUILD_TESTS:BOOL=ON",
                                         "-DLLVM_BUILD_EXAMPLES:BOOL=ON",
                                         "-DCLANG_BUILD_EXAMPLES:BOOL=ON",
                                         "-DLLVM_TARGETS_TO_BUILD=X86"],
                      triple="x86_64-scei-ps4",
                      prefixCommand=None, # This is a designaed builder, so no need to be nice.
                      env={'PATH':'/opt/llvm_37/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'})},
-
-        ]
 
 # Clang builders.
 def _get_clang_builders():
 
     return [
         {'name': "clang-atom-d525-fedora-rel",
          'slavenames':["atom1-buildbot"],
          'builddir':"clang-atom-d525-fedora-rel",
return [
                         vs_target_arch='x86',
                         checkout_compiler_rt=False,
                         testStage1=True,
                         useTwoStage=True,
                         stage1_config='Release',
                         stage2_config='Release',
                         extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"])},
 
-        {'name' : "clang-ppc64-elf-linux",
+        {'name' : "clang-ppc64be-linux-lnt",
          'slavenames' :["ppc64be-clang-lnt-test"],
-         'builddir' :"clang-ppc64-1",
+         'builddir' :"clang-ppc64be-lnt",
          'factory' : LNTBuilder.getLNTFactory(triple='ppc64-elf-linux1',
-                                              nt_flags=['--cflag','-mcpu=native', '-j8'],
+                                              nt_flags=['--cflag','-mcpu=native', '-j16'],
                                               jobs=16,  use_pty_in_tests=True,
                                               testerName='O3-plain', run_cxx_tests=True)},
 
-        {'name' : "clang-ppc64-elf-linux2",
+        {'name' : "clang-ppc64le-linux-lnt",
+         'slavenames' :["ppc64le-clang-lnt-test"],
+         'builddir' :"clang-ppc64le-lnt",
+         'factory' : LNTBuilder.getLNTFactory(triple='ppc64le-elf-linux1',
+                                              nt_flags=['--cflag','-mcpu=native', '-j6'],
+                                              jobs=6,  use_pty_in_tests=True,
+                                              testerName='ppc64le-plain', run_cxx_tests=True)},
+
+        {'name' : "clang-ppc64be-linux-multistage",
          'slavenames' :["ppc64be-clang-multistage-test"],
-         'builddir' :"clang-ppc64-2",
+         'builddir' :"clang-ppc64be-multistage",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
                                                             useTwoStage=True,
                                                             stage1_config='Release',
                                                             stage2_config='Release',
                                                             extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"])},
 
-        {'name' : "ppc64le-clanglnt",
-         'slavenames' :["ppc64le-clang-lnt-test"],
-         'builddir' :"clang-lnt-ppc64le-1",
-         'factory' : LNTBuilder.getLNTFactory(triple='ppc64le-elf-linux1',
-                                              nt_flags=['--cflag','-mcpu=native', '-j6'],
-                                              jobs=6,  use_pty_in_tests=True,
-                                              testerName='ppc64le-plain', run_cxx_tests=True)},
-
-        {'name' : "ppc64le-clang",
+        {'name' : "clang-ppc64le-linux-multistage",
          'slavenames' :["ppc64le-clang-multistage-test"],
-         'builddir' :"clang-ppc64le-1",
+         'builddir' :"clang-ppc64le-multistage",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
                                                             useTwoStage=True,
                                                             stage1_config='Release',
                                                             stage2_config='Release',
                                                             extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"])},
 
+        {'name': "clang-ppc64be-linux",
+         'slavenames':["ppc64be-clang-test"],
+         'builddir':"clang-ppc64be",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
+                                                            useTwoStage=False,
+                                                            stage1_config='Release',
+                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
+         'category' : 'clang'},
+
+        {'name': "clang-ppc64le-linux",
+         'slavenames':["ppc64le-clang-test"],
+         'builddir':"clang-ppc64le",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
+                                                            useTwoStage=False,
+                                                            stage1_config='Release',
+                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
+         'category' : 'clang'},
+
         # ABI test-suite with CMake builder
         {'name'          : "clang-x86_64-linux-abi-test",
          'mergeRequests' : False,
          'slavenames'    : ["as-bldslv8"],
          'builddir'      : "clang-x86_64-linux-abi-test",
          'factory'       : ABITestsuitBuilder.getABITestsuitBuildFactory()},
 
         # Clang cross builders.
def _get_sanitizer_builders():
            'slavenames':["as-bldslv5"],
            'builddir':"sanitizer_x86_64-freebsd",
            'factory' : SanitizerBuilderII.getSanitizerBuildFactoryII(
                         clean=True,
                         sanitizers=['sanitizer','asan','lsan','tsan','ubsan'],
                         common_cmake_options=['-DCMAKE_EXE_LINKER_FLAGS=-lcxxrt',
                                               '-DLIBCXXABI_USE_LLVM_UNWINDER=ON'])},
 
-          {'name': "sanitizer-ppc64-linux1",
+          {'name': "sanitizer-ppc64be-linux",
            'slavenames' :["ppc64be-sanitizer"],
-           'builddir': "sanitizer-ppc64-1",
+           'builddir': "sanitizer-ppc64be",
            'factory': SanitizerBuilder.getSanitizerBuildFactory(timeout=1800)},
 
           {'name': "sanitizer-ppc64le-linux",
            'slavenames' :["ppc64le-sanitizer"],
-           'builddir': "sanitizer-ppc64le-1",
+           'builddir': "sanitizer-ppc64le",
            'factory': SanitizerBuilder.getSanitizerBuildFactory(timeout=1800)},
 
           {'name': "sanitizer-windows",
            'slavenames' :["sanitizer-windows"],
            'builddir': "sanitizer-windows",
            'factory': SanitizerBuilderWindows.getSanitizerWindowsBuildFactory()},
 
           ## Cortex-A15 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests

 
 # Experimental and stopped builders
 def _get_on_demand_builders():
     return [
         ]
 
 def _get_experimental_scheduled_builders():
     return [
-        {'name': "llvm-ppc64-linux2",
-         'slavenames':["ppc64be-llvm-quick"],
-         'builddir':"llvm-ppc64-2",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
-                                                            useTwoStage=False,
-                                                            stage1_config='Release',
-                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
-         'category' : 'clang'},
-
         {'name': "clang-atom-d525-fedora",
          'slavenames':["atom-buildbot"],
          'builddir':"clang-atom-d525-fedora",
          'factory' : ClangBuilder.getClangBuildFactory(extra_configure_args=["--enable-shared",
                                                                              "--with-intel-jitevents"]),
          'category' : 'clang'},
 
         {'name' : "clang-bpf-build",

buildbot/osuosl/master/config/slaves.py

return [
 
         # Windows 7 Intel(R) Xeon(R) CPU E5-2680 (2.80GHz), 16GB of RAM
         create_slave("windows7-buildbot", properties={'jobs': 2}, max_builds=1),
 
         # LLVM Lab slaves
         create_slave("hpproliant1", properties={'jobs': 6}, max_builds=1),
 
         # POWER7 PowerPC big endian (powerpc64)
-        create_slave("ppc64be-llvm", properties={'jobs': 8}, max_builds=1),
+        create_slave("ppc64be-clang-test", properties={'jobs': 16}, max_builds=1),
         create_slave("ppc64be-clang-lnt-test", properties={'jobs': 16}, max_builds=1),
         create_slave("ppc64be-clang-multistage-test", properties={'jobs': 16}, max_builds=1),
-        create_slave("ppc64be-sanitizer", properties={'jobs': 8}, max_builds=1),
-        create_slave("ppc64be-llvm-quick", properties={'jobs': 8}, max_builds=1),
+        create_slave("ppc64be-sanitizer", properties={'jobs': 16}, max_builds=1),
 
         # POWER 8 PowerPC little endian (powerpc64le)
-        create_slave("ppc64le-llvm", properties={'jobs': 4}, max_builds=1),
+        create_slave("ppc64le-clang-test", properties={'jobs': 4}, max_builds=1),
         create_slave("ppc64le-clang-lnt-test", properties={'jobs': 6}, max_builds=1),
-        create_slave("ppc64le-clang-multistage-test", properties={'jobs': 12}, max_builds=1),
+        create_slave("ppc64le-clang-multistage-test", properties={'jobs': 8}, max_builds=1),
         create_slave("ppc64le-sanitizer", properties={'jobs': 4}, max_builds=1),
 
         # Debian 86_64, 2 x 6-core Opteron 2.6 GHz
         create_slave("osu8", properties={'jobs' : 6}, max_builds=2),
 
         # Windows 6.1.7601 x86-64, Intel(R) Xeon(R) CPU E5-2680 0 @ 2.70GHz
         create_slave("hexagon-build-01", properties={'jobs': 4}, max_builds=2),