summaryrefslogtreecommitdiffstatsci
diff options
context:
space:
mode:
authorBryce Harrington <b.harrington@samsung.com>2014-07-24 10:59:30 -0700
committerBryce Harrington <b.harrington@samsung.com>2014-07-24 10:59:30 -0700
commitba0832b38918bcd1c79b636c1dc9068bf3ff6f68 (patch)
treea24c6f3c8260e4429a302f8f547ac02f1e8842ff
parent798128b377e9bf988f16a44c4bfc730886f5f49f (diff)
parent3f6e12671c1a4515712b289322402f210d1b8970 (diff)
Merge pull request #128 from Samsung/Issue_127
Issue 127. Fix score calculation in canvas_perf.
-rw-r--r--README13
-rwxr-xr-xutils/canvas_perf5
2 files changed, 13 insertions, 5 deletions
diff --git a/README b/README
index e288ea1..85e0be5 100644
--- a/README
+++ b/README
@@ -49,9 +49,9 @@ Caskbench builds to a single executable which you can run directly
The testing will alternate between cairo and skia versions of each test.
The second column indicates the test size, the fourth column is the
number of iterations. If the third column shows anything other than a
-pass, something's seriously wrong. The fifth column is the minimum run
-time, and sixth is an average. The last column calculates the percent
-difference that skia is faster than cairo on average.
+pass, something's seriously wrong. The fifth column is the fps value.
+The last column calculates the percent difference that skia is faster
+than cairo on average.
For hardware acceleration, specify the surface type to use (e.g. glx or
egl) via the -t parameter.
@@ -72,3 +72,10 @@ intensity of the testing.
Run it with the '-?' flag to see usage directions with explanations of
all available options.
+
+Caskbench is tested with the following skia branches:
+ 1. https://github.com/Samsung/skia/tree/dev/m34_1847
+ 2. https://github.com/Samsung/skia/tree/dev/m36_1985
+ 3. https://github.com/Samsung/skia/tree/upstream/m34_1847
+ 4. https://github.com/Samsung/skia/tree/upstream/m36_1985
+ 5. https://github.com/Samsung/skia/tree/henry
diff --git a/utils/canvas_perf b/utils/canvas_perf
index 2826624..4e051b2 100755
--- a/utils/canvas_perf
+++ b/utils/canvas_perf
@@ -62,12 +62,13 @@ def execute(command):
results = []
+iterations = 100
for testcase in perfdefs:
cmd = [ CASKBENCH,
'-D', 'skia',
'-w', '480',
'-h', '480',
- '-i', '1',
+ '-i', str(iterations),
'-s', str(testcase[1]),
'-j',
'-o', 'output.json',
@@ -84,7 +85,7 @@ for testcase in perfdefs:
with open('output.json') as file:
result = json.load(file)[0]
- value = result["median run time (s)"]*1000.0
+ value = testcase[1] / (result["average run time (s)"]*1000)
ratio = value / testcase[2]
results.append({