diff options
| author |  mtklein <mtklein@chromium.org> | 2014-06-25 14:08:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-25 14:08:00 -0700 |
| commit | f372321de3d4183de5b9ca436e677e471e358f31 (patch) | |
| tree | 38a46c00e5fa6dd239719b12e2ad4dbf695797a2 /gyp | |
| parent | 20fb7c6220b200eeda86d7d190739a4c5fabe571 (diff) | |
Add nanobench, a fresh look at our microbenchmark harness.
out/Release/nanobench runs 4-5x faster on my Z620 and ~2x faster on my N5 than out/Release/bench with the same configs.
(Debug isn't really comparable. I haven't added the Debug -> single loop check.)
BUG=skia:
R=djsollen@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/347443002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/bench.gyp | 36 | ||||
| -rw-r--r-- | gyp/bench.gypi | 10 | ||||
| -rw-r--r-- | gyp/most.gyp | 2 |
3 files changed, 27 insertions, 21 deletions
diff --git a/gyp/bench.gyp b/gyp/bench.gyp index 9089bf8bc0..cbbf27f9a7 100644 --- a/gyp/bench.gyp +++ b/gyp/bench.gyp @@ -9,13 +9,10 @@ 'target_name': 'bench', 'type': 'executable', 'dependencies': [ - 'etc1.gyp:libetc1', 'flags.gyp:flags', 'jsoncpp.gyp:jsoncpp', 'skia_lib.gyp:skia_lib', 'tools.gyp:crash_handler', - 'tools.gyp:resources', - 'tools.gyp:sk_tool_utils', 'tools.gyp:timer', ], 'sources': [ @@ -27,28 +24,27 @@ '../bench/benchmain.cpp', ], 'conditions': [ - ['skia_gpu == 1', - { - 'include_dirs' : [ - '../src/gpu', - ], - 'dependencies': [ - 'gputest.gyp:skgputest', - ], - }, - ], - ['skia_android_framework == 1', - { - 'libraries': [ - '-lskia', - ], - }, - ], + ['skia_android_framework == 1', { + 'libraries': [ '-lskia' ], + }], ], 'includes': [ 'bench.gypi', 'gmslides.gypi', ], }, + { + 'target_name': 'nanobench', + 'type': 'executable', + 'sources': [ + '../bench/nanobench.cpp', + ], + 'includes': [ 'bench.gypi' ], + 'dependencies': [ + 'flags.gyp:flags', + 'tools.gyp:crash_handler', + 'tools.gyp:timer', + ], + }, ], } diff --git a/gyp/bench.gypi b/gyp/bench.gypi index 798fdd4c37..064814aa4b 100644 --- a/gyp/bench.gypi +++ b/gyp/bench.gypi @@ -2,11 +2,21 @@ 'include_dirs': [ '../src/core', '../src/effects', + '../src/gpu', '../src/utils', '../tools', ], 'dependencies': [ + 'etc1.gyp:libetc1', 'skia_lib.gyp:skia_lib', + 'tools.gyp:resources', + 'tools.gyp:sk_tool_utils', + ], + 'conditions': [ + ['skia_gpu == 1', { + 'include_dirs': [ '../src/gpu' ], + 'dependencies': [ 'gputest.gyp:skgputest' ], + }], ], 'sources': [ '../bench/Benchmark.cpp', diff --git a/gyp/most.gyp b/gyp/most.gyp index 3b1fa3da63..ba189316e9 100644 --- a/gyp/most.gyp +++ b/gyp/most.gyp @@ -15,7 +15,7 @@ # The minimal set of static libraries for basic Skia functionality. 'skia_lib.gyp:skia_lib', - 'bench.gyp:bench', + 'bench.gyp:*', 'gm.gyp:gm', 'SampleApp.gyp:SampleApp', 'tests.gyp:tests', |