[PATCH] D63757: [zorg] Fixes for solaris11-amd64, solaris11-sparcv9 builders

[Rainer Orth via Phabricator via llvm-commits]

ro created this revision.
ro added a reviewer: gkistanova.
ro added a project: Zorg.
Herald added subscribers: fedor.sergeev, jyknight.
Herald added a project: LLVM.

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.


Repository:
  rL LLVM

https://reviews.llvm.org/D63757

Files:
  buildbot/osuosl/master/config/builders.py


Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -749,21 +749,27 @@
          '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.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63757.206384.patch
Type: text/x-patch
Size: 1774 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190625/932f33a4/attachment.bin>