[zorg] r247955 - Added new clang fast builder llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Thu Sep 17 17:34:46 2015
New Revision: 247955

URL: http://llvm.org/viewvc/llvm-project?rev=247955&view=rev
Log:
Added new clang fast builder llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast.
Patch by Michael Edwards.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.py
    zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.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=247955&r1=247954&r2=247955&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Sep 17 17:34:46 2015
@@ -123,6 +123,21 @@ def _get_clang_fast_builders():
                     env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin',
                          'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes'})},
 
+        {'name': "llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast",
+         'slavenames': ["ps4-buildslave1"],
+         'builddir': "llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast",
+         'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(
+                     extraCmakeOptions=["-DCMAKE_C_COMPILER=clang",
+                                        "-DCMAKE_CXX_COMPILER=clang++",
+                                        "-DCOMPILER_RT_BUILD_BUILTINS:BOOL=OFF",
+                                        "-DCOMPILER_RT_BUILD_SANITIZERS:BOOL=OFF",
+                                        "-DCOMPILER_RT_CAN_EXECUTE_TESTS:BOOL=OFF",
+                                        "-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF",
+                                        "-DLLVM_TOOL_COMPILER_RT_BUILD:BOOL=OFF",
+                                        "-DLLVM_TARGETS_TO_BUILD=X86"],
+                     triple="x86_64-scei-ps4",
+                     env={'PATH':'/opt/llvm_37/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'})},
+
         ]
 
 # Clang builders.

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=247955&r1=247954&r2=247955&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Thu Sep 17 17:34:46 2015
@@ -197,6 +197,9 @@ def get_build_slaves():
         # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU L5520 @ 2.27GHz
         create_slave("bpf-build-slave01", properties={'jobs': 16}, max_builds=1),
 
+        # Ubuntu 14.04 x86_64-scei-ps4, 2 x Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz
+        create_slave("ps4-buildslave1", properties={'jobs': 64}, max_builds=1),
+
         # Defunct.
         # Intel(R) Pentium(R) CPU G620 @ 2.60GHz, Ubuntu i686
         #create_slave("botether", properties={'jobs': 2}, max_builds=1),

Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=247955&r1=247954&r2=247955&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Thu Sep 17 17:34:46 2015
@@ -13,8 +13,10 @@ def getClangAndLLDBuildFactory(
            clean=True,
            env=None,
            withLLD=True,
+           extraCmakeOptions=None,
            extraCompilerOptions=None,
-           buildWithSanitizerOptions=None):
+           buildWithSanitizerOptions=None,
+           triple=None):
 
     llvm_srcdir = "llvm.src"
     llvm_objdir = "llvm.obj"
@@ -113,6 +115,13 @@ def getClangAndLLDBuildFactory(
         cmakeCommand += [
             "-DCMAKE_C_COMPILER=clang",
             "-DCMAKE_CXX_COMPILER=clang++"]
+    if triple:
+        cmakeCommand += [
+            "-DLLVM_DEFAULT_TARGET_TRIPLE=%s" % triple]
+
+    if extraCmakeOptions:
+        cmakeCommand += extraCmakeOptions
+
     cmakeCommand += [
         "-DCMAKE_C_FLAGS=\"%s\"" % (" ".join(options)),
         "-DCMAKE_CXX_FLAGS=\"-std=c++11 %s\"" % (" ".join(options)),