[pypy-commit] extradoc extradoc: collapse repetitions

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r4636:729f301ab645
Date: 2012-08-16 18:32 +0200
http://bitbucket.org/pypy/extradoc/changeset/729f301ab645/

Log:	collapse repetitions

diff --git a/talk/dls2012/benchmarks/parse.py b/talk/dls2012/benchmarks/parse.py
--- a/talk/dls2012/benchmarks/parse.py
+++ b/talk/dls2012/benchmarks/parse.py
@@ -14,6 +14,7 @@
                 interp = line
             else:
                 bench, rest = line.split(':')
+                bench = bench.replace(" ", "")
                 if '+-' in rest:
                     a, d = rest.split('+-')
                     res.setdefault(bench, {})[interp] = float(a), float(d)
diff --git a/talk/dls2012/paper.tex b/talk/dls2012/paper.tex
--- a/talk/dls2012/paper.tex
+++ b/talk/dls2012/paper.tex
@@ -915,43 +915,27 @@
 \hline
  & CPython & PyPy  & PyPy & GCC & luajit & luajit \\
  &        & no LP &       & -O3 &        & no LP \\
-FFT(1024, 32768) & 469.07 & 20.83 +- 0.02 & 12.73 +- 0.01 & - & 2.76 +- 0.01 & 4.42 +- 0.01\\
+FFT(1024,32768) & 469.07 & 20.83 +- 0.02 & 12.73 +- 0.01 & 1.40 +- 0.04 & 2.76 +- 0.01 & 4.42 +- 0.01\\
 \hline
-FFT(1024,32768) & - & - & - & 1.40 +- 0.04 & - & -\\
+FFT(1048576,2) & 58.93 & 4.12 +- 0.01 & 2.05 +- 0.00 & 0.83 +- 0.02 & 1.08 +- 0.01 & 1.33 +- 0.01\\
 \hline
-FFT(1048576, 2) & 58.93 & 4.12 +- 0.01 & 2.05 +- 0.00 & - & 1.08 +- 0.01 & 1.33 +- 0.01\\
+LU(100,4096) & 1974.14 & 32.22 +- 0.14 & 13.39 +- 0.03 & 1.33 +- 0.04 & 1.52 +- 0.01 & 8.57 +- 0.01\\
 \hline
-FFT(1048576,2) & - & - & - & 0.83 +- 0.02 & - & -\\
-\hline
-LU(100, 4096) & 1974.14 & 32.22 +- 0.14 & 13.39 +- 0.03 & - & 1.52 +- 0.01 & 8.57 +- 0.01\\
-\hline
-LU(100,4096) & - & - & - & 1.33 +- 0.04 & - & -\\
-\hline
-LU(1000, 2) & 955.31 & 14.98 +- 0.22 & 5.99 +- 0.21 & - & 0.67 +- 0.01 & 3.99 +- 0.01\\
-\hline
-LU(1000,2) & - & - & - & 0.65 +- 0.04 & - & -\\
+LU(1000,2) & 955.31 & 14.98 +- 0.22 & 5.99 +- 0.21 & 0.65 +- 0.04 & 0.67 +- 0.01 & 3.99 +- 0.01\\
 \hline
 MonteCarlo(268435456) & 618.89 & 20.60 +- 0.05 & 15.33 +- 0.08 & 1.69 +- 0.05 & 2.82 +- 0.00 & 3.92 +- 0.01\\
 \hline
-SOR(100, 32768) & 1458.12 & 8.24 +- 0.00 & 2.66 +- 0.00 & - & 1.31 +- 0.01 & 2.02 +- 0.00\\
+SOR(100,32768) & 1458.12 & 8.24 +- 0.00 & 2.66 +- 0.00 & 1.76 +- 0.04 & 1.31 +- 0.01 & 2.02 +- 0.00\\
 \hline
-SOR(100,32768) & - & - & - & 1.76 +- 0.04 & - & -\\
+SOR(1000,256) & 1210.45 & 6.48 +- 0.00 & 2.10 +- 0.00 & 1.49 +- 0.02 & 1.08 +- 0.01 & 1.63 +- 0.00\\
 \hline
-SOR(1000, 256) & 1210.45 & 6.48 +- 0.00 & 2.10 +- 0.00 & - & 1.08 +- 0.01 & 1.63 +- 0.00\\
+SparseMatMult(1000,5000,262144) & 371.66 & 24.25 +- 0.04 & 16.52 +- 0.04 & 1.84 +- 0.03 & 4.53 +- 0.02 & 9.64 +- 0.02\\
 \hline
-SOR(1000,256) & - & - & - & 1.49 +- 0.02 & - & -\\
+SparseMatMult(100000,1000000,1024) & 236.93 & 17.01 +- 0.01 & 8.75 +- 0.08 & 1.20 +- 0.03 & 2.42 +- 0.01 & 7.19 +- 0.01\\
 \hline
-SparseMatMult(1000, 5000, 262144) & 371.66 & 24.25 +- 0.04 & 16.52 +- 0.04 & - & - & -\\
+conv3(100,nil) & - & - & - & - & 0.18 +- 0.00 & 0.70 +- 0.00\\
 \hline
-SparseMatMult(1000,5000,262144) & - & - & - & 1.84 +- 0.03 & 4.53 +- 0.02 & 9.64 +- 0.02\\
-\hline
-SparseMatMult(100000, 1000000, 1024) & 236.93 & 17.01 +- 0.01 & 8.75 +- 0.08 & - & - & -\\
-\hline
-SparseMatMult(100000,1000000,1024) & - & - & - & 1.20 +- 0.03 & 2.42 +- 0.01 & 7.19 +- 0.01\\
-\hline
-conv3(100, nil) & - & - & - & - & 0.18 +- 0.00 & 0.70 +- 0.00\\
-\hline
-conv3(1000, nil) & - & - & - & - & 0.12 +- 0.01 & 0.67 +- 0.01\\
+conv3(1000,nil) & - & - & - & - & 0.12 +- 0.01 & 0.67 +- 0.01\\
 \hline
 conv3(1e5) & - & - & - & 0.52 +- 0.04 & - & -\\
 \hline
@@ -963,9 +947,9 @@
 \hline
 conv3x3(1000) & - & - & - & 0.17 +- 0.04 & - & -\\
 \hline
-conv3x3(1000, 1000) & - & - & - & - & 0.09 +- 0.01 & 0.49 +- 0.01\\
+conv3x3(1000,1000) & - & - & - & - & 0.09 +- 0.01 & 0.49 +- 0.01\\
 \hline
-conv3x3(1000000, 3) & - & - & - & - & 0.13 +- 0.00 & 0.53 +- 0.00\\
+conv3x3(1000000,3) & - & - & - & - & 0.13 +- 0.00 & 0.53 +- 0.00\\
 \hline
 conv3x3(3) & - & - & - & 0.19 +- 0.03 & - & -\\
 \hline
@@ -973,9 +957,9 @@
 \hline
 conv3x3(Array2D(1000x1000)) & 138.95 & 0.70 +- 0.00 & 0.20 +- 0.00 & - & - & -\\
 \hline
-conv5(100, nil) & - & - & - & - & 0.21 +- 0.01 & 0.87 +- 0.01\\
+conv5(100,nil) & - & - & - & - & 0.21 +- 0.01 & 0.87 +- 0.01\\
 \hline
-conv5(1000, nil) & - & - & - & - & 0.17 +- 0.01 & 0.84 +- 0.00\\
+conv5(1000,nil) & - & - & - & - & 0.17 +- 0.01 & 0.84 +- 0.00\\
 \hline
 conv5(1e5) & - & - & - & 0.55 +- 0.02 & - & -\\
 \hline
@@ -987,13 +971,13 @@
 \hline
 dilate3x3(1000) & - & - & - & 0.17 +- 0.03 & - & -\\
 \hline
-dilate3x3(1000, 1000) & - & - & - & - & 0.09 +- 0.00 & 0.48 +- 0.01\\
+dilate3x3(1000,1000) & - & - & - & - & 0.09 +- 0.00 & 0.48 +- 0.01\\
 \hline
 dilate3x3(Array2D(1000x1000)) & 137.52 & 4.35 +- 0.01 & 3.91 +- 0.02 & - & - & -\\
 \hline
 sobel(Array2D(1000x1000)) & 104.02 & 0.49 +- 0.00 & 0.21 +- 0.00 & 0.17 +- 0.03 & - & -\\
 \hline
-sobel\_magnitude(1000, 1000) & - & - & - & - & 0.24 +- 0.01 & 0.60 +- 0.01\\
+sobel_magnitude(1000,1000) & - & - & - & - & 0.24 +- 0.01 & 0.60 +- 0.01\\
 \hline
 sqrt(Fix16) & 463.46 & 5.12 +- 0.00 & 2.96 +- 0.00 & 1.34 +- 0.03 & 1.14 +- 0.00 & 12.80 +- 0.04\\
 \hline