Generate ENABLE_RUNTIMES in ClangBuilder

[DavidSpickett]

Summary

In ca793509f5a9b26395400dcb92b344b1e055e949 I passed down
enable_runtimes to ClangBuilder but did not realise that
it was not LLVMBuildFactory that generates the CMake arguments.

LLVMBuildFactory simply holds properties of the build. In this
case what projects and runtimes we rely on.

ClangBuilder is the one making the CMake arguments, so I've updated
that to emit the right options this time instead of putting everything
in PROJECTS.

I've adjusted two of the PPC bots that were manually putting compiler-rt
into RUNTIMES.

[DavidSpickett]

@kamaub for the PPC changes. Originally done in https://reviews.llvm.org/D133940.

I probably need to add check-runtimes to Linaro's bot also, but I'll deal with that later.

[gkistanova]

The patch looks good in general.

One thing does not look right, though.

buildbot/osuosl/master/config/builders.py

691

LLVMBuildFactory expects a list of runtimes, or one of the special values: None (for default behavior whatever it is), "auto", or "all". True is not one of them.

Did you mean "auto" here?

[DavidSpickett]

Correct =True to ="auto" for enable_runtimes.

[DavidSpickett]

buildbot/osuosl/master/config/builders.py

691

I did, fixed.

[gkistanova]

LGTM.

[DavidSpickett]

@kamaub Any comments?

[DavidSpickett]

If there's no response by tomorrow I'm going to land this and test it on staging. If it works there on the AArch64 bot I doubt there will be an issue with ppc, the configurations are very similar architecture aside.

buildbot/osuosl/master/config/builders.py

# Clang builders.
 
     {'name' : "clang-ppc64be-linux-multistage",
     'tags'  : ["clang", "ppc"],
     'workernames' : ["ppc64be-clang-multistage-test"],
     'builddir': "clang-ppc64be-multistage",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     clean=False,
                     checks=['check-all', 'check-runtimes'],
-                    checkout_compiler_rt=False,
                     checkout_lld=False,
                     useTwoStage=True,
+                    enable_runtimes="auto",
                     stage1_config='Release',
                     stage2_config='Release',
                     extra_cmake_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
-                        "-DLLVM_ENABLE_RUNTIMES=compiler-rt",
                         "-DLLVM_CCACHE_BUILD=ON"])},
 
     {'name' : "clang-ppc64le-linux-test-suite",
     'tags'  : ["clang", "ppc", "ppc64le"],
     'workernames' : ["ppc64le-clang-test-suite"],
     'builddir': "clang-ppc64le-test-suite",
     'factory' : TestSuiteBuilder.getTestSuiteBuildFactory(
                     depends_on_projects=["llvm", "clang", "clang-tools-extra",
                                          "compiler-rt"],
                     enable_runtimes="auto",
                     checks=['check-all', 'check-runtimes'],
                     extra_configure_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
                         "-DCMAKE_BUILD_TYPE=Release",
                         "-DLLVM_LIT_ARGS=-v",
                         "-DLLVM_CCACHE_BUILD=ON"])},
 
     {'name' : "clang-ppc64le-linux-multistage",
     'tags'  : ["clang", "ppc", "ppc64le"],
     'workernames' : ["ppc64le-clang-multistage-test"],
     'builddir': "clang-ppc64le-multistage",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     clean=False,
                     checks=['check-all', 'check-runtimes'],
-                    checkout_compiler_rt=False,
                     checkout_lld=False,
                     useTwoStage=True,
+                    enable_runtimes=True,
                     stage1_config='Release',
                     stage2_config='Release',
                     extra_cmake_args=[
                         '-DLLVM_ENABLE_ASSERTIONS=ON',
-                        '-DLLVM_ENABLE_RUNTIMES=compiler-rt',
                         '-DBUILD_SHARED_LIBS=ON',
                         '-DLLVM_CCACHE_BUILD=ON'])},
 
     {'name' : "clang-ppc64le-rhel",
     'tags'  : ["clang", "ppc", "ppc64le"],
     'workernames' : ["ppc64le-clang-rhel-test"],
     'builddir': "clang-ppc64le-rhel",
     'factory' : TestSuiteBuilder.getTestSuiteBuildFactory(

zorg/buildbot/builders/ClangBuilder.py

f.addStep(ShellCommand(name='clean stage 1',
                            flunkOnFailure=False,
                            description='cleaning stage 1',
                            descriptionDone='clean',
                            workdir='.',
                            doStepIf=clean_build_requested))
 
 
     ############# STAGE 1
+    if f.enable_projects:
         CmakeCommand.applyRequiredOptions(extra_cmake_args, [
-        ('-DLLVM_ENABLE_PROJECTS=', ";".join(f.depends_on_projects)),
+            ('-DLLVM_ENABLE_PROJECTS=', ";".join(f.enable_projects)),
             ])
+    if f.enable_runtimes:
+        CmakeCommand.applyRequiredOptions(extra_cmake_args, [
+            ('-DLLVM_ENABLE_RUNTIMES=', ";".join(f.enable_runtimes)),
+            ])
+
     rel_src_dir = LLVMBuildFactory.pathRelativeTo(f.llvm_srcdir, stage1_build)
 
     f.addStep(ShellCommand(name='cmake stage 1',
                            command=[cmake, "-G", "Ninja", rel_src_dir,
                                     "-DCMAKE_BUILD_TYPE="+stage1_config,
                                     "-DLLVM_ENABLE_ASSERTIONS=True",
                                     "-DLLVM_LIT_ARGS="+lit_args,
                                     "-DCMAKE_INSTALL_PREFIX=../"+stage1_install]