[zorg] r364475 - [zorg] Fixes for solaris11-amd64, solaris11-sparcv9 builders

[Rainer Orth via llvm-commits]

Author: ro
Date: Wed Jun 26 14:15:49 2019
New Revision: 364475

URL: http://llvm.org/viewvc/llvm-project?rev=364475&view=rev
Log:
[zorg] Fixes for solaris11-amd64, solaris11-sparcv9  builders

The first few days of running the Solaris 11 buildbots revealed a couple of
problems:

- The builders didn't honor the slaves' configured jobs property, but were
  running with the full parallelism discovered by ninja.  That massivly
  impacts other builders running on these systems, so im explicitly
  configuring jobs in the builder configs, too.

- Along the same line, the number of paralllel links is the worst problem
  here.  I had experimented with the LLVM_PARALLEL_LINK_JOBS option in
  the past, but only now (in cmake/modules/HandleLLVMOptions.cmake)
  discovered that it's Ninja-only. I'm reducing it to 4 here as an
  experiment.

- Unlike Solaris/x86, the Solaris/SPARC configure triplet defaults to
  sparc-sun-solaris2.11, which results in clang creating 32-bit
  binaries by default.  It turns out to be an inconsistency in
  config.guess which I'm trying to get resolved.  In the meantime, I'm
  forcing the proper triplet on both sparc and x86.

Differential Revision: https://reviews.llvm.org/D63757

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=364475&r1=364474&r2=364475&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Jun 26 14:15:49 2019
@@ -749,21 +749,27 @@ def _get_clang_builders():
          'slavenames' : ["solaris11-amd64"],
          'builddir' : "clang-solaris11-amd64",
          'factory': ClangBuilder.getClangCMakeBuildFactory(
+                      jobs=8,
                       clean=False,
                       checkout_lld=False,
                       extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
                                         '-DLLVM_TARGETS_TO_BUILD=X86',
-                                        '-DCLANG_DEFAULT_LINKER=/usr/bin/ld'])},
+                                        '-DLLVM_HOST_TRIPLE=x86_64-pc-solaris2.11',
+                                        '-DCLANG_DEFAULT_LINKER=/usr/bin/ld',
+                                        '-DLLVM_PARALLEL_LINK_JOBS=4'])},
 
         {'name' : "clang-solaris11-sparcv9",
          'slavenames' : ["solaris11-sparcv9"],
          'builddir' : "clang-solaris11-sparcv9",
          'factory': ClangBuilder.getClangCMakeBuildFactory(
+                      jobs=8,
                       clean=False,
                       checkout_lld=False,
                       extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
                                         '-DLLVM_TARGETS_TO_BUILD=Sparc',
-                                        '-DCLANG_DEFAULT_LINKER=/usr/bin/ld'])},
+                                        '-DLLVM_HOST_TRIPLE=sparcv9-pc-solaris2.11',
+                                        '-DCLANG_DEFAULT_LINKER=/usr/bin/ld',
+                                        '-DLLVM_PARALLEL_LINK_JOBS=4'])},
     ]
 
 # Polly builders.