Change PowerPC64 bots to build runtimes with -DLLVM_ENABLE_RUNTIMES

[kamaub]

Summary

All of the powerpc 64-bit little and big endian buildbots build their
runtimes with -DLLVM_ENABLE_PROJECTS in the cmake command; this method
is deprecated.
This patch updates all of the ppc64 bots, except the sanitizer bot,
to build runtimes with -DLLVM_ENABLE_RUNTIMES and adds a check-runtimes
test step as check-all does not currently check runtimes.

[amyk]

buildbot/osuosl/master/config/builders.py

653

Question:

Does enable_runtimes="auto" basically mean to do -DLLVM_ENABLE_RUNTIMES=compiler-rt? Is that why bots with these option on do not have the -DLLVM_ENABLE_RUNTIMES=compiler-rt CMake variable?

[kamaub]

Thanks for the review! :)

buildbot/osuosl/master/config/builders.py

653

Yes, by adding "compiler-rt" in the depends_on_projects variable and setting enable_runtimes to "auto" we allow line https://reviews.llvm.org/source/zorg/browse/main/zorg/buildbot/process/factory.py$51 to run all runtimes in the depends_on_projects variable as -DLLVM_ENABLE_RUNTIMES

[amyk]

Thanks for the patch and answering the question I had! I think all in all this LGTM.

buildbot/osuosl/master/config/builders.py

653

Gotcha! Thanks for answering my question. :)

[lei]

buildbot/osuosl/master/config/builders.py

676

This seems not related to changing how we build compiler-rt. Is it intentional?

[kamaub]

buildbot/osuosl/master/config/builders.py

676

I was incorrectly trying to mirror the little endian bot, but we should keep a shared and non-shared library build, I have removed this pre-commit as requested.

buildbot/osuosl/master/config/builders.py

# Clang builders.
 
     {'name' : "clang-ppc64be-linux-test-suite",
     'tags'  : ["clang", "ppc"],
     'workernames' : ["ppc64be-clang-test-suite"],
     'builddir': "clang-ppc64be-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-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,
                     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,
                     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(
                     depends_on_projects=["llvm", "clang", "clang-tools-extra", "lld", "compiler-rt"],
                     enable_runtimes="auto",
+                    checks=['check-all', 'check-runtimes'],
                     extra_configure_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=On", "-DCMAKE_C_COMPILER=clang",
                         "-DCMAKE_CXX_COMPILER=clang++",
                         "-DCLANG_DEFAULT_LINKER=lld",
                         "-DCMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN:PATH=/opt/rh/devtoolset-7/root/usr",
                         "-DCMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN:PATH=/opt/rh/devtoolset-7/root/usr",
                         "-DLLVM_BINUTILS_INCDIR=/usr/include", "-DBUILD_SHARED_LIBS=ON", "-DLLVM_ENABLE_WERROR=ON",
                         "-DCMAKE_BUILD_TYPE=Release",

zorg/buildbot/builders/UnifiedTreeBuilder.py

def addNinjaSteps(
     # Note: At this point env could be None, a dictionary, or a Property object.
     if isinstance(env, dict):
         check_env = env.copy() if env else dict()
         check_env['NINJA_STATUS'] = check_env.get('NINJA_STATUS', "%e [%u/%r/%f] ")
     else:
         check_env = env or {}
 
     for check in checks:
-        f.addStep(LitTestCommand(name="test-%s%s" % (step_name, check),
+        f.addStep(LitTestCommand(name="test-%s-%s" % (step_name, check),
                                  command=['ninja', check],
                                  description=[
                                    "Test", "just", "built", "components", "for",
                                    check,
                                  ],
                                  env=check_env,
                                  workdir=obj_dir,
                                  **kwargs # Pass through all the extra arguments.