[pypy-svn] r32991 - pypy/dist/pypy/translator/goal

pedronis at codespeak.net pedronis at codespeak.net
Sat Oct 7 16:55:54 CEST 2006


Author: pedronis
Date: Sat Oct  7 16:55:45 2006
New Revision: 32991

Modified:
   pypy/dist/pypy/translator/goal/bench-cronjob.py
   pypy/dist/pypy/translator/goal/bench-unix.py
Log:
get some sensible benchmark page again



Modified: pypy/dist/pypy/translator/goal/bench-cronjob.py
==============================================================================
--- pypy/dist/pypy/translator/goal/bench-cronjob.py	(original)
+++ pypy/dist/pypy/translator/goal/bench-cronjob.py	Sat Oct  7 16:55:45 2006
@@ -48,7 +48,7 @@
 def bc2c_exe(revision, features, profile_command=None):
     if features:
         features = '-' + features
-    filename = "pypy-llvm%s-%s-c" % (features, revision)
+    filename = "pypy-llvm-%s%s-c" % (revision, features)
     b = tmpdir + filename
 
     run("~/bin/llc %spypy.bc -march=c -f -o %s.c" % (tmpdir, b))
@@ -66,11 +66,12 @@
         run("cp %s.s pypy/translator/goal/archive/%s-prof.s" % (b, filename))
         run("gcc %s.s -fprofile-use %s -o %s" % (b, lflags, b))
         run("cp %s pypy/translator/goal/%s-prof" % (b, filename))
-
+        
 def bc2x86_exe(revision, features, name_extra, llc_extra_options=''):
     if features:
         features = '-' + features
-    b   = "%spypy-llvm%s-%s-%s" % (tmpdir, features, revision, name_extra)
+    b   = "%spypy-llvm-%s%s-%s" % (tmpdir, revision, features, name_extra)
+
     cmd = "~/bin/llc %spypy.bc %s -f -o %s.s" % (tmpdir, llc_extra_options, b)
     run(cmd)
 

Modified: pypy/dist/pypy/translator/goal/bench-unix.py
==============================================================================
--- pypy/dist/pypy/translator/goal/bench-unix.py	(original)
+++ pypy/dist/pypy/translator/goal/bench-unix.py	Sat Oct  7 16:55:45 2006
@@ -91,13 +91,15 @@
 def main():
     benchmark_result = BenchmarkResult('bench-unix.benchmark_result')
 
-    print 'date                           size codesize    executable                        richards             pystone'
+    print 'date                           size codesize    executable                                          richards            pystone'
     sys.stdout.flush()
 
     ref_rich, ref_stone = None, None
 
-    for exe in 'python2.5 python2.4 python2.3'.split():
+    for exe in 'python2.4 python2.3'.split():
         v = os.popen(exe + ' -c "import sys;print sys.version.split()[0]"').read().strip()
+        if not v:
+            continue
         r = v + '_richards'
         if not benchmark_result.is_stable(r):
             benchmark_result.update(r, run_richards(exe), RICHARDS_ASCENDING_GOOD)
@@ -112,7 +114,7 @@
         if not ref_stone:
             ref_stone = stone
 
-        fmt = '%-26s %8s %8s    %-30s   %6dms (%6.1fx)   %6d (%6.1fx)'
+        fmt = '%-26s %8s %8s    %-48s   %6dms (%6.1fx)   %6d (%6.1fx)'
         print fmt % (time.ctime(), '-', '-', 'CPython ' + v, rich, rich / ref_rich, stone, stone / ref_stone)
         sys.stdout.flush()
 



More information about the Pypy-commit mailing list