Add 'cmake' keyword argument to PollyBuilder and AOSPBuilder

[kparzysz]

Summary

This follows what ClangBuilder does (getClangCMakeBuildFactory).

Use it to set cmake to 3.17.0 on all hexagon builders.

[kparzysz]

Committed in 312225d90d437cff01577bc3e3e1851059691157 (forgot to add the review URL to the commit message).

[gkistanova]

Hello Krzysztof,

Could you elaborate why do you need to parametrize the cmake command, please?
Do you plan running multiple versions of cmake on the same buildbot simultaniously?

Why just updating cmake on your bots is not anough and zorg changes are required?

[kparzysz]

This is because the latest cmake was installed by hand in a non-standard location. There are no Ubuntu packages with the new cmake available for the version running on the bots (15.04).

Also, the clang factory did already accept cmake command as an argument, I thought that adding this to the other factories would make things consistent.

[gkistanova]

Any problems with making that new cmake be executed by default? Like adding it to the PATH or by using alternatives. This is something specific to that computer configuration, not to the build configuration.

Also, the clang factory did already accept cmake command as an argument,

That’s a legacy and was introduced for different purposes. It is just waiting for the next round of refactoring to be removed.

[kparzysz]

I changed it to using PATH.

[gkistanova]

Thank you very much, Krzysztof!

[kparzysz]

This change was reverted and replaced with another commit.

buildbot/osuosl/master/config/builders.py

return [
          'factory'       : ABITestsuitBuilder.getABITestsuitBuildFactory(
                                # TODO: Enable Werror once all the warnings are cleaned.
                                extra_configure_args = ["-DLLVM_ENABLE_WERROR=OFF","-GNinja"])},
 
         {'name' : "clang-hexagon-elf",
          'slavenames' :["hexagon-build-02", "hexagon-build-03"],
          'builddir' :"clang-hexagon-elf",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
+            cmake='/local/cmake-3.17.0/bin/cmake',
             jobs=16,
             checkout_clang_tools_extra=False,
             checkout_compiler_rt=False,
             checkout_lld=False,
             env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib'},
             extra_cmake_args=[
               "-DCMAKE_BUILD_TYPE:STRING=Release",
               "-DLLVM_TARGETS_TO_BUILD:STRING=Hexagon",

 
 # Polly builders.
 def _get_polly_builders():
     return [
         {'name': "polly-arm-linux",
          'slavenames': ["hexagon-build-02", "hexagon-build-03"],
          'builddir': "polly-arm-linux",
          'factory': PollyBuilder.getPollyBuildFactory(
+                cmake='/local/cmake-3.17.0/bin/cmake',
                 clean=True,
                 install=True,
                 make='ninja',
                 jobs=16,
                 env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib'},
                 extraCmakeArgs=["-G", "Ninja",
                                 "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                 "-DLLVM_DEFAULT_TARGET_TRIPLE=arm-linux-gnueabi",

 def _get_aosp_builders():
     return [
         {'name': "aosp-O3-polly-before-vectorizer-unprofitable",
          'slavenames': ["hexagon-build-03"],
          'builddir': "aosp",
          'factory': AOSPBuilder.getAOSPBuildFactory(
                 device="angler",
                 build_clang=True,
+                cmake='/local/cmake-3.17.0/bin/cmake',
                 extra_cmake_args=["-G", "Ninja",
                                   "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                   "-DLLVM_DEFAULT_TARGET_TRIPLE=arm-linux-androideabi",
                                   "-DLLVM_TARGET_ARCH=arm-linux-androideabi",
                                   "-DLLVM_ENABLE_ASSERTIONS=True",
                                   "-DLLVM_ENABLE_LIBCXX:BOOL=ON",
                                   "-DCMAKE_C_COMPILER:FILEPATH=/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang",
                                   "-DCMAKE_CXX_COMPILER:FILEPATH=/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang++"],

 
 # Reverse iteration builders.
 def _get_rev_iter_builders():
     return [
         {'name': "reverse-iteration",
          'slavenames': ["hexagon-build-02", "hexagon-build-03"],
          'builddir': "reverse-iteration",
          'factory': PollyBuilder.getPollyBuildFactory(
+                cmake='/local/cmake-3.17.0/bin/cmake',
                 clean=True,
                 make='ninja',
                 jobs=16,
                 checkAll=True,
                 env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib'},
                 extraCmakeArgs=["-G", "Ninja",
                                 "-DLLVM_REVERSE_ITERATION:BOOL=ON",
                                 "-DLLVM_ENABLE_ASSERTIONS=True",

zorg/buildbot/builders/AOSPBuilder.py

def getAOSPBuildCommand(
     if jobs:
         command += " -j" + str(jobs)
     return command
 
 
 def getAOSPBuildFactory(
     device,                # Target device for AOSP build
     build_clang=False,     # Flag to control building Clang for AOSP target build
+    cmake='cmake',         # Cmake executable
     extra_cmake_args=[],   # Extra args for the LLVM cmake command
                            # This flag is ignored if build_clang is False
     timeout=None,          # Maximum CPU time in seconds, umlimited if 'None'
     target_clang=None,     # Path to the Clang used for AOSP target build
                            # Set target_clang to None to use AOSP's default Clang
                            # This flag is ignored if build_clang is True
     target_flags=None,     # Extra C/CXX flags for AOSP target build
     jobs=None,             # Number of concurrent jobs
     extra_make_args=None,  # Extra args for the make command
     env={},                # Environmen variables for all steps
     clean=False,           # Flag to control whether AOSP repo is cleaned
     sync=False,            # Flag to control whether AOSP repo is synced
     patch=None):           # Name of the patch to apply to AOSP source
     f = buildbot.process.factory.BuildFactory()
     clang_dir = target_clang
 
     # Build Clang for AOSP target build
     if build_clang:
-        f = PollyBuilder.getPollyBuildFactory(clean=True,
+        f = PollyBuilder.getPollyBuildFactory(cmake=cmake,
+                                              clean=True,
                                               install=True,
                                               make='ninja',
                                               jobs=jobs,
                                               env=env,
                                               extraCmakeArgs=extra_cmake_args)
         clang_dir = 'llvm.inst/bin'
 
     # Restore AOSP repo to a clean state

zorg/buildbot/builders/PollyBuilder.py

 from buildbot.steps.shell import Configure, ShellCommand
 from buildbot.process.properties import WithProperties
 
 from zorg.buildbot.builders import LNTBuilder
 from zorg.buildbot.builders import ClangBuilder
 from zorg.buildbot.process.factory import LLVMBuildFactory
 
 def getPollyBuildFactory(
+    cmake='cmake',
     clean=False,
     install=False,
     make='make',
     jobs=None,
     checkAll=False,
     env=None,
     extraCmakeArgs=None,
     **kwargs):
f.addStep(ShellCommand(name='clean-build-dir',
                            command=['rm', '-rf', llvm_objdir],
                            warnOnFailure=True,
                            description=["clean build dir"],
                            workdir='.',
                            env=merged_env,
                            doStepIf=cleanBuildRequested))
 
     # Create configuration files with cmake
-    cmakeCommand = ["cmake", "../%s/llvm" % llvm_srcdir,
+    cmakeCommand = [cmake, "../%s/llvm" % llvm_srcdir,
                     "-DCMAKE_COLOR_MAKEFILE=OFF",
                     "-DPOLLY_TEST_DISABLE_BAR=ON",
                     "-DPOLLY_ENABLE_GPGPU_CODEGEN=ON",
                     "-DCMAKE_BUILD_TYPE=Release",
                     "-DLLVM_POLLY_LINK_INTO_TOOLS=ON",
                     "-DLLVM_ENABLE_PROJECTS=%s" % ";".join(f.depends_on_projects),
                    ] + cmake_install + extraCmakeArgs
     f.addStep(ShellCommand(name="cmake-configure",