Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r903:de7d92d8fc1d
Date: 2013-12-18 11:47 +0200
http://bitbucket.org/pypy/buildbot/changeset/de7d92d8fc1d/
Log: add a single run benchmark
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -615,6 +615,50 @@
if trigger: # if provided trigger schedulers that depend on this one
self.addStep(Trigger(schedulerNames=[trigger]))
+class JITBenchmarkSingleRun(factory.BuildFactory):
+ def __init__(self, platform='linux', host='tannit', postfix=''):
+ factory.BuildFactory.__init__(self)
+
+ repourl = 'https://bitbucket.org/pypy/benchmarks'
+ update_hg(platform, self, repourl, 'benchmarks', use_branch=True,
+ force_branch='single-run')
+ #
+ setup_steps(platform, self)
+ if host == 'tannit':
+ lock = TannitCPU
+ elif host == 'speed_python':
+ lock = SpeedPythonCPU
+ else:
+ assert False, 'unknown host %s' % host
+
+ self.addStep(
+ Translate(
+ translationArgs=['-Ojit'],
+ targetArgs=[],
+ haltOnFailure=True,
+ # this step can be executed in parallel with other builds
+ locks=[lock.access('counting')],
+ )
+ )
+ pypy_c_rel = "../build/pypy/goal/pypy-c"
+ self.addStep(ShellCmd(
+ # this step needs exclusive access to the CPU
+ locks=[lock.access('exclusive')],
+ description="run benchmarks on top of pypy-c",
+ command=["python", "runner.py", '--output-filename', 'result.json',
+ '--python', pypy_c_rel,
+ '--full-store',
+ '--revision', WithProperties('%(got_revision)s'),
+ '--branch', WithProperties('%(branch)s'),
+ ],
+ workdir='./benchmarks',
+ timeout=3600))
+ # a bit obscure hack to get both os.path.expand and a property
+ filename = '%(got_revision)s' + (postfix or '')
+ resfile = os.path.expanduser("~/bench_results_new/%s.json" % filename)
+ self.addStep(transfer.FileUpload(slavesrc="benchmarks/result.json",
+ masterdest=WithProperties(resfile),
+ workdir="."))
class JITBenchmark(factory.BuildFactory):
def __init__(self, platform='linux', host='tannit', postfix=''):
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -147,6 +147,9 @@
pypyJITBenchmarkFactory_tannit = pypybuilds.JITBenchmark()
pypyJITBenchmarkFactory64_tannit = pypybuilds.JITBenchmark(platform='linux64',
postfix='-64')
+pypyJITBenchmarkFactory64_speed = pypybuilds.JITBenchmarkSingleRun(
+ platform='linux64',
+ postfix='-64')
pypyNumpyCompatability = pypybuilds.NativeNumpyTests(platform='linux64')
@@ -180,7 +183,7 @@
JITONLYLINUXPPC64 = "jitonly-own-linux-ppc-64"
JITBENCH = "jit-benchmark-linux-x86-32"
JITBENCH64 = "jit-benchmark-linux-x86-64"
-JITBENCH64_2 = 'jit-benchmark-linux-x86-64-2'
+JITBENCH64_NEW = 'jit-benchmark-linux-x86-64-single-run'
CPYTHON_64 = "cpython-2-benchmark-x86-64"
NUMPY_64 = "numpy-compatability-linux-x86-64"
# buildbot builder
@@ -354,6 +357,12 @@
"category": "benchmark-run",
# the locks are acquired with fine grain inside the build
},
+ {"name": JITBENCH64_NEW,
+ "slavenames": ["speed-python-64"],
+ "builddir": JITBENCH64_NEW,
+ "factory": pypyJITBenchmarkFactory64_speed,
+ "category": "benchmark-run",
+ },
{"name": MACOSX32,
"slavenames": ["minime"],
"builddir": MACOSX32,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
