Author: Maciej Fijalkowski <[email protected]>
Branch: extradoc
Changeset: r4641:e67d001d4908
Date: 2012-08-16 19:00 +0200
http://bitbucket.org/pypy/extradoc/changeset/e67d001d4908/
Log: another round of deduplication
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
@@ -1,6 +1,19 @@
import pdb, sys
+NAME_REPL = {
+ 'dilate3x3(Array2D(1000x1000))': 'dilate3x3(1000,1000)',
+ 'sobel_magnitude(1000,1000)': 'sobel(1000,1000)',
+ 'conv3(array(1e5))': 'conv3(1e5)',
+ 'conv3(array(1e6))': 'conv3(1e6)',
+ 'conv5(array(1e5))': 'conv5(1e5)',
+ 'conv5(array(1e6))': 'conv5(1e6)',
+ 'sobel(Array2D(1000x1000))': 'sobel(1000,1000)',
+ 'sobel(Array(1000x1000))': 'sobel(1000,1000)',
+ 'conv3x3(Array2D(1000000x3))': 'conv3x3(1000000,3)',
+ 'conv3x3(Array2D(1000x1000))': 'conv3x3(1000,1000)',
+}
+
def main(name):
interp = None
res = {}
@@ -15,6 +28,7 @@
else:
bench, rest = line.split(':')
bench = bench.replace(" ", "")
+ bench = NAME_REPL.get(bench, bench)
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
@@ -927,51 +927,27 @@
\hline
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
-conv3(100,nil) & - & - & - & - & 0.18 +- 0.00 & 0.70 +- 0.00\\
+conv3(1e5) & 50.14 & 1.09 +- 0.01 & 0.49 +- 0.01 & 0.52 +- 0.04 & 0.12 +- 0.01
& 0.67 +- 0.01\\
\hline
-conv3(1000,nil) & - & - & - & - & 0.12 +- 0.01 & 0.67 +- 0.01\\
-\hline
-conv3(1e5) & - & - & - & 0.52 +- 0.04 & - & -\\
-\hline
-conv3(1e6) & - & - & - & 0.60 +- 0.03 & - & -\\
-\hline
-conv3(array(1e5)) & 50.14 & 1.09 +- 0.01 & 0.49 +- 0.01 & - & - & -\\
-\hline
-conv3(array(1e6)) & 49.20 & 1.13 +- 0.02 & 0.51 +- 0.00 & - & - & -\\
+conv3(1e6) & 49.20 & 1.13 +- 0.02 & 0.51 +- 0.00 & 0.60 +- 0.03 & 0.18 +- 0.00
& 0.70 +- 0.00\\
\hline
conv3x3(1000) & - & - & - & 0.17 +- 0.04 & - & -\\
\hline
-conv3x3(1000,1000) & - & - & - & - & 0.09 +- 0.01 & 0.49 +- 0.01\\
+conv3x3(1000,1000) & 138.95 & 0.70 +- 0.00 & 0.20 +- 0.00 & - & 0.09 +- 0.01 &
0.49 +- 0.01\\
\hline
-conv3x3(1000000,3) & - & - & - & - & 0.13 +- 0.00 & 0.53 +- 0.00\\
+conv3x3(1000000,3) & 139.81 & 0.70 +- 0.00 & 0.21 +- 0.00 & - & 0.13 +- 0.00 &
0.53 +- 0.00\\
\hline
conv3x3(3) & - & - & - & 0.19 +- 0.03 & - & -\\
\hline
-conv3x3(Array2D(1000000x3)) & 139.81 & 0.70 +- 0.00 & 0.21 +- 0.00 & - & - &
-\\
+conv5(1e5) & 74.65 & 1.22 +- 0.00 & 0.64 +- 0.00 & 0.55 +- 0.02 & 0.17 +- 0.01
& 0.84 +- 0.00\\
\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\\
-\hline
-conv5(1000,nil) & - & - & - & - & 0.17 +- 0.01 & 0.84 +- 0.00\\
-\hline
-conv5(1e5) & - & - & - & 0.55 +- 0.02 & - & -\\
-\hline
-conv5(1e6) & - & - & - & 0.58 +- 0.03 & - & -\\
-\hline
-conv5(array(1e5)) & 74.65 & 1.22 +- 0.00 & 0.64 +- 0.00 & - & - & -\\
-\hline
-conv5(array(1e6)) & 77.94 & 1.26 +- 0.00 & 0.68 +- 0.01 & - & - & -\\
+conv5(1e6) & 77.94 & 1.26 +- 0.00 & 0.68 +- 0.01 & 0.58 +- 0.03 & 0.21 +- 0.01
& 0.87 +- 0.01\\
\hline
dilate3x3(1000) & - & - & - & 0.17 +- 0.03 & - & -\\
\hline
-dilate3x3(1000,1000) & - & - & - & - & 0.09 +- 0.00 & 0.48 +- 0.01\\
+dilate3x3(1000,1000) & 137.52 & 4.35 +- 0.01 & 3.91 +- 0.02 & - & 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(1000,1000) & 104.02 & 0.49 +- 0.00 & 0.21 +- 0.00 & 0.17 +- 0.03 & 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
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
