[zorg] Reorganise Linaro Armv7 and Armv8 builders

[peter.smith]

Summary

Due to limited amount of native Armv7 hardware, and the limited advantage over running on Armv8 hardware, we are moving some of our v7 bots to run on more powerful Armv8 hardware. We will also remove some of the v8 bots that were identical configurations to the Armv7 besides targeting Armv8. The remaining bots running on native v7 hardware make up 3 groups:

• 3x Tk1s running clang-cmake-thumbv7-full-sh
• 4x TK1s running clang-cmake-armv7-full
• 1x Tk1s running clang-native-arm-lnt-perf and libcxx bots

The clang-cmake-*-full* will do a 2-stage build and run the test-suite to maximize the chance of catching a wrong instruction being generated.

The thx1 slaves are no longer in use so I've removed them from the AArch64 bots as well.

[gkistanova]

LGTM

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

return [
                                 '--exclude-stat-from-submission=compile'],
                       extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"],
                       submitURL='http://lnt.llvm.org/submitRun',
                       testerName='LNT-Thumb2v7-A15-O3')},
 
         # ARMv7 LNT test-suite in test-only mode
         {'name' : "clang-cmake-armv7-lnt",
-         'slavenames':["linaro-tk1-03"],
+         'slavenames':["linaro-armv8-01-arm-lnt"],
          'builddir':"clang-cmake-armv7-lnt",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=False,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -marm',
                                        '--threads=4', '--build-threads=4'],
                       extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
-        # ARMv8 LNT test-suite in test-only mode
-        {'name' : "clang-cmake-armv8-lnt",
-         'slavenames':["linaro-armv8-01-arm-lnt"],
-         'builddir':"clang-cmake-armv8-lnt",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      clean=False,
-                      checkout_compiler_rt=False,
-                      checkout_lld=False,
-                      test=False,
-                      useTwoStage=False,
-                      runTestSuite=True,
-                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57 -marm',
-                                       '--threads=64', '--build-threads=64'],
-                      extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM'"])},
-
         ## ARMv7 check-all self-host NEON with CMake builder
         {'name': "clang-cmake-armv7-selfhost-neon",
-         'slavenames':["linaro-tk1-04"],
+         'slavenames':["linaro-armv8-01-arm-selfhost-neon"],
          'builddir':"clang-cmake-armv7-selfhost-neon",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       useTwoStage=True,
                       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'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
-        ## ARMv8 check-all self-host NEON with CMake builder
-        {'name': "clang-cmake-armv8-selfhost-neon",
-         'slavenames':["linaro-armv8-01-arm-selfhost-neon"],
-         'builddir':"clang-cmake-armv8-selfhost-neon",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      clean=False,
-                      checkout_compiler_rt=False,
-                      checkout_lld=False,
-                      useTwoStage=True,
-                      testStage1=False,
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57 -marm'",
-                                        "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57 -marm'",
-                                        "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])},
-
         ## ARMv7 check-all with CMake builder
         {'name': "clang-cmake-armv7-quick",
-         'slavenames':["linaro-tk1-06"],
+         'slavenames':["linaro-armv8-01-arm-quick"],
          'builddir':"clang-cmake-armv7-quick",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
-        ## ARMv8 check-all with CMake builder
-        {'name': "clang-cmake-armv8-quick",
-         'slavenames':["linaro-armv8-01-arm-quick"],
-         'builddir':"clang-cmake-armv8-quick",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      clean=False,
-                      checkout_compiler_rt=False,
-                      checkout_lld=False,
-                      extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])},
-
         ## ARMv7 Clang + LLVM run test-suite with GlobalISel enabled
         {'name' : "clang-cmake-armv7-global-isel",
-         'slavenames':["linaro-tk1-09"],
+         'slavenames':["linaro-armv8-01-arm-global-isel"],
          'builddir':"clang-cmake-armv7-global-isel",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -marm -O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
                                        '--threads=4', '--build-threads=4'],
                       extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
-        ## ARMv8 Clang + LLVM run test-suite with GlobalISel enabled
-        {'name' : "clang-cmake-armv8-global-isel",
-         'slavenames':["linaro-armv8-01-arm-global-isel"],
-         'builddir':"clang-cmake-armv8-global-isel",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      clean=False,
-                      checkout_compiler_rt=False,
-                      checkout_lld=False,
-                      test=True,
-                      useTwoStage=False,
-                      runTestSuite=True,
-                      testsuite_flags=['--cppflags', '-O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
-                                       '--threads=64', '--build-threads=64'],
-                      extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])},
-
         ## ARMv7 check-all self-host with CMake builder
-        ## No ARMv8 VFP builder since NEON is mandatory in ARMv8.
         {'name': "clang-cmake-armv7-selfhost",
-         'slavenames':["linaro-tk1-07"],
+         'slavenames':["linaro-armv8-01-arm-selfhost-neon"],
          'builddir':"clang-cmake-armv7-selfhost",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       useTwoStage=True,
                       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'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## AArch64 Clang+LLVM check-all + test-suite
         {'name': "clang-cmake-aarch64-quick",
-         'slavenames':["linaro-thx1-01-aarch64-quick", "linaro-armv8-01-aarch64-quick"],
+         'slavenames':["linaro-armv8-01-aarch64-quick"],
          'builddir':"clang-cmake-aarch64-quick",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
                                        '--threads=96', '--build-threads=96'],
                       extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
         ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite
         {'name': "clang-cmake-aarch64-lld",
-         'slavenames':["linaro-thx1-01-aarch64-lld", "linaro-armv8-01-aarch64-lld"],
+         'slavenames':["linaro-armv8-01-aarch64-lld"],
          'builddir':"clang-cmake-aarch64-lld",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=True,
                       checkout_lld=True,
                       test=True,
                       useTwoStage=True,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57 -fuse-ld=lld',
                                        '--threads=96', '--build-threads=96'],
                       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"],
                ),
          'category'   : 'lld'},
 
         ## AArch64 Clang+LLVM run test-suite at -O0 (GlobalISel is now default).
         {'name': "clang-cmake-aarch64-global-isel",
-         'slavenames':["linaro-thx1-01-aarch64-global-isel", "linaro-armv8-01-aarch64-global-isel"],
+         'slavenames':["linaro-armv8-01-aarch64-global-isel"],
          'builddir':"clang-cmake-aarch64-global-isel",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-O0',
                                        '--threads=96', '--build-threads=96'],
                       extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
+          ## ARMv7 without neon; check-all 2-stage full compiler-rt + testsuite
+          {'name': "clang-cmake-armv7-full",
+           'slavenames':["linaro-tk1-06", "linaro-tk1-07", "linaro-tk1-08", "linaro-tk1-09"],
+           'builddir':"clang-cmake-armv7-full",
+           'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                        clean=False,
+                        checkout_lld=False,
+                        checkout_compiler_rt=True,
+                        testStage1=False,
+                        useTwoStage=True,
+                        runTestSuite=True,
+                        testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -mfpu=vfpv3 -marm',
+                                         '--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
+          {'name': "clang-cmake-thumbv7-full-sh",
+           'slavenames':["linaro-tk1-01", "linaro-tk1-03", "linaro-tk1-04", "linaro-tk1-05"],
+           'builddir':"clang-cmake-thumbv7-full-sh",
+           'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                        clean=False,
+                        checkout_lld=False,
+                        checkout_compiler_rt=True,
+                        testStage1=False,
+                        useTwoStage=True,
+                        runTestSuite=True,
+                        testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -mthumb',
+                                         '--threads=4', '--build-threads=4'],
+                        extra_cmake_args=["-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
+        # Sanitizers build disabled due to PR38690
+        {'name': "clang-cmake-armv8-lld",
+         'slavenames':["linaro-armv8-01-arm-lld"],
+         'builddir':"clang-cmake-armv8-lld",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                      clean=False,
+                      checkout_compiler_rt=True,
+                      checkout_lld=True,
+                      test=True,
+                      useTwoStage=True,
+                      runTestSuite=True,
+                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57 -fuse-ld=lld',
+                                       '--threads=64', '--build-threads=64'],
+                      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"],
+               ),
+         'category'   : 'lld'},
+
+        # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
+        {'name': "clang-cmake-aarch64-full",
+         'slavenames':["linaro-armv8-01-aarch64-full"],
+         'builddir':"clang-cmake-aarch64-full",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                      clean=False,
+                      checkout_compiler_rt=True,
+                      checkout_lld=False,
+                      test=True,
+                      useTwoStage=True,
+                      testStage1=False,
+                      runTestSuite=True,
+                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
+                                       '--threads=96', '--build-threads=96'],
+                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+                                        "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
+                                        "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
+               )},
+
         {'name': 'clang-x64-windows-msvc',
          'slavenames': ['windows-gcebot2'],
          'builddir': 'clang-x64-windows-msvc',
          'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
              script="clang-windows.py",
              depends_on_projects=['llvm', 'clang', 'lld', 'debuginfo-tests'])},
 
         {'name' : "clang-ppc64be-linux-lnt",
def _get_sanitizer_builders():
              script="sanitizer-windows.py",
              depends_on_projects=["llvm", "clang", "lld", "compiler-rt"])},
 
           {'name': "sanitizer-aarch64-linux-mte",
            'slavenames' :["sanitizer-buildbot5""],
            'builddir': "sanitizer-aarch64-linux-mte",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
 
-          ## ARMv7 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
-          {'name': "clang-cmake-armv7-full",
-           'slavenames':["linaro-tk1-08"],
-           'builddir':"clang-cmake-armv7-full",
-           'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                        clean=False,
-                        checkout_lld=False,
-                        extra_cmake_args=["-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
-                                          "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
-                                          "-DLLVM_PARALLEL_LINK_JOBS=2"])},
-
-          ## ARMv8 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
-          {'name': "clang-cmake-armv8-full",
-           'slavenames':["linaro-armv8-01-arm-full"],
-           'builddir':"clang-cmake-armv8-full",
-           'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                        clean=False,
-                        checkout_lld=False,
-                        extra_cmake_args=["-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a57 -marm'",
-                                          "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])},
-
-          ## ARMv7 Thumb2 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
-          {'name': "clang-cmake-thumbv7-full-sh",
-           'slavenames':["linaro-tk1-05"],
-           'builddir':"clang-cmake-thumbv7-full-sh",
-           'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                        clean=False,
-                        checkout_lld=False,
-                        useTwoStage=True,
-                        testStage1=False,
-                        extra_cmake_args=["-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;AArch64'",
-                                          "-DLLVM_PARALLEL_LINK_JOBS=2"])},
-
-          ## ARMv8 Thumb2 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
-          {'name': "clang-cmake-thumbv8-full-sh",
-           'slavenames':["linaro-armv8-01-arm-full-selfhost"],
-           'builddir':"clang-cmake-thumbv8-full-sh",
-           'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                        clean=False,
-                        checkout_lld=False,
-                        useTwoStage=True,
-                        testStage1=False,
-                        extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57 -mthumb'",
-                                          "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57 -mthumb'",
-                                          "-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a57 -mthumb'",
-                                          "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])},
-
-        ## AArch32 Self-hosting Clang+LLVM check-all + LLD + test-suite
-        # Sanitizers build disabled due to PR38690
-        {'name': "clang-cmake-armv8-lld",
-         'slavenames':["linaro-armv8-01-arm-lld"],
-         'builddir':"clang-cmake-armv8-lld",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      clean=False,
-                      checkout_compiler_rt=True,
-                      checkout_lld=True,
-                      test=True,
-                      useTwoStage=True,
-                      runTestSuite=True,
-                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57 -fuse-ld=lld',
-                                       '--threads=64', '--build-threads=64'],
-                      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"],
-               ),
-         'category'   : 'lld'},
-
-        # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
-        {'name': "clang-cmake-aarch64-full",
-         'slavenames':["linaro-thx1-01-aarch64-full", "linaro-armv8-01-aarch64-full"],
-         'builddir':"clang-cmake-aarch64-full",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      clean=False,
-                      checkout_compiler_rt=True,
-                      checkout_lld=False,
-                      test=True,
-                      useTwoStage=True,
-                      testStage1=False,
-                      runTestSuite=True,
-                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
-                                       '--threads=96', '--build-threads=96'],
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
-                                        "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
-                                        "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
-               )},
-
           ]
 
 def _get_openmp_builders():
     return [
         {'name': "openmp-gcc-x86_64-linux-debian",
          'slavenames':["gribozavr4"],
          'builddir':"openmp-gcc-x86_64-linux-debian",
          'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
return [
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc-tot-latest-std',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': '/opt/gcc-tot/bin/gcc', 'CXX': '/opt/gcc-tot/bin/g++'}),
         'category': 'libcxx'},
 
         # ARMv7 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-armv7-linux',
-         'slavenames': ['linaro-tk1-01'],
+         'slavenames': ['linaro-tk1-02'],
          'builddir': 'libcxx-libcxxabi-libunwind-armv7-linux',
          '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'})},
 
         # ARMv8 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-armv8-linux',
          'slavenames': ['linaro-armv8-01-arm-libcxx'],
          'builddir': 'libcxx-libcxxabi-libunwind-armv8-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a57 -marm',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57 -marm'})},
 
         # ARMv7 LibC++ and LibC++abi tests w/o EH (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-armv7-linux-noexceptions',
-         'slavenames': ['linaro-tk1-01'],
+         'slavenames': ['linaro-tk1-02'],
          'builddir': 'libcxx-libcxxabi-libunwind-armv7-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             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'})},
 
         # ARMv8 LibC++ and LibC++abi tests w/o EH (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-armv8-linux-noexceptions',
          'slavenames': ['linaro-armv8-01-arm-libcxx-noeh'],
          'builddir': 'libcxx-libcxxabi-libunwind-armv8-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a57 -mthumb',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57 -mthumb'})},
 
         # AArch64 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
-         'slavenames': ['linaro-thx1-01-aarch64-libcxx', 'linaro-armv8-01-aarch64-libcxx'],
+         'slavenames': ['linaro-armv8-01-aarch64-libcxx'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          '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'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
-         'slavenames': ['linaro-thx1-01-aarch64-libcxx-noeh', 'linaro-armv8-01-aarch64-libcxx-noeh'],
+         'slavenames': ['linaro-armv8-01-aarch64-libcxx-noeh'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             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'})},