[BOLT] Enable clang-bolt LTO+PGO target

[Amir]

Summary

Enable testing of BOLT applied to Clang using BOLT-PGO.cmake cache file.

[Amir]

Bugfixes

[Amir]

Remove bolt-gcc config (is failing)

[Amir]

Remove unrelated changes

[gkistanova]

Thanks for the patch, Amir!

It looks good with a nit pick.
Please feel free to commit without that unrelated cosmetic change.

buildbot/osuosl/master/config/builders.py

1585

This is an unrelated cosmic change.

[Amir]

Remove unrelated change

buildbot/osuosl/master/config/builders.py

'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     extra_configure_args=[
                         "-DLLVM_CCACHE_BUILD=ON",
                         '-DLLVM_TARGETS_TO_BUILD=SystemZ',
                         '-DLLVM_ENABLE_PROJECTS=mlir',
                         '-DLLVM_LIT_ARGS=-vj 4',
                     ])},
 
 # Sanitizer builders.
 # 
 # bootstrap-asan, bootstrap-msan, and sanitizer-x86_64-linux-fast have steps
 # with large memory usage, so assign them to different workers.
 
     {'name' : "sanitizer-x86_64-linux",
     'tags'  : ["sanitizer"],
     'workernames' : [
         "sanitizer-buildbot1",
         "sanitizer-buildbot2",
# Builders for ML-driven compiler optimizations.
     'collapseRequests': False,
     'workernames' : ['bolt-worker'],
     'builddir': "bolt-x86_64-ubuntu-nfc",
     'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
                     script="bolt-nfc.py",
                     depends_on_projects=['llvm', 'bolt'],
                     )},
 
+    {'name': "bolt-x86_64-ubuntu-clang-bolt-lto-pgo",
+    'tags': ["bolt"],
+    'collapseRequests': False,
+    'workernames':["bolt-worker"],
+    'builddir': "bolt-x86_64-ubuntu-clang-bolt-lto-pgo",
+    'factory' : BOLTBuilder.getBOLTCmakeBuildFactory(
+                    bolttests=False,
+                    depends_on_projects=['bolt', 'clang', 'lld', 'llvm'],
+                    cache='clang/cmake/caches/BOLT-PGO.cmake',
+                    targets=['stage2-clang++-bolt'],
+                    extra_configure_args=[
+                        "-DLLVM_APPEND_VC_REV=OFF",
+                        "-DLLVM_ENABLE_LLD=ON",
+                        "-DBOOTSTRAP_LLVM_ENABLE_LLD=ON",
+                        "-DBOOTSTRAP_BOOTSTRAP_LLVM_ENABLE_LLD=ON",
+                        "-DLLVM_CCACHE_BUILD=ON",
+                        "-DBOOTSTRAP_LLVM_CCACHE_BUILD=ON",
+                        "-DPGO_INSTRUMENT_LTO=Thin",
+                        ],
+                    )},
+
     {'name': "bolt-x86_64-ubuntu-dylib",
     'tags': ["bolt"],
     'collapseRequests': False,
     'workernames':["bolt-worker"],
     'builddir': "bolt-x86_64-ubuntu-dylib",
     'factory' : BOLTBuilder.getBOLTCmakeBuildFactory(
                     bolttests=False,
                     extra_configure_args=[

zorg/buildbot/builders/BOLTBuilder.py

 from buildbot.plugins import steps
 from zorg.buildbot.commands.CmakeCommand import CmakeCommand
 from zorg.buildbot.builders.UnifiedTreeBuilder import getLLVMBuildFactoryAndSourcecodeSteps, addCmakeSteps, addNinjaSteps
 from zorg.buildbot.process.factory import LLVMBuildFactory
 
 def getBOLTCmakeBuildFactory(
            clean = False,
            bolttests = False,
+           targets = None,
+           checks = None,
+           cache = None,
            extra_configure_args = None,
            env = None,
+           depends_on_projects = ['bolt', 'llvm'],
            **kwargs):
 
     if env is None:
         env = dict()
 
     bolttests_dir = "bolt-tests"
 
     cleanBuildRequested = lambda step: clean or step.build.getProperty("clean", default=step.build.getProperty("clean_obj"))
     cleanBuildRequestedByProperty = lambda step: step.build.getProperty("clean")
 
+    if not targets:
+        targets = ['bolt']
+    if not checks:
         checks = ['check-bolt']
-    extra_steps = []
 
     f = getLLVMBuildFactoryAndSourcecodeSteps(
-            depends_on_projects=['bolt', 'llvm'],
+            depends_on_projects=depends_on_projects,
             **kwargs) # Pass through all the extra arguments.
 
     if bolttests:
         checks += ['check-large-bolt']
         extra_configure_args += [
             '-DLLVM_EXTERNAL_PROJECTS=bolttests',
             '-DLLVM_EXTERNAL_BOLTTESTS_SOURCE_DIR=' + LLVMBuildFactory.pathRelativeTo(bolttests_dir, f.monorepo_dir),
             ]
if bolttests:
                 alwaysUseLatest=True),
             ])
 
     # Some options are required for this build no matter what.
     CmakeCommand.applyRequiredOptions(extra_configure_args, [
         ('-G',                      'Ninja'),
         ])
 
+    if cache:
+        CmakeCommand.applyRequiredOptions(extra_configure_args, [
+            ("-C", f"../{f.monorepo_dir}/{cache}"),
+            ])
+
     addCmakeSteps(
         f,
         cleanBuildRequested=cleanBuildRequested,
         extra_configure_args=extra_configure_args,
         obj_dir=None,
         env=env,
         **kwargs)
 
     addNinjaSteps(
         f,
-        targets = ['bolt'],
+        targets=targets,
         checks=checks,
         env=env,
         **kwargs)
 
     return f