[zorg] r250670 - Polly: Use Release+Asserts on non-performance builders

[Tobias Grosser via llvm-commits]

Author: grosser
Date: Sun Oct 18 18:41:19 2015
New Revision: 250670

URL: http://llvm.org/viewvc/llvm-project?rev=250670&view=rev
Log:
Polly: Use Release+Asserts on non-performance builders

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=250670&r1=250669&r2=250670&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sun Oct 18 18:41:19 2015
@@ -461,6 +461,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',
                                                     package_cache="http://parkas1.inria.fr/packages",
                                                     testerName='x86_64-penryn-O3-polly-fast')},
 
@@ -470,6 +471,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',
                                                     package_cache="http://parkas1.inria.fr/packages",
                                                     testerName='x86_64-penryn-O3-polly-parallel-fast')},
 
@@ -479,6 +481,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',
                                                     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=250670&r1=250669&r2=250670&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/PollyBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/PollyBuilder.py Sun Oct 18 18:41:19 2015
@@ -74,11 +74,10 @@ def getPollyBuildFactory():
                                workdir=llvm_objdir))
     return f
 
-def AddExternalPollyBuildFactory(f, llvm_installdir):
+def AddExternalPollyBuildFactory(f, llvm_installdir, build_type = "Release"):
     polly_srcdir = 'polly.src'
     polly_objdir = 'polly.obj'
     polly_installdir = 'polly.install'
-    build_type = 'Release'
 
     # Determine the build directory.
     f.addStep(buildbot.steps.shell.SetProperty(name="get_builddir",
@@ -128,7 +127,7 @@ def AddExternalPollyBuildFactory(f, llvm
                            workdir=polly_objdir))
 
 def getPollyLNTFactory(triple, nt_flags, xfails=[], clean=False, test=False,
-                  **kwargs):
+                       build_type="Release", **kwargs):
     lnt_args = {}
     lnt_arg_names = ['submitURL', 'package_cache', 'testerName', 'reportBuildslave']
 
@@ -140,7 +139,7 @@ def getPollyLNTFactory(triple, nt_flags,
 
     f = ClangBuilder.getClangBuildFactory(
         triple, clean=clean, test=test,
-        stage1_config='Release', **kwargs)
+        stage1_config=build_type, **kwargs)
 
     f.addStep(ShellCommand(name="install-llvm-and-clang",
                            command=["make", "install"],
@@ -148,7 +147,7 @@ def getPollyLNTFactory(triple, nt_flags,
                            description=["install llvm and clang"],
                            workdir="llvm.obj"))
 
-    AddExternalPollyBuildFactory(f, llvm_install_dir)
+    AddExternalPollyBuildFactory(f, llvm_install_dir, build_type)
 
     nt_flags.append('--cflag=' + '-Xclang')
     nt_flags.append('--cflag=' + '-load')