[zorg] [PowerPC] Allow the PowerPC RHEL buildbot to use cmake with test-suite instead of LNT

[Conanap]

Summary

We would like to update the PowerPC RHEL buildbot (clang-ppc64le-rhel) to use cmake instead of LNT, so that we can streamline our process whenever we update CMakeList.txt

[gkistanova]

LGTM

[jsji]

zorg/buildbot/builders/ClangBuilder.py

489

Typo? '%(builddir)s/test/test-suite or /test/sandbox/test-suite?

566

Are you sure we have all these logfiles in cmake step?

[Conanap]

zorg/buildbot/builders/ClangBuilder.py

489

you are correct, thanks for catching this. I'll change the comment on commit.

566

this is a very good question that I'm not too sure about. I thought they would be generated on the fly; would you happen to have any idea @gkistanova ? @saghir @stefanp

[Conanap]

removed incorrect brackets

[Conanap]

Incorrectly updated this patch

[Conanap]

Removed logging as files are not available, updated comment and fix function call

[jsji]

zorg/buildbot/builders/ClangBuilder.py

566

I think there should be some cmake log? Or else if the cmake failed, we won't be able to see what is wrong in cmake steps.？

[Conanap]

zorg/buildbot/builders/ClangBuilder.py

566

I thought it might be enough to see it on stdout / err on the buildbot page but you make a fair point. Would adding a step just before to touch some log files sound like a good solution?

[jsji]

zorg/buildbot/builders/ClangBuilder.py

566

If the log are all in stdout/err then it is fine, no need to touch additional log.

[Conanap]

Not sure what happened with phabricator, but there's been no change since last diff and this is just for record sake.

buildbot/osuosl/master/config/builders.py

# Clang builders.
     'builddir': "clang-ppc64le-rhel",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
                     checkout_clang_tools_extra=True,
                     checkout_compiler_rt=False,
                     checkout_lld=True,
                     checkout_libcxx=False,
                     useTwoStage=False,
                     runTestSuite=True,
+                    cmake_test_suite=True,
                     stage1_config='Release',
                     nt_flags=['--threads=16', '--build-threads=16'],
                     extra_cmake_args=[
                         '-DLLVM_ENABLE_PROJECTS=clang;llvm;clang-tools-extra;lld',
                         '-DLLVM_ENABLE_RUNTIMES=compiler-rt',
                         "-DLLVM_ENABLE_ASSERTIONS=On", "-DCMAKE_C_COMPILER=clang",
                         "-DCMAKE_CXX_COMPILER=clang++",
                         "-DCLANG_DEFAULT_LINKER=lld",

zorg/buildbot/builders/ClangBuilder.py

def getClangCMakeGCSBuildFactory(
 
             # Triggers
             trigger_after_stage1=None):
     return _getClangCMakeBuildFactory(
                clean=clean, test=test, cmake=cmake, jobs=jobs, vs=vs,
                vs_target_arch=vs_target_arch, useTwoStage=useTwoStage,
                testStage1=testStage1, stage1_config=stage1_config,
                stage2_config=stage2_config, runTestSuite=runTestSuite,
-               nt_flags=nt_flags, testsuite_flags=testsuite_flags,
-               submitURL=submitURL, testerName=testerName,
-               env=env, extra_cmake_args=extra_cmake_args,
+               cmake_test_suite=cmake_test_suite, nt_flags=nt_flags,
+               testsuite_flags=testsuite_flags, submitURL=submitURL,
+               testerName=testerName, env=env, extra_cmake_args=extra_cmake_args,
                checkout_clang_tools_extra=checkout_clang_tools_extra,
                checkout_compiler_rt=checkout_compiler_rt,
                checkout_lld=checkout_lld,
                checkout_libcxx=checkout_libcxx,
                stage1_upload_directory=stage1_upload_directory,
                xz_compression_factor=xz_compression_factor,
                use_pixz_compression=use_pixz_compression,
                trigger_after_stage1=trigger_after_stage1)
def getClangCMakeBuildFactory(
             # Multi-stage compilation
             useTwoStage=False,
             testStage1=True,
             stage1_config='Release',
             stage2_config='Release',
 
             # Test-suite
             runTestSuite=False,
+            cmake_test_suite=False,
             nt_flags=None,
             testsuite_flags=None,
             submitURL=None,
             testerName=None,
 
             # Environmental variables for all steps.
             env=None,
             extra_cmake_args=None,
 
             # Extra repositories
             checkout_clang_tools_extra=True,
             checkout_compiler_rt=True,
             checkout_lld=True,
             checkout_libcxx=False,
             checkout_flang=False,
             checkout_test_suite=False):
     return _getClangCMakeBuildFactory(
                clean=clean, test=test, cmake=cmake, jobs=jobs, vs=vs,
                vs_target_arch=vs_target_arch, useTwoStage=useTwoStage,
                testStage1=testStage1, stage1_config=stage1_config,
                stage2_config=stage2_config, runTestSuite=runTestSuite,
-               nt_flags=nt_flags, testsuite_flags=testsuite_flags,
-               submitURL=submitURL, testerName=testerName,
-               env=env, extra_cmake_args=extra_cmake_args,
+               cmake_test_suite=cmake_test_suite, nt_flags=nt_flags,
+               testsuite_flags=testsuite_flags, submitURL=submitURL,
+               testerName=testerName, env=env, extra_cmake_args=extra_cmake_args,
                checkout_clang_tools_extra=checkout_clang_tools_extra,
                checkout_lld=checkout_lld,
                checkout_compiler_rt=checkout_compiler_rt,
                checkout_libcxx=checkout_libcxx,
                checkout_flang=checkout_flang,
                checkout_test_suite=checkout_test_suite)
 
 def _getClangCMakeBuildFactory(
def _getClangCMakeBuildFactory(
             # Multi-stage compilation
             useTwoStage=False,
             testStage1=True,
             stage1_config='Release',
             stage2_config='Release',
 
             # Test-suite
             runTestSuite=False,
+            cmake_test_suite=False,
             nt_flags=None,
             testsuite_flags=None,
             submitURL=None,
             testerName=None,
 
             # Environmental variables for all steps.
             env=None,
             extra_cmake_args=None,
def _getClangCMakeBuildFactory(
     f = LLVMBuildFactory(
             depends_on_projects=depends_on_projects,
             llvm_srcdir='llvm')
 
     # Checkout the latest code for LNT
     # and the test-suite separately. Le's do this first,
     # so we wouldn't poison got_revision property.
     if runTestSuite or checkout_test_suite:
+        if not cmake_test_suite:
             f.addGetSourcecodeForProject(
                 project='lnt',
                 src_dir='test/lnt',
                 alwaysUseLatest=True)
         f.addGetSourcecodeForProject(
             project='test-suite',
             src_dir='test/test-suite',
             alwaysUseLatest=True)
 
     # Then get the LLVM source code revision this particular build is for.
     f.addGetSourcecodeSteps()
 
if runTestSuite:
             f.addStep(ShellCommand(name='install stage 2',
                                    command=ninja_install_cmd,
                                    description='ninja install 2',
                                    workdir=stage2_build,
                                    env=env))
 
         # Get generated python, lnt
         python = WithProperties('%(builddir)s/test/sandbox/bin/python')
+        if not cmake_test_suite:
             lnt = WithProperties('%(builddir)s/test/sandbox/bin/lnt')
             lnt_setup = WithProperties('%(builddir)s/test/lnt/setup.py')
 
         # Paths
         sandbox = WithProperties('%(builddir)s/test/sandbox')
         test_suite_dir = WithProperties('%(builddir)s/test/test-suite')
 
         # Get latest built Clang (stage1 or stage2)
         cc = WithProperties('%(builddir)s/'+compiler_path+'/bin/'+cc)
         cxx = WithProperties('%(builddir)s/'+compiler_path+'/bin/'+cxx)
 
         # LNT Command line (don't pass -jN. Users need to pass both --threads
         # and --build-threads in nt_flags/test_suite_flags to get the same effect)
         use_runtest_testsuite = len(nt_flags) == 0
-        if not use_runtest_testsuite:
+        # with LNT, the workdir needs to be test/sandbox,
+        # but the CMakeList.txt and Makefiles are in /test/sandbox/test-suite.
+        test_suite_work_dir = 'test/sandbox'
+        if cmake_test_suite:
+            cmake_test_suite_cmd = ['cmake', '-G', 'Unix', 'Makefiles',
+                                    '--cc', cc,
+                                    '--cxx', cxx]
+            test_suite_cmd = ['make', '-k']
+            test_suite_work_dir = test_suite_dir
+        elif not use_runtest_testsuite:
             test_suite_cmd = [python, lnt, 'runtest', 'nt',
                               '--no-timestamp',
                               '--sandbox', sandbox,
                               '--test-suite', test_suite_dir,
                               '--cc', cc,
                               '--cxx', cxx]
             # Append any option provided by the user
             test_suite_cmd.extend(nt_flags)
if runTestSuite:
                                workdir='test',
                                env=env))
         f.addStep(ShellCommand(name='setup lit',
                                command=[python, lnt_setup, 'develop'],
                                haltOnFailure=True,
                                description='setting up LNT in sandbox',
                                workdir='test/sandbox',
                                env=env))
+        if cmake_test_suite:
+            f.addStep(LitTestCommand(
+                               name='cmake test-suite',
+                               command=cmake_test_suite_cmd,
+                               haltOnFailure=True,
+                               description=['running cmake for test suite'],
+                               workdir=test_suite_work_dir,
+                               logfiles={'configure.log'   : 'build/configure.log',
+                                         'build-tools.log' : 'build/build-tools.log',
+                                         'test.log'        : 'build/test.log',
+                                         'report.json'     : 'build/report.json'},
+                               env=test_suite_env))
         f.addStep(LitTestCommand(
                                name='test-suite',
                                command=test_suite_cmd,
                                haltOnFailure=True,
                                description=['running the test suite'],
-                               workdir='test/sandbox',
+                               workdir=test_suite_work_dir,
                                logfiles={'configure.log'   : 'build/configure.log',
                                          'build-tools.log' : 'build/build-tools.log',
                                          'test.log'        : 'build/test.log',
                                          'report.json'     : 'build/report.json'},
                                env=test_suite_env))
 
     return f