[libc++] Use the supported caches to setup build bots

[ldionne]

Summary

Instead of explicitly specifying configuration options when running
libc++ bots, use the pre-defined CMake caches.

[ldionne]

@EricWF Said privately that we tested those changes in production -- so that's what I'll do. I'll try shipping this and hopefully it doesn't explode.

buildbot/osuosl/master/config/builders.py

return [
              check_libcxx_abilist=True),
          'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              env={'CC': 'clang', 'CXX': 'clang++'},
-             cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
-                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF'},
+             use_cache='Generic-noexceptions.cmake',
              lit_extra_args=['--shuffle']),
          'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-libunwind-x86_64-linux-debian',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-libunwind-x86_64-linux-debian',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              env={'CC': 'clang', 'CXX': 'clang++'},
              cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON'},
              lit_extra_args=['--shuffle']),
          'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              env={'CC': 'clang', 'CXX': 'clang++'},
-             cmake_extra_opts={'LIBCXX_ENABLE_THREADS': 'OFF',
-                               'LIBCXX_ENABLE_MONOTONIC_CLOCK': 'OFF',
-                               'LIBCXXABI_ENABLE_THREADS': 'OFF'}),
+             use_cache='Generic-singlethreaded.cmake'),
          'category': 'libcxx'},
 
         # EricWF's builders
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx03',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx03',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
-            lit_extra_opts={'std':'c++03'},
+            use_cache='Generic-cxx03.cmake',
             check_libcxx_abilist=True),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx11',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx11',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
-            lit_extra_opts={'std': 'c++11'},
+            use_cache='Generic-cxx11.cmake',
             check_libcxx_abilist=True),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx14',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx14',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
-            lit_extra_opts={'std': 'c++14'},
+            use_cache='Generic-cxx14.cmake',
             check_libcxx_abilist=True),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx17',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx17',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
             cmake_extra_opts={'LIBCXX_BENCHMARK_TEST_ARGS': benchmark_opts},
-            lit_extra_opts={'std': 'c++17'},
+            use_cache='Generic-cxx17.cmake',
             check_libcxx_abilist=True,
             check_libcxx_benchmarks=True),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx2a',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx2a',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
             cmake_extra_opts={'LIBCXX_BENCHMARK_TEST_ARGS': benchmark_opts},
-            lit_extra_opts={'std': 'c++2a'},
+            use_cache='Generic-cxx2a.cmake',
             check_libcxx_abilist=True,
             check_libcxx_benchmarks=True),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-32bit',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-32bit',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
-            cmake_extra_opts={'LLVM_BUILD_32_BITS': 'ON'},
+            use_cache='Generic-32bits.cmake',
             check_libcxx_abilist=False),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-asan',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-asan',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
-            cmake_extra_opts={'LLVM_USE_SANITIZER': 'Address',
-                              'LIBCXX_BENCHMARK_TEST_ARGS': benchmark_opts},
+            cmake_extra_opts={'LIBCXX_BENCHMARK_TEST_ARGS': benchmark_opts},
+            use_cache='Generic-asan.cmake',
             check_libcxx_benchmarks=True),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-ubsan',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-ubsan',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
-            cmake_extra_opts={'LLVM_USE_SANITIZER': 'Undefined',
-                              'LIBCXX_ABI_UNSTABLE': 'ON',
-                              'LIBCXX_BENCHMARK_TEST_ARGS': benchmark_opts},
+            cmake_extra_opts={'LIBCXX_BENCHMARK_TEST_ARGS': benchmark_opts},
+            use_cache='Generic-ubsan.cmake',
             check_libcxx_benchmarks=True),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-msan',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-msan',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
-            cmake_extra_opts={'LLVM_USE_SANITIZER': 'MemoryWithOrigins',
-                              'LIBCXX_BENCHMARK_TEST_ARGS': benchmark_opts},
+            cmake_extra_opts={'LIBCXX_BENCHMARK_TEST_ARGS': benchmark_opts},
+            use_cache='Generic-msan.cmake',
             check_libcxx_benchmarks=True),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON'}),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
-            cmake_extra_opts={'LLVM_USE_SANITIZER': 'Thread'}),
+            use_cache='Generic-tsan.cmake'),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc5-cxx11',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc5-cxx11',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': '/opt/gcc-5/bin/gcc', 'CXX': '/opt/gcc-5/bin/g++'},
-            lit_extra_opts={'std': 'c++11'}),
+            use_cache='Generic-cxx11.cmake'),
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc-tot-latest-std',
          'slavenames': ericwf_slaves + docker_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc-tot-latest-std',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': '/opt/gcc-tot/bin/gcc', 'CXX': '/opt/gcc-tot/bin/g++'}),

 # Builders for ML-driven compiler optimizations.
 def _get_ml_compiler_opt_builders():
     common_extra_args = [
         "-DCMAKE_BUILD_TYPE=Release",
         "-DLLVM_CACHE_BUILD=ON",
         "-DLLVM_ENABLE_ASSERTIONS=ON", ]
 
     return [
-        # Development mode build bot: tensorflow C APIs are present, and 
+        # Development mode build bot: tensorflow C APIs are present, and
         # we can dynamically load models, and produce training logs.
         {'name': "ml-opt-dev-x86-64",
          'mergeRequests': False,
          'slavenames':["ml-opt-dev-x86-64-b1"],
          'builddir':"ml-opt-dev-x86-64-b1",
          'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                         clean=True,
                         depends_on_projects=['llvm'],
def get_builders():
 
     for b in _get_lldb_builders():
         b['category'] = 'lldb'
         yield b
 
     for b in _get_mlir_builders():
         b['category'] = 'mlir'
         yield b
-    
     for b in _get_ml_compiler_opt_builders():
         b['category'] = 'ml_opt'
         yield b
 
     for b in _get_sanitizer_builders():
         b['category'] = 'sanitizer'
         yield b
 

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

 reload(artifacts)
 reload(phased_builder_utils)
 
 def getLibcxxAndAbiBuilder(f=None, env=None, additional_features=None,
                            cmake_extra_opts=None, lit_extra_opts=None,
                            lit_extra_args=None, check_libcxx_abilist=False,
                            check_libcxx_benchmarks=None,
                            depends_on_projects=None,
+                           use_cache=None,
                            **kwargs):
 
     if env is None:
         env = {}
     if additional_features is None:
         additional_features = set()
     if cmake_extra_opts is None:
         cmake_extra_opts = {}
def getLibcxxAndAbiBuilder(f=None, env=None, additional_features=None,
 
     for key in lit_extra_opts:
         litTestArgs += (' --param=' + key + '=' + lit_extra_opts[key])
 
     cmake_opts = [properties.WithProperties('-DLLVM_LIT_ARGS='+litTestArgs)]
     for key in cmake_extra_opts:
         cmake_opts.append('-D' + key + '=' + cmake_extra_opts[key])
 
+    if use_cache:
+      libcxx_cache_dir = os.path.join(rel_src_dir, '..', 'libcxx', 'cmake', 'caches')
+      cache = os.path.join(libcxx_cache_dir, use_cache)
+      cmake_opts.append('-C' + cache)
+
     # FIXME: The libc++ abilist's are generated in release mode with debug
     # symbols Other configurations may contain additional non-inlined symbols.
     if check_libcxx_abilist and not 'CMAKE_BUILD_TYPE' in cmake_extra_opts:
        cmake_opts.append('-DCMAKE_BUILD_TYPE=RELWITHDEBINFO')
 
     # Force libc++ to use the in-tree libc++abi unless otherwise specified.
     if 'LIBCXX_CXX_ABI' not in cmake_extra_opts:
         cmake_opts.append('-DLIBCXX_CXX_ABI=libcxxabi')