[pypy-commit] extradoc extradoc: enable article benchmark set

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: extradoc
Changeset: r4539:36c41b91f9c5
Date: 2012-08-13 10:46 +0200
http://bitbucket.org/pypy/extradoc/changeset/36c41b91f9c5/

Log:	enable article benchmark set

diff --git a/talk/iwtc11/benchmarks/benchmark.sh b/talk/iwtc11/benchmarks/benchmark.sh
--- a/talk/iwtc11/benchmarks/benchmark.sh
+++ b/talk/iwtc11/benchmarks/benchmark.sh
@@ -31,19 +31,19 @@
     if [ "$1" == "python2.6" ]; then
         EXTRA_OPTS='-w 1 -n 1'
     fi
-    #$* ./runner.py $EXTRA_OPTS sqrt/sqrt.py main int
-    #$* ./runner.py $EXTRA_OPTS sqrt/sqrt.py main float
-    #$* ./runner.py $EXTRA_OPTS sqrt/sqrt.py main Fix16
+    $* ./runner.py $EXTRA_OPTS sqrt/sqrt.py main int
+    $* ./runner.py $EXTRA_OPTS sqrt/sqrt.py main float
+    $* ./runner.py $EXTRA_OPTS sqrt/sqrt.py main Fix16
     #$* ./runner.py $EXTRA_OPTS convolution/convolution.py conv3 1
     #$* ./runner.py $EXTRA_OPTS convolution/convolution.py conv5 1
-    #$* ./runner.py $EXTRA_OPTS convolution/convolution.py conv3 100
-    #$* ./runner.py $EXTRA_OPTS convolution/convolution.py conv5 100
-    #$* ./runner.py $EXTRA_OPTS convolution/convolution.py conv3 1000
-    #$* ./runner.py $EXTRA_OPTS convolution/convolution.py conv5 1000
+    $* ./runner.py $EXTRA_OPTS convolution/convolution.py conv3 100
+    $* ./runner.py $EXTRA_OPTS convolution/convolution.py conv5 100
+    $* ./runner.py $EXTRA_OPTS convolution/convolution.py conv3 1000
+    $* ./runner.py $EXTRA_OPTS convolution/convolution.py conv5 1000
     $* ./runner.py $EXTRA_OPTS convolution/convolution.py conv3x3 1000000 3
     $* ./runner.py $EXTRA_OPTS convolution/convolution.py conv3x3 1000 1000
     $* ./runner.py $EXTRA_OPTS convolution/convolution.py dilate3x3 1000 1000
-    #$* ./runner.py $EXTRA_OPTS convolution/convolution.py sobel_magnitude 1000 1000
+    $* ./runner.py $EXTRA_OPTS convolution/convolution.py sobel_magnitude 1000 1000
     #$* ./runner.py $EXTRA_OPTS image/noborder.py main NoBorderImagePadded
     #$* ./runner.py $EXTRA_OPTS image/noborder.py main NoBorderImagePadded iter
     #$* ./runner.py $EXTRA_OPTS image/noborder.py main NoBorderImagePadded range
diff --git a/talk/iwtc11/benchmarks/runall.sh b/talk/iwtc11/benchmarks/runall.sh
--- a/talk/iwtc11/benchmarks/runall.sh
+++ b/talk/iwtc11/benchmarks/runall.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
 ./benchmark.sh pypy
-#./benchmark.sh pypy --jit enable_opts=intbounds:rewrite:virtualize:heap:unroll
-./benchmark.sh pypy --jit enable_opts=intbounds:rewrite:virtualize:heap
+./benchmark.sh pypy --jit enable_opts=intbounds:rewrite:virtualize:string:earlyforce:pure:heap:ffi
+./benchmark.sh pypy-1.5
+#./benchmark.sh pypy-1.5 --jit enable_opts=intbounds:rewrite:virtualize:heap:unroll
+./benchmark.sh pypy-1.5 --jit enable_opts=intbounds:rewrite:virtualize:heap
 #./benchmark.sh gcc
 #./benchmark.sh gcc -O2
 ./benchmark.sh gcc -O3 -march=native -fno-tree-vectorize