[zorg] Add builder for release build.

[PaulkaToast]

Summary

Following what seems to be the naming convention for other llvm builders:
<project>-<arch>-<os>-<type>

I modified the names of the builders:

• libc-x86_64-debian-dbg for bebug build.
• libc-x86_64-debian-dbg-asan for debug build running address sanitizers.
• libc-x86_64-debian will now be the release build.

This is because the default for most llvm buildbots seems to be to run the builders in release mode by default.

With this naming scheme adding a builder to run benchmarks for example might look like this:

• libc-x86_64-debian-benchmarks

and one running benchmarks in debug mode might be:

• libc-x86_64-debian-dbg-benchmarks

[sivachandra]

buildbot/osuosl/master/config/builders.py

1490

Should we add clang and clang-tools-extra here?

[gkistanova]

Just in case, old build dir should be removed manually from builder.

[PaulkaToast]

Gotcha thanks!

buildbot/osuosl/master/config/builders.py

 def _get_libc_builders():
     return [
         {'name': 'libc-x86_64-debian',
          'slavenames': ['libc-x86_64-debian'],
          'builddir': 'libc-x86_64-debian',
          'category': 'libc',
          'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
              script="libc-linux.py",
-             depends_on_projects=['llvm', 'libc'])},
+             depends_on_projects=['llvm', 'libc', 'clang', 'clang-tools-extra'])},
 
-        {'name': "libc-x86_64-debian-asan",
+        {'name': "libc-x86_64-debian-dbg",
          'slavenames': ["libc-x86_64-debian"],
-         'builddir': "libc-x86_64-debian-asan",
+         'builddir': "libc-x86_64-debian-dbg",
          'category' : 'libc',
          'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
              script="libc-linux.py",
-             depends_on_projects=['llvm', 'libc'],
-             extra_args=['--asan'])},
+             depends_on_projects=['llvm', 'libc', 'clang', 'clang-tools-extra'],
+             extra_args=['--debug'])},
+
+        {'name': "libc-x86_64-debian-dbg-asan",
+         'slavenames': ["libc-x86_64-debian"],
+         'builddir': "libc-x86_64-debian-dbg-asan",
+         'category' : 'libc',
+         'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
+             script="libc-linux.py",
+             depends_on_projects=['llvm', 'libc', 'clang', 'clang-tools-extra'],
+             extra_args=['--debug', '--asan'])},
     ]
 
 # Flang builders.
 def _get_flang_builders():
     return [
         {'name': "flang-aarch64-ubuntu",
          'slavenames':["flang-aarch64-ubuntu-build"],
          'builddir':"flang-aarch64-ubuntu-build",

buildbot/osuosl/master/config/status.py

return [
             builders = ["clang-ve-ninja"],
             addLogs=False),
          InformativeMailNotifier(
             fromaddr = "[e-mail]",
             sendToInterestedUsers = True,
             extraRecipients = ["[e-mail]", "[e-mail]"],
             subject="Build %(builder)s Failure",
             mode = "failing",
-            builders = ["libc-x86_64-debian", "libc-x86_64_debian-asan"],
+            builders = ["libc-x86_64-debian", "libc-x86_64_debian-dbg",
+                        "libc-x86_64-debian-dbg-asan"],
             addLogs=False),
          InformativeMailNotifier(
             fromaddr = "[e-mail]",
             sendToInterestedUsers = True,
             extraRecipients = ["[e-mail]"],
             subject="Sphinx build %(builder)s Failure",
             mode = "failing",
             builders = ["publish-sphinx-docs"],
             addLogs=False),
         ]

zorg/buildbot/builders/annotated/libc-linux.py

 #!/usr/bin/python
 
 import argparse
 import os
 import subprocess
 import sys
 import traceback
 import util
 from contextlib import contextmanager
 
 
 def main(argv):
     ap = argparse.ArgumentParser()
     ap.add_argument('--asan', action='store_true', default=False,
                     help='Build with address sanitizer enabled.')
+    ap.add_argument('--debug', action='store_true', default=False,
+                    help='Build in debug mode.')
     args, _ = ap.parse_known_args()
 
     source_dir = os.path.join('..', 'llvm-project')
 
     with step('cmake', halt_on_fail=True):
         projects = ['llvm', 'libc', 'clang', 'clang-tools-extra']
 
-        cmake_args = ['-GNinja', '-DCMAKE_BUILD_TYPE=Debug']
+        cmake_args = ['-GNinja']
+        if args.debug:
+            cmake_args.append('-DCMAKE_BUILD_TYPE=Debug')
+        else:
+            cmake_args.append('-DCMAKE_BUILD_TYPE=Release')
+
         if args.asan:
             cmake_args.append('-DLLVM_USE_SANITIZER=Address')
+
         cmake_args.append('-DLLVM_ENABLE_PROJECTS={}'.format(';'.join(projects)))
 
         run_command(['cmake', os.path.join(source_dir, 'llvm')] + cmake_args)
 
     with step('build llvmlibc', halt_on_fail=True):
         run_command(['ninja', 'llvmlibc'])
 
     with step('check-libc'):