DM: also run benches once.

Also:
  - make GrMemoryPoolBenches threadsafe
  - some tweaks to various DM code
  - rename GM::shortName() to getName() to match benches and tests

On my desktop, (289 GMs, 617 benches) x 4 configs, 227 tests takes 46s in Debug, 14s in Release.  (Still minutes faster than running tests && bench && gm.)  GPU singlethreading is definitely the limiting factor again; going to reexamine whether that's helpful to thread it again.

BUG=skia:
R=reed@google.com, bsalomon@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/178473006

git-svn-id: http://skia.googlecode.com/svn/trunk@13603 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 92 insertions, 82 deletions

diff --git a/gyp/bench.gyp b/gyp/bench.gyp
index cd0cdc73c1..c2337f6bba 100644
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -8,11 +8,6 @@
     {
       'target_name': 'bench',
       'type': 'executable',
-      'include_dirs' : [
-        '../src/core',
-        '../src/effects',
-        '../src/utils',
-      ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
         'bench_timer',
@@ -20,87 +15,10 @@
         'jsoncpp.gyp:jsoncpp',
       ],
       'sources': [
-        '../bench/AAClipBench.cpp',
-        '../bench/BicubicBench.cpp',
-        '../bench/BitmapBench.cpp',
-        '../bench/BitmapRectBench.cpp',
-        '../bench/BitmapScaleBench.cpp',
-        '../bench/BlurBench.cpp',
-        '../bench/BlurImageFilterBench.cpp',
-        '../bench/BlurRectBench.cpp',
-        '../bench/BlurRoundRectBench.cpp',
-        '../bench/ChartBench.cpp',
-        '../bench/ChecksumBench.cpp',
-        '../bench/ChromeBench.cpp',
-        '../bench/CmapBench.cpp',
-        '../bench/ColorFilterBench.cpp',
-        '../bench/ColorPrivBench.cpp',
-        '../bench/CoverageBench.cpp',
-        '../bench/DashBench.cpp',
-        '../bench/DecodeBench.cpp',
-        '../bench/DeferredCanvasBench.cpp',
-        '../bench/DeferredSurfaceCopyBench.cpp',
-        '../bench/DisplacementBench.cpp',
-        '../bench/FSRectBench.cpp',
-        '../bench/FontCacheBench.cpp',
-        '../bench/FontScalerBench.cpp',
-        '../bench/GameBench.cpp',
-        '../bench/GrMemoryPoolBench.cpp',
-        '../bench/GrResourceCacheBench.cpp',
-        '../bench/GradientBench.cpp',
-        '../bench/HairlinePathBench.cpp',
-        '../bench/ImageCacheBench.cpp',
-        '../bench/ImageDecodeBench.cpp',
-        '../bench/InterpBench.cpp',
-        '../bench/LightingBench.cpp',
-        '../bench/LineBench.cpp',
-        '../bench/MagnifierBench.cpp',
-        '../bench/MathBench.cpp',
-        '../bench/Matrix44Bench.cpp',
-        '../bench/MatrixBench.cpp',
-        '../bench/MatrixConvolutionBench.cpp',
-        '../bench/MemoryBench.cpp',
-        '../bench/MemsetBench.cpp',
-        '../bench/MergeBench.cpp',
-        '../bench/MorphologyBench.cpp',
-        '../bench/MutexBench.cpp',
-        '../bench/PathBench.cpp',
-        '../bench/PathIterBench.cpp',
-        '../bench/PathUtilsBench.cpp',
-        '../bench/PerlinNoiseBench.cpp',
-        '../bench/PicturePlaybackBench.cpp',
-        '../bench/PictureRecordBench.cpp',
-        '../bench/PremulAndUnpremulAlphaOpsBench.cpp',
-        '../bench/QuadTreeBench.cpp',
-        '../bench/RTreeBench.cpp',
-        '../bench/ReadPixBench.cpp',
-        '../bench/RectBench.cpp',
-        '../bench/RectoriBench.cpp',
-        '../bench/RefCntBench.cpp',
-        '../bench/RegionBench.cpp',
-        '../bench/RegionContainBench.cpp',
-        '../bench/RepeatTileBench.cpp',
-        '../bench/ScalarBench.cpp',
-        '../bench/ShaderMaskBench.cpp',
-        '../bench/SkipZeroesBench.cpp',
-        '../bench/SortBench.cpp',
-        '../bench/StackBench.cpp',
-        '../bench/StrokeBench.cpp',
-        '../bench/TableBench.cpp',
-        '../bench/TextBench.cpp',
-        '../bench/TileBench.cpp',
-        '../bench/VertBench.cpp',
-        '../bench/WritePixelsBench.cpp',
-        '../bench/WriterBench.cpp',
-        '../bench/XfermodeBench.cpp',
-
         '../bench/SkBenchLogger.cpp',
         '../bench/SkBenchLogger.h',
-        '../bench/SkBenchmark.cpp',
-        '../bench/SkBenchmark.h',
         '../bench/SkGMBench.cpp',
         '../bench/SkGMBench.h',
-
         '../bench/benchmain.cpp',
       ],
       'conditions': [
@@ -116,6 +34,7 @@
         ],
       ],
       'includes': [
+        'bench.gypi',
         'gmslides.gypi',
       ],
     },
diff --git a/gyp/bench.gypi b/gyp/bench.gypi
new file mode 100644
index 0000000000..2d934d8366
--- /dev/null
+++ b/gyp/bench.gypi
@@ -0,0 +1,88 @@
+{
+  'include_dirs': [
+    '../src/core',
+    '../src/effects',
+    '../src/utils',
+  ],
+  'dependencies': [
+    'skia_lib.gyp:skia_lib',
+  ],
+  'sources': [
+    '../bench/SkBenchmark.cpp',
+    '../bench/SkBenchmark.h',
+
+    '../bench/AAClipBench.cpp',
+    '../bench/BicubicBench.cpp',
+    '../bench/BitmapBench.cpp',
+    '../bench/BitmapRectBench.cpp',
+    '../bench/BitmapScaleBench.cpp',
+    '../bench/BlurBench.cpp',
+    '../bench/BlurImageFilterBench.cpp',
+    '../bench/BlurRectBench.cpp',
+    '../bench/BlurRoundRectBench.cpp',
+    '../bench/ChartBench.cpp',
+    '../bench/ChecksumBench.cpp',
+    '../bench/ChromeBench.cpp',
+    '../bench/CmapBench.cpp',
+    '../bench/ColorFilterBench.cpp',
+    '../bench/ColorPrivBench.cpp',
+    '../bench/CoverageBench.cpp',
+    '../bench/DashBench.cpp',
+    '../bench/DecodeBench.cpp',
+    '../bench/DeferredCanvasBench.cpp',
+    '../bench/DeferredSurfaceCopyBench.cpp',
+    '../bench/DisplacementBench.cpp',
+    '../bench/FSRectBench.cpp',
+    '../bench/FontCacheBench.cpp',
+    '../bench/FontScalerBench.cpp',
+    '../bench/GameBench.cpp',
+    '../bench/GrMemoryPoolBench.cpp',
+    '../bench/GrResourceCacheBench.cpp',
+    '../bench/GradientBench.cpp',
+    '../bench/HairlinePathBench.cpp',
+    '../bench/ImageCacheBench.cpp',
+    '../bench/ImageDecodeBench.cpp',
+    '../bench/InterpBench.cpp',
+    '../bench/LightingBench.cpp',
+    '../bench/LineBench.cpp',
+    '../bench/MagnifierBench.cpp',
+    '../bench/MathBench.cpp',
+    '../bench/Matrix44Bench.cpp',
+    '../bench/MatrixBench.cpp',
+    '../bench/MatrixConvolutionBench.cpp',
+    '../bench/MemoryBench.cpp',
+    '../bench/MemsetBench.cpp',
+    '../bench/MergeBench.cpp',
+    '../bench/MorphologyBench.cpp',
+    '../bench/MutexBench.cpp',
+    '../bench/PathBench.cpp',
+    '../bench/PathIterBench.cpp',
+    '../bench/PathUtilsBench.cpp',
+    '../bench/PerlinNoiseBench.cpp',
+    '../bench/PicturePlaybackBench.cpp',
+    '../bench/PictureRecordBench.cpp',
+    '../bench/PremulAndUnpremulAlphaOpsBench.cpp',
+    '../bench/QuadTreeBench.cpp',
+    '../bench/RTreeBench.cpp',
+    '../bench/ReadPixBench.cpp',
+    '../bench/RectBench.cpp',
+    '../bench/RectoriBench.cpp',
+    '../bench/RefCntBench.cpp',
+    '../bench/RegionBench.cpp',
+    '../bench/RegionContainBench.cpp',
+    '../bench/RepeatTileBench.cpp',
+    '../bench/ScalarBench.cpp',
+    '../bench/ShaderMaskBench.cpp',
+    '../bench/SkipZeroesBench.cpp',
+    '../bench/SortBench.cpp',
+    '../bench/StackBench.cpp',
+    '../bench/StrokeBench.cpp',
+    '../bench/TableBench.cpp',
+    '../bench/TextBench.cpp',
+    '../bench/TileBench.cpp',
+    '../bench/VertBench.cpp',
+    '../bench/WritePixelsBench.cpp',
+    '../bench/WriterBench.cpp',
+    '../bench/XfermodeBench.cpp',
+  ],
+}
diff --git a/gyp/dm.gyp b/gyp/dm.gyp
index 55f5f9bd14..db509938db 100644
--- a/gyp/dm.gyp
+++ b/gyp/dm.gyp
@@ -7,6 +7,7 @@
         'target_name': 'dm',
         'type': 'executable',
         'include_dirs': [
+            '../bench',
             '../dm',
             '../gm',
             '../tests',
@@ -20,12 +21,14 @@
             '../tools',
         ],
         'includes': [
+            'bench.gypi',
             'gmslides.gypi',
             'pathops_unittest.gypi',
             'tests.gypi',
         ],
         'sources': [
             '../dm/DM.cpp',
+            '../dm/DMBenchTask.cpp',
             '../dm/DMCpuTask.cpp',
             '../dm/DMExpectationsTask.cpp',
             '../dm/DMGpuTask.cpp',