[pypy-commit] extradoc extradoc: hg merge

hakanardo noreply at buildbot.pypy.org
Thu Jun 16 14:29:36 CEST 2011


Author: Hakan Ardo <hakan at debian.org>
Branch: extradoc
Changeset: r3702:17765e5f29b6
Date: 2011-06-16 14:32 +0200
http://bitbucket.org/pypy/extradoc/changeset/17765e5f29b6/

Log:	hg merge

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
@@ -5,9 +5,9 @@
 if [ "$1" == "gcc" ]; then
     ./runner.py -n 5 -c "$*" sqrt/sqrt_double.c
     ./runner.py -n 5 -c "$*" sqrt/sqrt_long.c
-    ./runner.py -n 5 -c "$*" sqrt/sqrt_fix16.c
-    ./runner.py -n 5 -c "$* -lm" convolution/conv3.c 1
-    ./runner.py -n 5 -c "$* -lm" convolution/conv5.c 1
+    #./runner.py -n 5 -c "$*" sqrt/sqrt_fix16.c
+    #./runner.py -n 5 -c "$* -lm" convolution/conv3.c 1
+    #./runner.py -n 5 -c "$* -lm" convolution/conv5.c 1
     ./runner.py -n 5 -c "$* -lm" convolution/conv3.c 100
     ./runner.py -n 5 -c "$* -lm" convolution/conv5.c 100
     ./runner.py -n 5 -c "$* -lm" convolution/conv3.c 1000
@@ -18,24 +18,24 @@
     ./runner.py -n 5 -c "$* -lstdc++" image/sobel.cc 1002 1002
     rm a.out
 else
-    ./runner.py -n 10 sqrt/sqrt.py main int
-    ./runner.py -n 10 sqrt/sqrt.py main float
-    ./runner.py -n 10 sqrt/sqrt.py main Fix16
-    ./runner.py -n 10 convolution/convolution.py conv3 1
-    ./runner.py -n 10 convolution/convolution.py conv5 1
-    ./runner.py -n 10 convolution/convolution.py conv3 100
-    ./runner.py -n 10 convolution/convolution.py conv5 100
-    ./runner.py -n 10 convolution/convolution.py conv3 1000
-    ./runner.py -n 10 convolution/convolution.py conv5 1000
-    ./runner.py -n 10 convolution/convolution.py conv3x3 1000000 3
-    ./runner.py -n 10 convolution/convolution.py conv3x3 1000 1000
-    ./runner.py -n 10 convolution/convolution.py dilate3x3 1000 1000
-    ./runner.py -n 10 image/noborder.py main NoBorderImagePadded
-    ./runner.py -n 10 image/noborder.py main NoBorderImagePadded iter
-    ./runner.py -n 10 image/noborder.py main NoBorderImagePadded range
-    ./runner.py -n 10 image/noborder.py main NoBorderImage
-    ./runner.py -n 10 image/noborder.py main NoBorderImage iter
-    ./runner.py -n 10 image/noborder.py main NoBorderImage range
-    ./runner.py -n 10 image/sobel.py main NoBorderImagePadded
-    ./runner.py -n 10 image/sobel.py main NoBorderImagePadded uint8
+    $* ./runner.py -n 10 sqrt/sqrt.py main int
+    $* ./runner.py -n 10 sqrt/sqrt.py main float
+    #$* ./runner.py -n 10 sqrt/sqrt.py main Fix16
+    #$* ./runner.py -n 10 convolution/convolution.py conv3 1
+    #$* ./runner.py -n 10 convolution/convolution.py conv5 1
+    $* ./runner.py -n 10 convolution/convolution.py conv3 100
+    $* ./runner.py -n 10 convolution/convolution.py conv5 100
+    $* ./runner.py -n 10 convolution/convolution.py conv3 1000
+    $* ./runner.py -n 10 convolution/convolution.py conv5 1000
+    $* ./runner.py -n 10 convolution/convolution.py conv3x3 1000000 3
+    $* ./runner.py -n 10 convolution/convolution.py conv3x3 1000 1000
+    $* ./runner.py -n 10 convolution/convolution.py dilate3x3 1000 1000
+    $* ./runner.py -n 10 image/noborder.py main NoBorderImagePadded
+    $* ./runner.py -n 10 image/noborder.py main NoBorderImagePadded iter
+    $* ./runner.py -n 10 image/noborder.py main NoBorderImagePadded range
+    $* ./runner.py -n 10 image/noborder.py main NoBorderImage
+    $* ./runner.py -n 10 image/noborder.py main NoBorderImage iter
+    $* ./runner.py -n 10 image/noborder.py main NoBorderImage range
+    $* ./runner.py -n 10 image/sobel.py main NoBorderImagePadded
+    $* ./runner.py -n 10 image/sobel.py main NoBorderImagePadded uint8
 fi
diff --git a/talk/iwtc11/benchmarks/new_result.txt b/talk/iwtc11/benchmarks/new_result.txt
new file mode 100644
--- /dev/null
+++ b/talk/iwtc11/benchmarks/new_result.txt
@@ -0,0 +1,63 @@
+
+pypy --jit enable_opts=intbounds:rewrite:virtualize:heap:unroll
+sqrt(int): 1.79892385006 +- 0.00194840037512
+sqrt(float): 0.983013772964 +- 0.00221919586293
+conv3(1e6): 0.766417503357 +- 0.00866699505143
+conv5(1e6): 0.996688437462 +- 0.012036835877
+conv3(1e5): 0.730618429184 +- 0.00375146136701
+conv5(1e5): 1.03531208038 +- 0.0111413026874
+conv3x3(3): 0.069846701622 +- 0.000501920798166
+conv3x3(1000): 0.0522719621658 +- 0.0357056076979
+dilate3x3(1000): 0.38942694664 +- 0.00619291977785
+NoBorderImagePadded: 1.89698078632 +- 0.0208055951105
+NoBorderImagePadded(iter): 0.519681739807 +- 0.0200662890046
+NoBorderImagePadded(range): 0.450081467628 +- 0.00105444417894
+NoBorderImage: 2.13951308727 +- 0.00576674378529
+NoBorderImage(iter): 1.46965010166 +- 0.00394661836239
+NoBorderImage(range): 1.35105161667 +- 0.00249887289286
+sobel(NoBorderImagePadded): 0.45955350399 +- 0.00145458444751
+sobel_uint8(NoBorderImagePadded): 0.498426914215 +- 0.00665320862997
+
+pypy --jit enable_opts=intbounds:rewrite:virtualize:heap
+sqrt(int): 2.27739796638 +- 0.0271040580427
+sqrt(float): 1.364168787 +- 0.0235396053333
+conv3(1e6): 1.72038755417 +- 0.0280206343663
+conv5(1e6): 1.93043384552 +- 0.0302489061093
+conv3(1e5): 1.6559261322 +- 0.0364074757582
+conv5(1e5): 1.85165474415 +- 0.032410582414
+conv3x3(3): 0.107097601891 +- 0.00457118866065
+conv3x3(1000): 0.0721160173416 +- 0.00365968876656
+dilate3x3(1000): 0.43175163269 +- 0.0720869033105
+NoBorderImagePadded: 2.00819942951 +- 0.0260239930765
+NoBorderImagePadded(iter): 1.22523207664 +- 0.026102105011
+NoBorderImagePadded(range): 1.113205266 +- 0.0381177388909
+NoBorderImage: 2.21718068123 +- 0.0503771001922
+NoBorderImage(iter): 1.39955751896 +- 0.0034236237913
+NoBorderImage(range): 1.34794125557 +- 0.0379578329049
+sobel(NoBorderImagePadded): 1.00590751171 +- 0.0175536088063
+sobel_uint8(NoBorderImagePadded): 1.03622698784 +- 0.00533611100064
+
+
+gcc -O2
+sqrt(float): 0.98 +- 0.00707106781187
+sqrt(int): 0.792 +- 0.004472135955
+conv3(1e6): 0.77 +- 0.0141421356237
+conv5(1e6): 1.026 +- 0.00894427191
+conv3(1e5): 0.686 +- 0.00894427191
+conv5(1e5): 0.976 +- 0.00547722557505
+conv3x3(3): 0.282 +- 0.00836660026534
+conv3x3(1000): 0.244 +- 0.00894427191
+dilate3x3(1000): 0.252 +- 0.004472135955
+sobel_magnitude: 0.18 +- 0.0
+
+gcc -O3 -march=native -fno-tree-vectorize
+sqrt(float): 0.978 +- 0.004472135955
+sqrt(int): 0.79 +- 0.0
+conv3(1e6): 0.74 +- 0.00707106781187
+conv5(1e6): 0.768 +- 0.01788854382
+conv3(1e5): 0.576 +- 0.00547722557505
+conv5(1e5): 0.652 +- 0.00836660026534
+conv3x3(3): 0.27 +- 0.0
+conv3x3(1000): 0.242 +- 0.004472135955
+dilate3x3(1000): 0.25 +- 0.0
+sobel_magnitude: 0.196 +- 0.00894427191


More information about the pypy-commit mailing list