[zorg] r233235 - For modules builds, 'make intrinsics_gen' before 'make all' to temporarily work around missing build dependencies. Bump modules builder from -j1 to -j16.

[Richard Smith]

Author: rsmith
Date: Wed Mar 25 19:18:15 2015
New Revision: 233235

URL: http://llvm.org/viewvc/llvm-project?rev=233235&view=rev
Log:
For modules builds, 'make intrinsics_gen' before 'make all' to temporarily work around missing build dependencies. Bump modules builder from -j1 to -j16.

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

Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=233235&r1=233234&r2=233235&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Wed Mar 25 19:18:15 2015
@@ -158,7 +158,7 @@ def get_build_slaves():
         create_slave("sanitizer-buildbot5", properties={'jobs': 8}, max_builds=1),
 
         # Debian 7.7 x86_64 GCE instance
-        create_slave("modules-slave-1", properties={'jobs': 1}, max_builds=1),
+        create_slave("modules-slave-1", properties={'jobs': 16}, max_builds=1),
 
         # zEnterprise 196 (s390x), SLES 11 SP2
         create_slave("systemz-1", properties={'jobs': 4}, max_builds=1),

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=233235&r1=233234&r2=233235&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Mar 25 19:18:15 2015
@@ -368,6 +368,18 @@ def getClangBuildFactory(
                                workdir=llvm_2_objdir,
                                env=merged_env))
 
+    if modules:
+        f.addStep(WarningCountingShellCommand(name="compile.llvm.stage2.intrinsics_gen",
+                                              command=['nice', '-n', '10',
+                                                       make, "intrinsics_gen", WithProperties("-j%s" % jobs)],
+                                              haltOnFailure=True,
+                                              description=["compiling", "(stage 2 intrinsics.gen)",
+                                                           stage2_config],
+                                              descriptionDone=["compile", "(stage 2 intrinsics.gen)",
+                                                               stage2_config],
+                                              workdir=llvm_2_objdir,
+                                              env=merged_env))
+
     # Build llvm (stage 2).
     f.addStep(WarningCountingShellCommand(name="compile.llvm.stage2",
                                           command=['nice', '-n', '10',