[pypy-commit] extradoc extradoc: kill the NoBorderImage... stuff

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: extradoc
Changeset: r3767:7bfcd168b8db
Date: 2011-06-21 19:23 +0200
http://bitbucket.org/pypy/extradoc/changeset/7bfcd168b8db/

Log:	kill the NoBorderImage... stuff

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
@@ -15,7 +15,7 @@
     ./runner.py -n 5 -c "$* -lstdc++" convolution/conv3x3.cc 1000000 3
     ./runner.py -n 5 -c "$* -lstdc++" convolution/conv3x3.cc 1000 1000
     ./runner.py -n 5 -c "$* -lstdc++" convolution/dilate3x3.cc 1000 1000
-    ./runner.py -n 5 -c "$* -lstdc++" image/sobel.cc 1002 1002
+    ./runner.py -n 5 -c "$* -lstdc++" image/sobel.cc 1000 1000
     rm a.out
 else
     if [ "$1" == "python2.7" ]; then
@@ -37,12 +37,12 @@
     $* ./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 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
-    $* ./runner.py $EXTRA_OPTS image/noborder.py main NoBorderImage
-    $* ./runner.py $EXTRA_OPTS image/noborder.py main NoBorderImage iter
-    $* ./runner.py $EXTRA_OPTS image/noborder.py main NoBorderImage range
-    $* ./runner.py $EXTRA_OPTS image/sobel.py main NoBorderImagePadded
-    $* ./runner.py $EXTRA_OPTS image/sobel.py main NoBorderImagePadded uint8
+    #$* ./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
+    #$* ./runner.py $EXTRA_OPTS image/noborder.py main NoBorderImage
+    #$* ./runner.py $EXTRA_OPTS image/noborder.py main NoBorderImage iter
+    #$* ./runner.py $EXTRA_OPTS image/noborder.py main NoBorderImage range
+    #$* ./runner.py $EXTRA_OPTS image/sobel.py main NoBorderImagePadded
+    #$* ./runner.py $EXTRA_OPTS image/sobel.py main NoBorderImagePadded uint8
 fi
diff --git a/talk/iwtc11/paper.tex b/talk/iwtc11/paper.tex
--- a/talk/iwtc11/paper.tex
+++ b/talk/iwtc11/paper.tex
@@ -833,18 +833,6 @@
 \hline
  & CPython & Psyco & PyPy no LP & PyPy & GCC -O2 & GCC -O3\\
 \hline
-%NoBorder & 537.31 & 329.98 & 2.22 $\pm$ 0.03 & 2.17 $\pm$ 0.02 & - & -\\
-%\hline
-%NoBorder(iter) & 548.32 & 304.13 & 1.45 $\pm$ 0.03 & 1.47 $\pm$ 0.02 & - & -\\
-%\hline
-%NoBorder(range) & 534.64 & 317.34 & 1.34 $\pm$ 0.03 & 1.40 $\pm$ 0.04 & - & -\\
-%\hline
-conv3x3(NoBorderPadded(1000x1000)) & 543.73 & 333.20 & 2.09 $\pm$ 0.12 & 1.93 $\pm$ 0.05 & - & -\\
-\hline
-%NoBorderPadded(iter) & 546.70 & 309.32 & 1.21 $\pm$ 0.02 & 0.49 $\pm$ 0.02 & - & -\\
-%\hline
-%NoBorderPadded(range) & 550.92 & 318.33 & 1.12 $\pm$ 0.03 & 0.48 $\pm$ 0.01 & - & -\\
-%\hline
 conv3(array(1e5)) & 77.89 & 9.52 & 1.77 $\pm$ 0.06 & 0.68 $\pm$ 0.02 & 0.70 $\pm$ 0.05 & 0.59 $\pm$ 0.01\\
 \hline
 conv3(array(1e6)) & 77.15 & 9.58 & 1.69 $\pm$ 0.01 & 0.77 $\pm$ 0.01 & 0.84 $\pm$ 0.05 & 0.74 $\pm$ 0.01\\
@@ -859,8 +847,6 @@
 \hline
 dilate3x3(Array2D(1000x1000)) & 23.29 & 12.99 & 0.41 $\pm$ 0.04 & 0.39 $\pm$ 0.01 & 0.26 $\pm$ 0.00 & 0.26 $\pm$ 0.01\\
 \hline
-sobel(NoBorderPadded(1000x1000)) & 461.14 & 258.02 & 1.01 $\pm$ 0.03 & 0.48 $\pm$ 0.03 & - & -\\
-\hline
 sobel(Array2D(1000x1000)) & - & - & - & - & 0.19 $\pm$ 0.01 & 0.20 $\pm$ 0.01\\
 \hline
 %sobel\_uint8(NoBorderPadded) & 476.72 & 275.50 & 1.05 $\pm$ 0.01 & 0.51 $\pm$ 0.00 & - & -\\
@@ -910,20 +896,10 @@
 \end{itemize}
 
 The sobel and conv3x3 benchmarks are implemented
-on top of two different two-dimensional array classes: Array2D
-and NoBorderPadded. Array2D is 
+on top of a custom two-dimensional array class,  Array2D.
+It is
 a simple straight forward implementation providing 2 dimensionall
-indexing with out of bounds checks. NoBorderPadded is optimized for
-this specific application.
-It ensures that there will be no failing guards, and makes
-a lot of the two dimension index calculations loop invariant. The
-intention here is twofold. It shows that the performance-impact of
-having wrapper classes giving objects some application-specific
-properties can be negligible. This is due to the inlining performed
-during the tracing and the allocation removal of the index objects
-introduced. It also shows that it is possible to do some low-level
-hand optimizations of the Python code and hide those optimization
-under a nice interface without loosing performance.
+indexing with out of bounds checks. 
 
 Benchmarks were run on Intel i7 M620 @2.67GHz with 4M cache and 8G of RAM in
 32bit mode.