Commits

Antonio Cuni committed f550f95

bah, make sure that benchmarks on speed.python.org don't acquire the lock for tannit

  • Participants
  • Parent commits 4d1b872

Comments (0)

Files changed (2)

File bot2/pypybuildbot/builds.py

 
 # 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):
         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"

File bot2/pypybuildbot/master.py

     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"
                   {"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
                    },