Author: Antonio Cuni <[email protected]>
Branch:
Changeset: r603:f550f9557270
Date: 2011-12-15 17:26 +0100
http://bitbucket.org/pypy/buildbot/changeset/f550f9557270/
Log: bah, make sure that benchmarks on speed.python.org don't acquire the
lock for tannit
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -19,6 +19,7 @@
# there are 8 logical CPUs, but only 4 physical ones
TannitCPU = locks.MasterLock('tannit_cpu', maxCount=6)
+SpeedPythonCPU = locks.MasterLock('speed_python_cpu', maxCount=24)
class ShellCmd(shell.ShellCommand):
@@ -321,13 +322,20 @@
repourl = 'https://bitbucket.org/pypy/benchmarks'
update_hg(platform, self, repourl, 'benchmarks', use_branch=False)
#
+ 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=[TannitCPU.access('counting')],
+ locks=[lock.access('counting')],
)
)
pypy_c_rel = "../build/pypy/translator/goal/pypy-c"
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -126,9 +126,14 @@
app_tests=True
)
-pypyJITBenchmarkFactory = pypybuilds.JITBenchmark()
-pypyJITBenchmarkFactory64 = pypybuilds.JITBenchmark(platform='linux64',
- postfix='-64')
+pypyJITBenchmarkFactory_tannit = pypybuilds.JITBenchmark()
+pypyJITBenchmarkFactory64_tannit = pypybuilds.JITBenchmark(platform='linux64',
+ postfix='-64')
+
+pypyJITBenchmarkFactory64_speed = pypybuilds.JITBenchmark(platform='linux64',
+ postfix='-64',
+ host='speed_python')
+
LINUX32 = "own-linux-x86-32"
LINUX64 = "own-linux-x86-64"
@@ -287,21 +292,21 @@
{"name": JITBENCH,
"slavenames": ["tannit32"],
"builddir": JITBENCH,
- "factory": pypyJITBenchmarkFactory,
+ "factory": pypyJITBenchmarkFactory_tannit,
"category": 'benchmark-run',
# the locks are acquired with fine grain inside the build
},
{"name": JITBENCH64,
"slavenames": ["tannit64"],
"builddir": JITBENCH64,
- "factory": pypyJITBenchmarkFactory64,
+ "factory": pypyJITBenchmarkFactory64_tannit,
"category": "benchmark-run",
# the locks are acquired with fine grain inside the build
},
{"name": JITBENCH64_2,
"slavenames": ["speed-python-64"],
- "builddir": JITBENCH64,
- "factory": pypyJITBenchmarkFactory64,
+ "builddir": JITBENCH64_2,
+ "factory": pypyJITBenchmarkFactory64_speed,
"category": "benchmark-run",
# the locks are acquired with fine grain inside the build
},
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
