Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r531:9f67b389b4fa
Date: 2011-07-16 23:22 +0200
http://bitbucket.org/pypy/buildbot/changeset/9f67b389b4fa/
Log: enable nightly builds of pypy-c-64bit
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -277,7 +277,7 @@
blocksize=100*1024))
class JITBenchmark(factory.BuildFactory):
- def __init__(self, platform='linux'):
+ def __init__(self, platform='linux', host='tannit', postfix=None):
factory.BuildFactory.__init__(self)
setup_steps(platform, self)
@@ -287,15 +287,20 @@
workdir='.'))
self.addStep(Translate(['-Ojit'], []))
pypy_c_rel = "../build/pypy/translator/goal/pypy-c"
+ if postfix:
+ addopts = ['--postfix', postfix]
+ else:
+ addopts = None
self.addStep(ShellCmd(
description="run benchmarks on top of pypy-c",
command=["python", "runner.py", '--output-filename', 'result.json',
'--pypy-c', pypy_c_rel,
'--baseline', pypy_c_rel,
'--args', ',--jit off',
- '--upload', #'--force-host', 'bigdog',
+ '--upload',
'--revision', WithProperties('%(got_revision)s'),
- '--branch', WithProperties('%(branch)s')],
+ '--branch', WithProperties('%(branch)s'),
+ ] + addopts,
workdir='./benchmarks',
haltOnFailure=True))
# a bit obscure hack to get both os.path.expand and a property
@@ -303,14 +308,3 @@
self.addStep(transfer.FileUpload(slavesrc="benchmarks/result.json",
masterdest=WithProperties(resfile),
workdir="."))
-
-## self.addStep(ShellCmd(
-## description="run on top of python with psyco",
-## command=["python", "runner.py", '--output-filename',
'result.json',
-## '--pypy-c', 'psyco/python_with_psyco.sh',
-## '--revision', WithProperties('%(got_revision)s'),
-## '--upload', #'--force-host', 'bigdog',
-## '--branch', WithProperties('%(branch)s'),
-## ],
-## workdir='./benchmarks',
-## haltOnFailure=True))
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -180,6 +180,8 @@
)
pypyJITBenchmarkFactory = pypybuilds.JITBenchmark()
+pypyJITBenchmarkFactory64 = pypybuilds.JITBenchmark(platform='linux64',
+ postfix='-64')
LINUX32 = "own-linux-x86-32"
LINUX64 = "own-linux-x86-64"
@@ -200,16 +202,20 @@
JITONLYLINUX32 = "jitonly-own-linux-x86-32"
JITBENCH = "jit-benchmark-linux-x86-32"
+JITBENCH64 = "jit-benchmark-linux-x86-64"
BuildmasterConfig = {
'slavePortnum': slavePortnum,
'change_source': [],
'schedulers': [
- Nightly("nightly-0-45", [
+ Nightly("nightly-0-00", [
JITBENCH, # on tannit -- nothing else there during first round!
MACOSX32, # on minime
- ], hour=0, minute=45),
+ ], hour=0, minute=0),
+ Nightly("nighly-2-00", [
+ JITBENCH64, # on tannit -- nothing else there during first round!
+ ], hour=2, minute=0),
Nightly("nightly-4-00", [
# rule: what we pick here on tannit should take at most 8 cores
# and be hopefully finished after 2 hours
@@ -336,6 +342,12 @@
"factory": pypyJITBenchmarkFactory,
"category": 'benchmark-run',
},
+ {"name": JITBENCH64,
+ "slavenames": ["tannit64"],
+ "builddir": JITBENCH64,
+ "factory": pypyJITBenchmarkFactory64,
+ "category": "benchmark-run",
+ },
],
'buildbotURL': 'http://buildbot.pypy.org),
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
