[zorg] Rename Linaro's AArch64 and ARM bots to use consistent names

[maxim-kuvyrkov]

Summary

This will simplify Linaro's buildbot maintenance scripts.

[DavidSpickett]

LGTM

You should mention in the commit msg that this also removes the libcxx bot names, which moved to buildkite a while ago.

[maxim-kuvyrkov]

Update commit log message

[DavidSpickett]

If you're using arc it doesn't update the description for you unfortunately. (I wish it did) You can "edit revision" and change it there, but either way the message that you push with is the one that ends up in the repo, the phab one is just for phab.

[rovka]

I have a couple of minor comments, overall looks good.

buildbot/osuosl/master/config/builders.py

521–522

Nitpick: Can we standardize on a suffix for 2-stage bots? With this we'd have '2stage' here, 'selfhost' for 'clang-armv7-selfhost[-neon]', 'sh' for 'clang-thumbv7-full-sh', and nothing for many of the aarch64 bots (e.g. c'clang-aarch64-full').

1019–1020

Nitpick: Why are we adding ubuntu to the lldb bot names and removing it from the flang bot names?

[maxim-kuvyrkov]

buildbot/osuosl/master/config/builders.py

521–522

Sorry, I missed this comment. I'll post a separate patch to standardize on "-2stage" suffix for 2-stage bots.

1019–1020

All LLDB bots seem to consistently specify OS, while compiler bots don't. It kinda makes sense that debugger is more OS-dependent than a compiler/assembler/linker.

buildbot/osuosl/master/config/builders.py

'factory' : ClangBuilder.getClangCMakeBuildFactory(
                         '--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",
+    {'name' : "clang-armv7-lnt",
     'tags'  : ["clang"],
-    'workernames' : ["linaro-armv7-lnt"],
-    'builddir': "clang-cmake-armv7-lnt",
+    'workernames' : ["linaro-clang-armv7-lnt"],
+    'builddir': "clang-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=32', '--build-threads=32'])},
 
-    ## ARMv7 check-all self-host NEON with CMake builder
-    {'name' : "clang-cmake-armv7-selfhost-neon",
+    ## ARMv7 check-all self-host
+    {'name' : "clang-armv7-selfhost",
     'tags'  : ["clang"],
-    'workernames': ["linaro-armv7-selfhost"],
-    'builddir':"clang-cmake-armv7-selfhost-neon",
+    'workernames': ["linaro-clang-armv7-selfhost"],
+    'builddir':"clang-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 -marm'",
                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'"])},
 
     ## ARMv7 Clang+LLVM check-all
-    {'name' : "clang-cmake-armv7-quick",
+    {'name' : "clang-armv7-quick",
     'tags'  : ["clang"],
-    'workernames':["linaro-armv7-quick"],
-    'builddir':"clang-cmake-armv7-quick",
+    'workernames':["linaro-clang-armv7-quick"],
+    'builddir':"clang-armv7-quick",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     clean=False,
                     checkout_compiler_rt=False,
                     checkout_lld=False,
                     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",
+    {'name' : "clang-armv7-global-isel",
     'tags'  : ["clang"],
-    'workernames':["linaro-armv7-global-isel"],
-    'builddir':"clang-cmake-armv7-global-isel",
+    'workernames':["linaro-clang-armv7-global-isel"],
+    'builddir':"clang-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=32', '--build-threads=32'])},
 
-    ## ARMv7 check-all self-host with CMake builder
-    {'name' : "clang-cmake-armv7-selfhost",
+    ## ARMv7 check-all self-host VFPv3
+    {'name' : "clang-armv7-selfhost-vfpv3",
     'tags'  : ["clang"],
-    'workernames' : ["linaro-armv7-selfhost"],
-    'builddir': "clang-cmake-armv7-selfhost",
+    'workernames' : ["linaro-clang-armv7-selfhost-vfpv3"],
+    'builddir': "clang-armv7-selfhost-vfpv3",
     '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'"])},
 
     ## AArch64 Clang+LLVM check-all
-    {'name' : "clang-cmake-aarch64-quick",
+    {'name' : "clang-aarch64-quick",
     'tags'  : ["clang"],
-    'workernames' : ["linaro-aarch64-quick"],
-    'builddir': "clang-cmake-aarch64-quick",
+    'workernames' : ["linaro-clang-aarch64-quick"],
+    'builddir': "clang-aarch64-quick",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     clean=False,
                     checkout_compiler_rt=False,
                     checkout_lld=False,
                     test=True,
                     extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='AArch64'"])},
 
     ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite
-    {'name' : "clang-cmake-aarch64-lld",
+    {'name' : "clang-aarch64-lld",
     'tags'  : ["lld"],
-    'workernames' : ["linaro-aarch64-lld"],
-    'builddir':"clang-cmake-aarch64-lld",
+    'workernames' : ["linaro-clang-aarch64-lld"],
+    'builddir':"clang-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=32', '--build-threads=32'],
                 extra_cmake_args=[
                     "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                     "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                     "-DLLVM_ENABLE_LLD=True"])},
 
     ## AArch64 Clang+LLVM run test-suite at -O0 (GlobalISel is now default).
-    {'name' : "clang-cmake-aarch64-global-isel",
+    {'name' : "clang-aarch64-global-isel",
     'tags'  : ["clang"],
-    'workernames' : ["linaro-aarch64-global-isel"],
-    'builddir': "clang-cmake-aarch64-global-isel",
+    'workernames' : ["linaro-clang-aarch64-global-isel"],
+    'builddir': "clang-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=32', '--build-threads=32'])},
 
     ## ARMv7 without neon; check-all 2-stage full compiler-rt + testsuite
-    {'name' : "clang-cmake-armv7-full",
+    {'name' : "clang-armv7-full",
     'tags'  : ["clang"],
     'workernames' : ["linaro-tk1-06", "linaro-tk1-07", "linaro-tk1-08", "linaro-tk1-09"],
-    'builddir': "clang-cmake-armv7-full",
+    'builddir': "clang-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_PARALLEL_LINK_JOBS=2"])},
 
     ## ARMv7 Thumb2 with neon; check-all 2-stage full compiler-rt + testsuite
-    {'name' : "clang-cmake-thumbv7-full-sh",
+    {'name' : "clang-thumbv7-full-sh",
     'tags'  : ["clang"],
     'workernames' : ["linaro-tk1-01", "linaro-tk1-03", "linaro-tk1-04", "linaro-tk1-05"],
-    'builddir': "clang-cmake-thumbv7-full-sh",
+    'builddir': "clang-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_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",
+    {'name' : "clang-armv8-lld",
     'tags'  : ["lld"],
-    'workernames' : ["linaro-armv8-lld"],
-    'builddir': "clang-cmake-armv8-lld",
+    'workernames' : ["linaro-clang-armv8-lld"],
+    'builddir': "clang-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=32', '--build-threads=32'],
                     extra_cmake_args=[
                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                         "-DCOMPILER_RT_BUILD_SANITIZERS=OFF",
                         "-DLLVM_ENABLE_LLD=True"])},
 
     # AArch64 Clang+LLVM+RT check-all + flang + test-suite + self-hosting
-    {'name' : "clang-cmake-aarch64-full",
+    {'name' : "clang-aarch64-full",
     'tags'  : ["clang"],
-    'workernames' : ["linaro-aarch64-full"],
-    'builddir': "clang-cmake-aarch64-full",
+    'workernames' : ["linaro-clang-aarch64-full"],
+    'builddir': "clang-aarch64-full",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     clean=False,
                     checkout_compiler_rt=True,
                     checkout_flang=True,
                     checkout_lld=False,
                     test=True,
                     useTwoStage=True,
                     testStage1=False,
                     runTestSuite=True,
                     testsuite_flags=[
                         '--cppflags', '-mcpu=cortex-a57',
                         '--threads=32', '--build-threads=32'],
                     extra_cmake_args=[
                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'"])},
 
     # AArch64 Clang+LLVM+RT+LLD check-all + flang + test-suite w/SVE
-    {'name' : "clang-cmake-aarch64-sve-vls",
+    {'name' : "clang-aarch64-sve-vls",
     'tags'  : ["clang"],
-    'workernames' : ["linaro-aarch64-sve-vls"],
-    'builddir': "clang-cmake-aarch64-sve-vls",
+    'workernames' : ["linaro-clang-aarch64-sve-vls"],
+    'builddir': "clang-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'],
                     extra_cmake_args=[
                         "-DCMAKE_C_FLAGS='-mcpu=a64fx'",
                         "-DCMAKE_CXX_FLAGS='-mcpu=a64fx'",
                         "-DLLVM_ENABLE_LLD=True"])},
 
     # AArch64 Clang+LLVM+RT+LLD check-all + flang + test-suite 2-stage w/SVE
-    {'name' : "clang-cmake-aarch64-sve-vls-2stage",
+    {'name' : "clang-aarch64-sve-vls-2stage",
     'tags'  : ["clang"],
-    'workernames' : ["linaro-aarch64-sve-vls-2stage"],
-    'builddir': "clang-cmake-aarch64-sve-vls-2stage",
+    'workernames' : ["linaro-clang-aarch64-sve-vls-2stage"],
+    'builddir': "clang-aarch64-sve-vls-2stage",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     clean=False,
                     checkout_compiler_rt=True,
                     checkout_flang=True,
                     checkout_lld=True,
                     test=True,
                     useTwoStage=True,
                     testStage1=False,
'factory' : LLDBBuilder.getLLDBCMakeBuildFactory(
                         '-DLLVM_USE_LINKER=gold',
                         '-DLLDB_ENABLE_PYTHON=True',
                         '-DPYTHON_EXECUTABLE=/usr/bin/python3',
                         '-DCMAKE_C_COMPILER=clang',
                         '-DCMAKE_CXX_COMPILER=clang++'])},
 
     {'name' : "lldb-aarch64-ubuntu",
     'tags'  : ["lldb"],
-    'workernames' : ["linaro-aarch64-lldb"],
-    'builddir': "lldb-cmake-aarch64",
+    'workernames' : ["linaro-lldb-aarch64-ubuntu"],
+    'builddir': "lldb-aarch64-ubuntu",
     'factory' : LLDBBuilder.getLLDBCMakeBuildFactory(
                     test=True,
                     extra_cmake_args=[
                         '-DLLVM_ENABLE_ASSERTIONS=True',
                         '-DLLVM_LIT_ARGS=-svj 8',
                         '-DLLVM_USE_LINKER=gold'])},
 
     {'name' : "lldb-arm-ubuntu",
     'tags'  : ["lldb"],
-    'workernames' : ["linaro-arm-lldb"],
-    'builddir': "lldb-cmake-arm",
+    'workernames' : ["linaro-lldb-arm-ubuntu"],
+    'builddir': "lldb-arm-ubuntu",
     'factory' : LLDBBuilder.getLLDBCMakeBuildFactory(
                     test=True,
                     extra_cmake_args=[
                         '-DLLVM_ENABLE_ASSERTIONS=True',
                         '-DLLVM_LIT_ARGS=-svj 8',
                         '-DLLVM_USE_LINKER=gold'])},
 
     {'name' : "lldb-x64-windows-ninja",
# libc Builders.
     'builddir': "libc-x86_64-debian-fullbuild-dbg-asan",
     'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
                     script="libc-linux.py",
                     depends_on_projects=['llvm', 'libc', 'clang', 'clang-tools-extra'],
                     extra_args=['--debug', '--asan'])},
 
 # Flang builders.
 
-    {'name' : "flang-aarch64-ubuntu-dylib",
+    {'name' : "flang-aarch64-dylib",
     'tags'  : ["flang"],
-    'workernames' : ["linaro-aarch64-flang-dylib"],
-    'builddir': "flang-aarch64-ubuntu-dylib",
+    'workernames' : ["linaro-flang-aarch64-dylib"],
+    'builddir': "flang-aarch64-dylib",
     'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     clean=True,
                     checks=['check-flang'],
                     depends_on_projects=['llvm','mlir','clang','flang'],
                     extra_configure_args=[
                         "-DLLVM_BUILD_LLVM_DYLIB=ON",
                         "-DLLVM_LINK_LLVM_DYLIB=ON",
                         "-DCMAKE_CXX_STANDARD=17",
                     ])},
 
-    {'name' : "flang-aarch64-ubuntu-sharedlibs",
+    {'name' : "flang-aarch64-sharedlibs",
     'tags'  : ["flang"],
-    'workernames' : ["linaro-aarch64-flang-sharedlibs"],
-    'builddir': "flang-aarch64-ubuntu-sharedlibs",
+    'workernames' : ["linaro-flang-aarch64-sharedlibs"],
+    'builddir': "flang-aarch64-sharedlibs",
     'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     clean=True,
                     checks=['check-flang'],
                     depends_on_projects=['llvm','mlir','clang','flang'],
                     extra_configure_args=[
                         "-DBUILD_SHARED_LIBS=ON",
                         "-DLLVM_BUILD_EXAMPLES=ON",
                         "-DCMAKE_CXX_STANDARD=17",
                     ])},
 
-    {'name' : "flang-aarch64-ubuntu-out-of-tree",
+    {'name' : "flang-aarch64-out-of-tree",
     'tags'  : ["flang"],
-    'workernames' : ["linaro-aarch64-flang-oot"],
+    'workernames' : ["linaro-flang-aarch64-out-of-tree"],
     'builddir': "flang-aarch64-out-of-tree",
     'factory' : FlangBuilder.getFlangOutOfTreeBuildFactory(
                     checks=['check-flang'],
                     llvm_extra_configure_args=[
                         "-DCMAKE_CXX_STANDARD=17",
                         "-DLLVM_ENABLE_WERROR=OFF",
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
                         "-DCMAKE_BUILD_TYPE=Release",
                     ],
                     flang_extra_configure_args=[
                         "-DFLANG_ENABLE_WERROR=ON",
                         "-DCMAKE_BUILD_TYPE=Release",
                     ])},
 
-    {'name' : "flang-aarch64-ubuntu-debug",
+    {'name' : "flang-aarch64-debug",
     'tags'  : ["flang"],
-    'workernames' : ["linaro-aarch64-flang-debug"],
+    'workernames' : ["linaro-flang-aarch64-debug"],
     'builddir': "flang-aarch64-debug",
     'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     clean=True,
                     checks=['check-flang'],
                     depends_on_projects=['llvm','mlir','clang','flang'],
                     extra_configure_args=[
                         "-DCMAKE_BUILD_TYPE=Debug",
                         "-DCMAKE_CXX_STANDARD=17",
                         "-DLLVM_USE_LINKER=lld",
                     ])},
 
-    {'name' : "flang-aarch64-ubuntu-latest-clang",
+    {'name' : "flang-aarch64-latest-clang",
     'tags'  : ['flang'],
-    'workernames' : ["linaro-aarch64-flang-latest-clang"],
-    'builddir': "flang-aarch64-ubuntu-latest-clang",
+    'workernames' : ["linaro-flang-aarch64-latest-clang"],
+    'builddir': "flang-aarch64-latest-clang",
     'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     clean=True,
                     checks=['check-flang'],
                     depends_on_projects=['llvm','mlir','clang','flang'],
                     extra_configure_args=[
                         "-DLLVM_INSTALL_UTILS=ON",
                         "-DCMAKE_CXX_STANDARD=17",
                         "-DLLVM_ENABLE_WERROR=OFF",
                         "-DFLANG_ENABLE_WERROR=ON",
                         "-DBUILD_SHARED_LIBS=ON",
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
                         "-DLLVM_ENABLE_LIBCXX=On",
                         "-DCMAKE_BUILD_TYPE=Release",
                         ])},
 
-    {'name' : "flang-aarch64-ubuntu-release",
+    {'name' : "flang-aarch64-release",
     'tags'  : ["flang"],
-    'workernames' : ["linaro-aarch64-flang-release"],
+    'workernames' : ["linaro-flang-aarch64-release"],
     'builddir': "flang-aarch64-release",
     'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     clean=True,
                     checks=['check-flang'],
                     depends_on_projects=['llvm','mlir','clang','flang'],
                     extra_configure_args=[
                         "-DCMAKE_BUILD_TYPE=Release",
                         "-DCMAKE_CXX_STANDARD=17",
                     ])},
 
-    {'name' : "flang-aarch64-ubuntu-rel-assert",
+    {'name' : "flang-aarch64-rel-assert",
     'tags'  : ["flang"],
-    'workernames' : ["linaro-aarch64-flang-rel-assert"],
-    'builddir': "flang-aarch64-rel",
+    'workernames' : ["linaro-flang-aarch64-rel-assert"],
+    'builddir': "flang-aarch64-rel-assert",
     'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     clean=True,
                     checks=['check-flang'],
                     depends_on_projects=['llvm','mlir','clang','flang'],
                     extra_configure_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
                         "-DCMAKE_BUILD_TYPE=Release",
                         "-DCMAKE_CXX_STANDARD=17",
                     ])},
 
     {'name' : "flang-aarch64-latest-gcc",
     'tags'  : ['flang'],
-    'workernames' : ["linaro-aarch64-flang-latest-gcc"],
+    'workernames' : ["linaro-flang-aarch64-latest-gcc"],
     'builddir': "flang-aarch64-latest-gcc",
     'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     clean=True,
                     checks=['check-flang'],
                     depends_on_projects=['llvm','mlir','clang','flang'],
                     extra_configure_args=[
                         "-DLLVM_INSTALL_UTILS=ON",
                         "-DCMAKE_CXX_STANDARD=17",

buildbot/osuosl/master/config/workers.py

return [
         create_worker("linaro-tk1-02", properties={'jobs' : 4}, max_builds=1),
         create_worker("linaro-tk1-03", properties={'jobs' : 4}, max_builds=1),
         create_worker("linaro-tk1-04", properties={'jobs' : 4}, max_builds=1),
         create_worker("linaro-tk1-05", properties={'jobs' : 4}, max_builds=1),
         create_worker("linaro-tk1-06", properties={'jobs' : 4}, max_builds=1),
         create_worker("linaro-tk1-07", properties={'jobs' : 4}, max_builds=1),
         create_worker("linaro-tk1-08", properties={'jobs' : 4}, max_builds=1),
         create_worker("linaro-tk1-09", properties={'jobs' : 4}, max_builds=1),
-        create_worker("linaro-armv7-lnt", properties={'jobs' : 32}, max_builds=1),
-        create_worker("linaro-armv7-selfhost", properties={'jobs' : 32}, max_builds=1),
-        create_worker("linaro-armv7-quick", properties={'jobs' : 32}, max_builds=1),
-        create_worker("linaro-armv7-global-isel", properties={'jobs' : 32}, max_builds=1),
-        create_worker("linaro-armv8-lld", properties={'jobs' : 32}, max_builds=1),
-        # Libcxx testsuite has tests with timing assumptions.  Run single-threaded to make
-        # sure we have plenty CPU cycle to satisfy timing assumptions.
-        create_worker("linaro-armv8-libcxx", properties={'jobs' : 1}, max_builds=1),
-        create_worker("linaro-arm-lldb", properties={'jobs' : 16}, max_builds=1),
+        create_worker("linaro-clang-armv7-lnt", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-clang-armv7-selfhost", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-clang-armv7-quick", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-clang-armv7-global-isel", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-clang-armv7-selfhost-vfpv3", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-clang-armv8-lld", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-lldb-arm-ubuntu", properties={'jobs' : 16}, max_builds=1),
 
         # AArch64 Linaro workers
-        create_worker("linaro-aarch64-quick", properties={'jobs' : 32}, max_builds=1),
-        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-sve-vls-2stage", 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),
-        create_worker("linaro-aarch64-flang-release", properties={'jobs' : 32}, max_builds=1),
-        create_worker("linaro-aarch64-flang-rel-assert", properties={'jobs' : 32}, max_builds=1),
-        create_worker("linaro-aarch64-flang-dylib", properties={'jobs' : 32}, max_builds=1),
-        create_worker("linaro-aarch64-flang-sharedlibs", properties={'jobs' : 32}, max_builds=1),
-        create_worker("linaro-aarch64-flang-latest-gcc", properties={'jobs' : 32}, max_builds=1),
-        # Libcxx testsuite has tests with timing assumptions.  Run single-threaded to make
-        # sure we have plenty CPU cycle to satisfy timing assumptions.
-        create_worker("linaro-aarch64-libcxx", properties={'jobs' : 1}, max_builds=1),
-        create_worker("linaro-aarch64-lldb", properties={'jobs': 16}, max_builds=1),
+        create_worker("linaro-clang-aarch64-quick", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-clang-aarch64-lld", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-clang-aarch64-global-isel", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-clang-aarch64-full", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-clang-aarch64-sve-vls", properties={'jobs' : 48}, max_builds=1),
+        create_worker("linaro-clang-aarch64-sve-vls-2stage", properties={'jobs' : 48}, max_builds=1),
+        create_worker("linaro-lldb-aarch64-ubuntu", properties={'jobs': 16}, max_builds=1),
+        create_worker("linaro-flang-aarch64-dylib", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-flang-aarch64-sharedlibs", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-flang-aarch64-out-of-tree", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-flang-aarch64-debug", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-flang-aarch64-latest-clang", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-flang-aarch64-release", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-flang-aarch64-rel-assert", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-flang-aarch64-latest-gcc", properties={'jobs' : 32}, max_builds=1),
 
         # AArch64
         create_worker("linaro-armv8-windows-msvc-01", properties={'jobs' : 8}, max_builds=1),
         create_worker("linaro-armv8-windows-msvc-02", properties={'jobs' : 8}, max_builds=1),
 
         # Windows Server 2016 Intel Xeon(R) Quad 2.30 GHz, 56GB of RAM
         create_worker("win-py3-buildbot", properties={'jobs' : 64}, max_builds=1),