nanobench: split CPU and GPU .SKP tile sizes.

bench/SKPBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SKPBench.h"
 #include "SkCommandLineFlags.h"
 #include "SkMultiPictureDraw.h"
 #include "SkSurface.h"
 
-DEFINE_int32(benchTileW, 1600, "Tile width  used for SKP playback.");
-DEFINE_int32(benchTileH, 512, "Tile height used for SKP playback.");
+// These CPU tile sizes are not good per se, but they are similar to what Chrome uses.
+DEFINE_int32(CPUbenchTileW, 256, "Tile width  used for CPU SKP playback.");
+DEFINE_int32(CPUbenchTileH, 256, "Tile height used for CPU SKP playback.");
+
+DEFINE_int32(GPUbenchTileW, 1600, "Tile width  used for GPU SKP playback.");
+DEFINE_int32(GPUbenchTileH, 512, "Tile height used for GPU SKP playback.");
 
 SKPBench::SKPBench(const char* name, const SkPicture* pic, const SkIRect& clip, SkScalar scale,
                    bool useMultiPictureDraw)
     : fPic(SkRef(pic))
     , fClip(clip)
     , fScale(scale)
     , fName(name)
     , fUseMultiPictureDraw(useMultiPictureDraw) {
     fUniqueName.printf("%s_%.2g", name, scale);  // Scale makes this unqiue for perf.skia.org traces.
     if (useMultiPictureDraw) {
@@ skipping 12 matching lines @@
 }
 
 const char* SKPBench::onGetUniqueName() {
     return fUniqueName.c_str();
 }
 
 void SKPBench::onPerCanvasPreDraw(SkCanvas* canvas) {
     SkIRect bounds;
     SkAssertResult(canvas->getClipDeviceBounds(&bounds));
 
-    int tileW = SkTMin(FLAGS_benchTileW, bounds.width());
-    int tileH = SkTMin(FLAGS_benchTileH, bounds.height());
+    const bool gpu = canvas->getGrContext() != nullptr;
+    int tileW = gpu ? FLAGS_GPUbenchTileW : FLAGS_CPUbenchTileW,
+        tileH = gpu ? FLAGS_GPUbenchTileH : FLAGS_CPUbenchTileH;
+
+    tileW = SkTMin(tileW, bounds.width());
+    tileH = SkTMin(tileH, bounds.height());
 
     int xTiles = SkScalarCeilToInt(bounds.width()  / SkIntToScalar(tileW));
     int yTiles = SkScalarCeilToInt(bounds.height() / SkIntToScalar(tileH));
 
     fSurfaces.setReserve(xTiles * yTiles);
     fTileRects.setReserve(xTiles * yTiles);
 
     SkImageInfo ii = canvas->imageInfo().makeWH(tileW, tileH);
 
     for (int y = bounds.fTop; y < bounds.fBottom; y += tileH) {
@@ skipping 69 matching lines @@
     for (int j = 0; j < fTileRects.count(); ++j) {
         const SkMatrix trans = SkMatrix::MakeTrans(-fTileRects[j].fLeft / fScale,
                                                    -fTileRects[j].fTop / fScale);
         fSurfaces[j]->getCanvas()->drawPicture(fPic, &trans, NULL);
     }
 
     for (int j = 0; j < fTileRects.count(); ++j) {
         fSurfaces[j]->getCanvas()->flush();
     }
 }