[zorg] r198295 - Do not include buildslave name in Polly's LNT results
Tobias Grosser
tobias at grosser.es
Thu Jan 2 02:25:35 PST 2014
Author: grosser
Date: Thu Jan 2 04:25:34 2014
New Revision: 198295
URL: http://llvm.org/viewvc/llvm-project?rev=198295&view=rev
Log:
Do not include buildslave name in Polly's LNT results
This allows us to run the same nightly tests on different servers. Which
means we can afford to run with more iterations and on a shorter list
of commits.
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/zorg/buildbot/builders/LNTBuilder.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=198295&r1=198294&r2=198295&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Jan 2 04:25:34 2014
@@ -631,6 +631,7 @@ def _get_polly_builders():
'builddir':"pollyperf-O3",
'factory': PollyBuilder.getPollyLNTFactory(triple="x86_64-pc-linux-gnu",
nt_flags=['--multisample=10'],
+ reportBuildslave=False,
testerName='pollyperf-O3')},
{'name': "polly-perf-O3-polly",
'slavenames':["pollyperf6"],
@@ -638,6 +639,7 @@ def _get_polly_builders():
'factory': PollyBuilder.getPollyLNTFactory(triple="x86_64-pc-linux-gnu",
nt_flags=['--multisample=10', '--mllvm=-polly'],
xfails=polly_x86_64_linux_xfails,
+ reportBuildslave=False,
testerName='pollyperf-O3-polly')},
{'name': "polly-perf-O3-polly-codegen-isl",
'slavenames':["pollyperf7"],
@@ -645,6 +647,7 @@ def _get_polly_builders():
'factory': PollyBuilder.getPollyLNTFactory(triple="x86_64-pc-linux-gnu",
nt_flags=['--multisample=10', '--mllvm=-polly', '--mllvm=-polly-code-generator=isl'],
xfails=polly_x86_64_linux_xfails,
+ reportBuildslave=False,
testerName='pollyperf-O3-polly-codegen-isl')},
{'name': "polly-perf-O3-polly-scev",
'slavenames':["pollyperf10"],
@@ -652,6 +655,7 @@ def _get_polly_builders():
'factory': PollyBuilder.getPollyLNTFactory(triple="x86_64-pc-linux-gnu",
nt_flags=['--multisample=10', '--mllvm=-polly', '--mllvm=-polly-codegen-scev'],
xfails=polly_perf_O3_polly_scev_codegen_xfails,
+ reportBuildslave=False,
testerName='pollyperf-O3-polly-scev')},
{'name': "polly-perf-O3-polly-scev-codegen-isl",
'slavenames':["pollyperf11"],
@@ -659,6 +663,7 @@ def _get_polly_builders():
'factory': PollyBuilder.getPollyLNTFactory(triple="x86_64-pc-linux-gnu",
nt_flags=['--multisample=10', '--mllvm=-polly', '--mllvm=-polly-code-generator=isl', '--mllvm=-polly-codegen-scev'],
xfails=polly_perf_O3_polly_scev_codegen_xfails,
+ reportBuildslave=False,
testerName='pollyperf-O3-polly-scev-codegen-isl')},
{'name': "polly-perf-O3-polly-detect",
'slavenames':["pollyperf14"],
@@ -666,6 +671,7 @@ def _get_polly_builders():
'factory': PollyBuilder.getPollyLNTFactory(triple="x86_64-pc-linux-gnu",
nt_flags=['--multisample=10', '--mllvm=-polly', '--mllvm=-polly-code-generator=none', '--mllvm=-polly-optimizer=none'],
xfails=polly_perf_O3_polly_detect_xfails,
+ reportBuildslave=False,
testerName='pollyperf-O3-polly-detect')}
]
Modified: zorg/trunk/zorg/buildbot/builders/LNTBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LNTBuilder.py?rev=198295&r1=198294&r2=198295&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LNTBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LNTBuilder.py Thu Jan 2 04:25:34 2014
@@ -38,9 +38,10 @@ def _get_liblto(status, stdin, stdout):
return {}
def getLNTFactory(triple, nt_flags, xfails=[], clean=True, test=False,
- **kwargs):
+ reportBuildslave = True, **kwargs):
lnt_args = {}
- lnt_arg_names = ['submitURL', 'package_cache', 'testerName']
+ lnt_arg_names = ['submitURL', 'package_cache', 'testerName',
+ 'reportBuildslave']
for argname in lnt_arg_names:
if argname in kwargs:
@@ -73,6 +74,7 @@ def AddLNTTestsToFactory(f, nt_flags, cc
submitURL = kwargs.pop('submitURL', 'http://llvm.org/perf/submitRun')
package_cache = kwargs.pop('package_cache', 'http://lab.llvm.org/packages')
testerName = kwargs.pop('testerName', None)
+ reportBuildslave = kwargs.pop('reportBuildslave', True)
env = kwargs.pop('env', {})
# Create variables to refer to the compiler-under-test.
@@ -128,12 +130,14 @@ def AddLNTTestsToFactory(f, nt_flags, cc
haltOnFailure=True, description=['clean', 'LNT', 'sandbox'],
workdir='tests'))
- reportName = '%(slavename)s'
+ if reportBuildslave:
+ reportName = '%(slavename)s'
- if testerName:
- reportName += '__' + testerName
-
- reportName = WithProperties(reportName)
+ if testerName:
+ reportName += '__' + testerName
+ reportName = WithProperties(reportName)
+ else:
+ reportName = testerName
# Run the nightly test.
args = [WithProperties('%(builddir)s/lnt.venv/bin/python'),
Modified: zorg/trunk/zorg/buildbot/builders/PollyBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/PollyBuilder.py?rev=198295&r1=198294&r2=198295&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/PollyBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/PollyBuilder.py Thu Jan 2 04:25:34 2014
@@ -177,10 +177,10 @@ def AddExternalPollyBuildFactory(f, llvm
description=["install polly"],
workdir=polly_objdir))
-def getPollyLNTFactory(triple, nt_flags, xfails=[], clean=True, test=False,
+def getPollyLNTFactory(triple, nt_flags, xfails=[], clean=False, test=False,
**kwargs):
lnt_args = {}
- lnt_arg_names = ['submitURL', 'package_cache', 'testerName']
+ lnt_arg_names = ['submitURL', 'package_cache', 'testerName', 'reportBuildslave']
for argname in lnt_arg_names:
if argname in kwargs:
More information about the llvm-commits
mailing list