[zorg] r259327 - Move PollyPerf builders to cmake

[Tobias Grosser via llvm-commits]

Author: grosser
Date: Sun Jan 31 13:32:51 2016
New Revision: 259327

URL: http://llvm.org/viewvc/llvm-project?rev=259327&view=rev
Log:
Move PollyPerf builders to cmake

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/PollyBuilder.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=259327&r1=259326&r2=259327&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sun Jan 31 13:32:51 2016
@@ -471,7 +471,7 @@ def _get_polly_builders():
          'factory': PollyBuilder.getPollyLNTFactory(triple="x86_64-pc-linux-gnu",
                                                     nt_flags=['--multisample=1', '--mllvm=-polly', '-j16' ],
                                                     reportBuildslave=False,
-                                                    build_type='Release+Asserts',
+                                                    extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'],
                                                     package_cache="http://parkas1.inria.fr/packages",
                                                     testerName='x86_64-penryn-O3-polly-fast')},
 
@@ -481,7 +481,7 @@ def _get_polly_builders():
          'factory': PollyBuilder.getPollyLNTFactory(triple="x86_64-pc-linux-gnu",
                                                     nt_flags=['--multisample=1', '--mllvm=-polly', '--mllvm=-polly-parallel', '-j16', '--cflag=-lgomp' ],
                                                     reportBuildslave=False,
-                                                    build_type='Release+Asserts',
+                                                    extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'],
                                                     package_cache="http://parkas1.inria.fr/packages",
                                                     testerName='x86_64-penryn-O3-polly-parallel-fast')},
 
@@ -491,7 +491,7 @@ def _get_polly_builders():
          'factory': PollyBuilder.getPollyLNTFactory(triple="x86_64-pc-linux-gnu",
                                                     nt_flags=['--multisample=1', '--mllvm=-polly', '--mllvm=-polly-process-unprofitable', '-j16'],
                                                     reportBuildslave=False,
-                                                    build_type='Release+Asserts',
+                                                    extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'],
                                                     package_cache="http://parkas1.inria.fr/packages",
                                                     testerName='x86_64-penryn-O3-polly-unprofitable')},
 

Modified: zorg/trunk/zorg/buildbot/builders/PollyBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/PollyBuilder.py?rev=259327&r1=259326&r2=259327&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/PollyBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/PollyBuilder.py Sun Jan 31 13:32:51 2016
@@ -127,7 +127,7 @@ def AddExternalPollyBuildFactory(f, llvm
                            workdir=polly_objdir))
 
 def getPollyLNTFactory(triple, nt_flags, xfails=[], clean=False, test=False,
-                       build_type="Release", **kwargs):
+                       build_type="Release", extra_cmake_args=[], **kwargs):
     lnt_args = {}
     lnt_arg_names = ['submitURL', 'package_cache', 'testerName', 'reportBuildslave']
 
@@ -135,17 +135,22 @@ def getPollyLNTFactory(triple, nt_flags,
         if argname in kwargs:
             lnt_args[argname] = kwargs.pop(argname)
 
-    llvm_install_dir = 'llvm.install.1'
+    llvm_install_dir = 'stage1.install'
 
-    f = ClangBuilder.getClangBuildFactory(
-        triple, clean=clean, test=test,
-        stage1_config=build_type, **kwargs)
+    f = ClangBuilder.getClangCMakeBuildFactory(
+        test=False,
+        useTwoStage=False,
+        clean=clean,
+        checkout_clang_tools_extra=False,
+        checkout_compiler_rt=False,
+        extra_cmake_args=extra_cmake_args,
+        stage1_config=build_type)
 
     f.addStep(ShellCommand(name="install-llvm-and-clang",
-                           command=["make", "install"],
+                           command=["ninja", "install"],
                            haltOnFailure=True,
                            description=["install llvm and clang"],
-                           workdir="llvm.obj"))
+                           workdir="stage1"))
 
     AddExternalPollyBuildFactory(f, llvm_install_dir, build_type)