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

[ericvrp at codespeak.net]

Author: ericvrp
Date: Fri Jan 27 11:18:43 2006
New Revision: 22720

Modified:
   pypy/dist/pypy/translator/goal/bench-cronjob.py
   pypy/dist/pypy/translator/goal/bench-unix.py
Log:
updated nightly benchmark scripts


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	Fri Jan 27 11:18:43 2006
@@ -23,39 +23,24 @@
     print cmd
     os.system(cmd)
 
-    #this assumes entry_point.bc is created with llvm 1.6 and pypy-llvm-<revision> is already created with the llvm c backend
-    b = "pypy/translator/goal/pypy-llvm-%s" % revision
-    cmd = "mv %s %s-llvm1_6_c" % (b, b)
+    cmd = "rm pypy/translator/goal/pypy-llvm-" + revision
     print cmd
     os.system(cmd)
 
-    #
-    b = "%spypy-llvm-%s-llvm1_6_x86" % (tmpdir, revision)
+    ll2bc(tmpdir)
+    bc2c_exe(tmpdir, revision)
+    bc2x86_exe(tmpdir, revision, 'x86'   , '')
+    bc2x86_exe(tmpdir, revision, 'x86dag', '-enable-x86-dag-isel')
 
-    cmd = "llc %sentry_point.bc -f -o %s.s" % (tmpdir, b)
-    print cmd
-    os.system(cmd)
-
-    cmd = "as %s.s -o %s.o" % (b, b)
-    print cmd
-    os.system(cmd)
-
-    cmd = "gcc %s.o -static -lgc -lm -lpthread -pipe -o %s" % (b, b)
-    print cmd
-    os.system(cmd)
-
-    cmd = "cp %s pypy/translator/goal" % b
-    print cmd
-    os.system(cmd)
-   
-
-    #
-    b = "%spypy-llvm-%s-llvm1_7_c" % (tmpdir, revision)
 
+def ll2bc(tmpdir):
     cmd = '~/bin/llvm-as < %sentry_point.ll | ~/bin/opt -verify -lowersetjmp -funcresolve -raiseallocs -simplifycfg -mem2reg -globalopt -globaldce -ipconstprop -deadargelim -instcombine -simplifycfg -basiccg -prune-eh -inline -simplify-libcalls -basiccg -argpromotion -raise -tailduplicate -simplifycfg -scalarrepl -instcombine -break-crit-edges -condprop -tailcallelim -simplifycfg -reassociate -loopsimplify -licm -instcombine -indvars -loop-unroll -instcombine -load-vn -gcse -sccp -instcombine -break-crit-edges -condprop -dse -mergereturn -adce -simplifycfg -deadtypeelim -constmerge -verify -globalopt -constmerge -ipsccp -deadargelim -inline -instcombine -scalarrepl -globalsmodref-aa -licm -load-vn -gcse -instcombine -simplifycfg -globaldce -f -o %sentry_point_llvm1_7.bc' % (tmpdir, tmpdir)
     print cmd
     os.system(cmd)
 
+
+def bc2c_exe(tmpdir, revision):
+    b   = "%spypy-llvm-%s-llvm1_7_c" % (tmpdir, revision)
     cmd = "~/bin/llc %sentry_point_llvm1_7.bc -march=c -f -o %s.c" % (tmpdir, b)
     print cmd
     os.system(cmd)
@@ -69,11 +54,9 @@
     os.system(cmd)
 
 
-    #
-    b = "%spypy-llvm-%s-llvm1_7_x86" % (tmpdir, revision)
-    os.system('~/bin/llc -version 2>&1')
-
-    cmd = "~/bin/llc %sentry_point_llvm1_7.bc -f -o %s.s" % (tmpdir, b)
+def bc2x86_exe(tmpdir, revision, name_extra, llc_extra_options):
+    b   = "%spypy-llvm-%s-llvm1_7_%s" % (tmpdir, revision, name_extra)
+    cmd = "~/bin/llc %sentry_point_llvm1_7.bc %s -f -o %s.s" % (tmpdir, llc_extra_options, b)
     print cmd
     os.system(cmd)
 
@@ -125,8 +108,8 @@
     if backends == []:
         backends = 'llvm c'.split()
     print time.ctime()
-    #if 'llvm' in backends:
-    #    update_llvm()
+    if 'llvm' in backends:
+        update_llvm()
     update_pypy()
     for backend in backends:
         try:

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	Fri Jan 27 11:18:43 2006
@@ -43,7 +43,7 @@
     return exes
 
 HEADLINE = 'date                       executable                        richards             pystone'
-FMT      = '%-26s %-30s   %6dms (%6.2fx)   %6d (%6.2fx)'
+FMT      = '%-26s %-30s   %6dms (%6.1fx)   %6d (%6.1fx)'
 
 def main():
     print HEADLINE