[pypy-commit] extradoc extradoc: add convolution to lua benchmakr run

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: extradoc
Changeset: r4576:d2552a610608
Date: 2012-08-14 20:46 +0200
http://bitbucket.org/pypy/extradoc/changeset/d2552a610608/

Log:	add convolution to lua benchmakr run

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
@@ -28,6 +28,14 @@
     $* runner.lua sqrt int
     $* runner.lua sqrt float
     $* runner.lua sqrt Fix16
+    $* runner.lua convolution conv3 100
+    $* runner.lua convolution conv5 100
+    $* runner.lua convolution conv3 1000
+    $* runner.lua convolution conv5 1000
+    $* runner.lua convolution conv3x3 1000000 3
+    $* runner.lua convolution conv3x3 1000 1000
+    $* runner.lua convolution dilate3x3 1000 1000
+    $* runner.lua convolution sobel_magnitude 1000 1000
     $* runner.lua SOR 100 32768
     $* runner.lua SOR 1000 256
     $* runner.lua SparseMatMult 1000 5000 262144
diff --git a/talk/iwtc11/benchmarks/convolution/convolution.lua b/talk/iwtc11/benchmarks/convolution/convolution.lua
--- a/talk/iwtc11/benchmarks/convolution/convolution.lua
+++ b/talk/iwtc11/benchmarks/convolution/convolution.lua
@@ -1,3 +1,4 @@
+module(..., package.seeall);
 local ffi = require("ffi")
 
 function array(length, initializer)
@@ -174,5 +175,5 @@
     return string.format("%s", arg)
 end
 
-main(arg)
+--main(arg)
 
diff --git a/talk/iwtc11/benchmarks/runner.lua b/talk/iwtc11/benchmarks/runner.lua
--- a/talk/iwtc11/benchmarks/runner.lua
+++ b/talk/iwtc11/benchmarks/runner.lua
@@ -40,6 +40,13 @@
     return string.format('sqrt(%s)', sqrt.main({a}))
 end
 
+package.path = package.path .. ";convolution/?.lua"
+require('convolution')
+function benchmarks.convolution(a, b, c)
+    return string.format('convolution(%s)', convolution.main({a, b, c}))
+end
+
+
 
 
 function measure(name, ...)