[zorg] Add linaro-d05-* builders

[maxim-kuvyrkov]

Summary

... which are hosted by 64-core D05 machine.
Remove explicit parallelism settings and rely on ninja
to use correct parallelism values for 8-core APMs and
64-core D05s.

[maxim-kuvyrkov]

buildbot/osuosl/master/config/builders.py

308 ↗

(On Diff #124758)

After a bit more testing, it appears that lit testsuite won't be parallelized without --threads=N and --build-threads=N settings. I'll rework this patch and resubmit.

[maxim-kuvyrkov]

In this version jobs= settings are removed (so that they are picked up from slave setting). testsuite_flags are left with 8-thread parallelism for now, and we are going to switch them to 64 once APM hardware is decommissioned.

The overall plan is to

1. Continue running APM hardware on the normal buildmaster.
2. Connect D05 slaves to silent buildmaster and monitor them.
3. Swap hardware: connect D05 slaves to normal buildmaster and connect APM slaves to silent buildmaster.
4. Switch to 64-thread parallelism for the testsuite and remove APM slaves.
5. Decommission APMs.

[rovka]

This looks fine, but I think it would be better if the slave names weren't tied to what is currently running on them, but rather to the machine configurations. E.g. if there's no difference in the environment of linaro-d05-01-quick and linaro-d05-global-isel, they should just be linaro-d05-01 and linaro-d05-02. But for instance if the machines running the libcxx bots need something special, then they can be linaro-d05-libcxx-01 and linaro-d05-libcxx-02. That way, if we want to repurpose a slave to run a different builder, it can keep its name without looking awkward, and it's also easy for us to tell which machines have different environments. What do you think?

[maxim-kuvyrkov]

@rovka , slaves linaro-d05-01-* will run in different containers on the same machine (linaro-d05-01). In this context there is no need to repurpose a slave.
I plan to add a second machine linaro-d05-02 that would host the same set of slaves/builders for redundancy.

[rovka]

In D40607#943295, @maxim-kuvyrkov wrote:

@rovka , slaves linaro-d05-01-* will run in different containers on the same machine (linaro-d05-01). In this context there is no need to repurpose a slave.
I plan to add a second machine linaro-d05-02 that would host the same set of slaves/builders for redundancy.

True, but that's an implementation detail on our side, not something that is visible in zorg.
Anyway, that's just a nitpick, LGTM.

zorg/trunk/buildbot/osuosl/master/config/builders.py

return [
                       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
         {'name': "clang-cmake-aarch64-quick",
-         'slavenames':["linaro-apm-01"],
+         'slavenames':["linaro-apm-01", "linaro-d05-01-quick"],
          'builddir':"clang-cmake-aarch64-quick",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       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'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
         ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite
         ## TODO: Remove the X86 back-end after fixing the 90 bad tests
         ## TODO: Add Compiler-RT after fixing all the failures
         ## TODO: Fix the three remaining test-suite failures
         {'name': "clang-cmake-aarch64-lld",
-         'slavenames':["linaro-apm-04"],
+         'slavenames':["linaro-apm-04", "linaro-d05-01-lld"],
          'builddir':"clang-cmake-aarch64-lld",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=True,
                       test=True,
                       useTwoStage=True,
                       runTestSuite=True,
                       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'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
                                         "-DLLVM_ENABLE_LLD=True"],
                ),
          'category'   : 'lld'},
 
         ## AArch64 Clang+LLVM run test-suite with GlobalISel enabled
         {'name': "clang-cmake-aarch64-global-isel",
-         'slavenames':["linaro-apm-06"],
+         'slavenames':["linaro-apm-06", "linaro-d05-01-global-isel"],
          'builddir':"clang-cmake-aarch64-global-isel",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags',
                                        '-mcpu=cortex-a57 -O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
def _get_sanitizer_builders():
                                           "-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
         {'name': "clang-cmake-aarch64-full",
-         'slavenames':["linaro-apm-02", "linaro-apm-05"],
+         'slavenames':["linaro-apm-02", "linaro-apm-05", "linaro-d05-01-full"],
          'builddir':"clang-cmake-aarch64-full",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
                       clean=False,
                       checkout_compiler_rt=True,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=True,
                       testStage1=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
return [
                               '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)
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
-         'slavenames': ['linaro-apm-03'],
+         'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx'],
          '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',
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
-         'slavenames': ['linaro-apm-03'],
+         'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx-noexceptions'],
          '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"'},

zorg/trunk/buildbot/osuosl/master/config/slaves.py

return [
 
         # AArch64 Linaro slaves
         create_slave("linaro-apm-01", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-02", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-03", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-04", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-05", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-06", properties={'jobs' : 8}, max_builds=1),
+        create_slave("linaro-d05-01-quick", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-full", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-global-isel", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-lld", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-libcxx", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-libcxx-noexceptions", properties={'jobs' : 64}, max_builds=1),
 
         # AMD Athlon(tm) 64 X2 Dual Core 3800+, Ubuntu x86_64
         create_slave("grosser1", properties={'jobs': 2}, max_builds=1),
 
         # Intel(R) Core(TM)2 Quad CPU Q6600  @ 2.40GHz, Debian x86_64 GNU/Linux
         #create_slave("grosser2", properties={'jobs': 4}, max_builds=1),
 
         # Polly perf servers