Merge clang-aarch64-full-2stage with clang-aarch64-lld-2stage (llvm#521)

And keep the latter. Since we (Linaro) don't commit to testing ld
specifically, and recommend lld anyway.

The ld bot had some extra testing that I've enabled for the lld version
in this change.

Author: DavidSpickett

buildbot/osuosl/master/config/builders.py

@@ -403,22 +403,33 @@
                     checkout_lld=False,
                     extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='AArch64'"])},
 
-    ## AArch64 check-all + LLD + test-suite 2-stage
+    # AArch64 2 stage build with lld, flang, compiler-rt, test-suite and SVE/SME
+    # mlir integration tests.
     {'name' : "clang-aarch64-lld-2stage",
     'tags'  : ["lld"],
     'workernames' : ["linaro-clang-aarch64-lld-2stage"],
     'builddir':"clang-aarch64-lld-2stage",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                 clean=True,
+                checkout_flang=True,
+                checkout_lld=True,
                 useTwoStage=True,
                 runTestSuite=True,
+                env={
+                        'NO_STOP_MESSAGE':'1', # For Fortran test-suite
+                    },
                 testsuite_flags=[
                     '--cppflags', '-mcpu=neoverse-n1 -fuse-ld=lld',
                     '--threads=32', '--build-threads=32'],
                 extra_cmake_args=[
                     "-DCMAKE_C_FLAGS='-mcpu=neoverse-n1'",
                     "-DCMAKE_CXX_FLAGS='-mcpu=neoverse-n1'",
-                    "-DLLVM_ENABLE_LLD=True"])},
+                    "-DLLVM_ENABLE_LLD=True",
+                    "-DLLVM_LIT_ARGS='-v'",
+                    "-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
+                    "-DMLIR_RUN_ARM_SVE_TESTS=True",
+                    "-DMLIR_RUN_ARM_SME_TESTS=True",
+                    "-DARM_EMULATOR_EXECUTABLE=qemu-aarch64"])},
 
     ## AArch64 run test-suite at -O0 (GlobalISel is now default).
     {'name' : "clang-aarch64-global-isel",
@@ -455,34 +466,6 @@
                         # lld tests cause us to hit thread limits
                         "-DLLVM_ENABLE_THREADS=OFF"])},
 
-    # AArch64 check-all + flang + compiler-rt + test-suite + SVE/SME
-    # mlir-integration-tests 2-stage
-    {'name' : "clang-aarch64-full-2stage",
-    'tags'  : ["clang"],
-    'workernames' : ["linaro-clang-aarch64-full-2stage"],
-    'builddir': "clang-aarch64-full-2stage",
-    'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                    clean=True,
-                    checkout_flang=True,
-                    checkout_lld=True,
-                    useTwoStage=True,
-                    testStage1=False,
-                    runTestSuite=True,
-                    env={
-                        'NO_STOP_MESSAGE':'1', # For Fortran test-suite
-                    },
-                    testsuite_flags=[
-                        '--cppflags', '-mcpu=neoverse-n1',
-                        '--threads=32', '--build-threads=32'],
-                    extra_cmake_args=[
-                        "-DCMAKE_C_FLAGS='-mcpu=neoverse-n1'",
-                        "-DCMAKE_CXX_FLAGS='-mcpu=neoverse-n1'",
-                        "-DLLVM_LIT_ARGS='-v'",
-                        "-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
-                        "-DMLIR_RUN_ARM_SVE_TESTS=True",
-                        "-DMLIR_RUN_ARM_SME_TESTS=True",
-                        "-DARM_EMULATOR_EXECUTABLE=qemu-aarch64"])},
-
     # All SVE (as opposed to SVE2) builders are using optimisation flags
     # for Graviton 3 "balanced" from
     # https://github.com/aws/aws-graviton-getting-started/blob/main/c-c++.md.

buildbot/osuosl/master/config/workers.py

@@ -27,7 +27,6 @@ def get_all():
         create_worker("linaro-clang-aarch64-quick", max_builds=1),
         create_worker("linaro-clang-aarch64-lld-2stage", max_builds=1),
         create_worker("linaro-clang-aarch64-global-isel", max_builds=1),
-        create_worker("linaro-clang-aarch64-full-2stage", max_builds=1),
         create_worker("linaro-lldb-aarch64-ubuntu", max_builds=1),
         create_worker("linaro-flang-aarch64-dylib", max_builds=1),
         create_worker("linaro-flang-aarch64-sharedlibs", max_builds=1),