Make GPU cache size cmd line configurable in GM.

gm/gmmain.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * Code for the "gm" (Golden Master) rendering comparison tool.
  *
@@ skipping 1015 matching lines @@
 // It would probably be better if we allowed both yes-and-no settings for each
 // one, e.g.:
 // [--replay|--noreplay]: whether to exercise SkPicture replay; default is yes
 "    [--nodeferred]: skip the deferred rendering test pass\n"
 "    [--disable-missing-warning]: don't print a message to stderr if\n"
 "        unable to read a reference image for any tests (NOT default behavior)\n"
 "    [--enable-missing-warning]: print message to stderr (but don't fail) if\n"
 "        unable to read a reference image for any tests (default behavior)\n"
 "    [--exclude-config]: disable this config (may be used multiple times)\n"
 "    [--forceBWtext]: disable text anti-aliasing\n"
+#if SK_SUPPORT_GPU

[robertphillips, 2013/03/08 19:51:51]

0 for both will disable the cache?

[bsalomon, 2013/03/08 20:01:05]

Done.

+"    [--gpucachesize <size> <count>]: limits gpu cache to size bytes or count objects\n"
+"        -1 for either value means use the default\n"
+#endif
 "    [--help|-h]: show this help message\n"
 "    [--hierarchy|--nohierarchy]: whether to use multilevel directory structure\n"
 "        when reading/writing files; default is no\n"
 "    [--match <substring>]: only run tests whose name includes this substring\n"
 "    [--mismatchPath <path>]: write images for tests that failed due to\n"
 "        pixel mismatched into this directory"
 "    [--modulo <remainder> <divisor>]: only run tests for which \n"
 "        testIndex %% divisor == remainder\n"
 "    [--nopdf]: skip the pdf rendering test pass\n"
 "    [--nopipe]: Skip SkGPipe replay\n"
 "    [--readPath|-r <path>]: read reference images from this dir, and report\n"
 "        any differences between those and the newly generated ones\n"
 "    [--noreplay]: do not exercise SkPicture replay\n"
 "    [--resourcePath|-i <path>]: directory that stores image resources\n"
 "    [--nortree]: Do not exercise the R-Tree variant of SkPicture\n"
 "    [--noserialize]: do not exercise SkPicture serialization & deserialization\n"
-"    [--notexturecache]: disable the gpu texture cache\n"
 "    [--tiledPipe]: Exercise tiled SkGPipe replay\n"
 "    [--notileGrid]: Do not exercise the tile grid variant of SkPicture\n"
 "    [--tileGridReplayScales <scales>]: Comma separated list of floating-point scale\n"
 "        factors to be used for tileGrid playback testing. Default value: 1.0\n"
 "    [--writeJsonSummary <path>]: write a JSON-formatted result summary to this file\n"
 "    [--verbose] print diagnostics (e.g. list each config to be tested)\n"
 "    [--writePath|-w <path>]: write rendered images into this directory\n"
 "    [--writePicturePath|-wp <path>]: write .skp files into this directory\n"
              );
 }
@@ skipping 96 matching lines @@
 
     bool doPDF = true;
     bool doReplay = true;
     bool doPipe = true;
     bool doTiledPipe = false;
     bool doSerialize = true;
     bool doDeferred = true;
     bool doRTree = true;
     bool doTileGrid = true;
     bool doVerbose = false;
-#if SK_SUPPORT_GPU
-    bool disableTextureCache = false;
-#endif
+
     SkTDArray<size_t> configs;
     SkTDArray<size_t> excludeConfigs;
     SkTDArray<SkScalar> tileGridReplayScales;
     *tileGridReplayScales.append() = SK_Scalar1; // By default only test at scale 1.0
     bool userConfig = false;
 
     int moduloRemainder = -1;
     int moduloDivisor = -1;
 
+#if SK_SUPPORT_GPU
+    struct {
+        size_t  fBytes;
+        int     fCount;
+    } gpuCacheSize = { -1, -1 }; // -1s mean use the default
+#endif
+
     const char* const commandName = argv[0];
     char* const* stop = argv + argc;
     for (++argv; argv < stop; ++argv) {
         if (strcmp(*argv, "--config") == 0) {
             argv++;
             if (argv < stop) {
                 int index = findConfig(*argv);
                 if (index >= 0) {
                     appendUnique<size_t>(&configs, index);
                     userConfig = true;
@@ skipping 55 matching lines @@
             }
             if (0 == tileGridReplayScales.count()) {
                 // Should have at least one scale
                 usage(commandName);
                 return -1;
             }
         } else if (strcmp(*argv, "--enable-missing-warning") == 0) {
             notifyMissingReadReference = true;
         } else if (strcmp(*argv, "--forceBWtext") == 0) {
             gForceBWtext = true;
+#if SK_SUPPORT_GPU
+        } else if (strcmp(*argv, "--gpucachesize") == 0) {
+            if (stop - argv > 2) {
+                gpuCacheSize.fBytes = atoi(*++argv);
+                gpuCacheSize.fCount = atoi(*++argv);
+            }

[robertphillips, 2013/03/08 19:51:51]

else {
    SkDebugf("missing arg for --gpucachesize\n");
    usage(commandName);
    return -1;
}

[bsalomon, 2013/03/08 20:00:12]

Done.

+#endif
         } else if (strcmp(*argv, "--help") == 0 || strcmp(*argv, "-h") == 0) {
             usage(commandName);
             return -1;
         } else if (strcmp(*argv, "--hierarchy") == 0) {
             gmmain.fUseFileHierarchy = true;
         } else if (strcmp(*argv, "--nohierarchy") == 0) {
             gmmain.fUseFileHierarchy = false;
         } else if (strcmp(*argv, "--match") == 0) {
             ++argv;
             if (argv < stop && **argv) {
@@ skipping 31 matching lines @@
         } else if ((0 == strcmp(*argv, "--resourcePath")) ||
                    (0 == strcmp(*argv, "-i"))) {
             argv++;
             if (argv < stop && **argv) {
                 resourcePath = *argv;
             }
         } else if (strcmp(*argv, "--serialize") == 0) {
             doSerialize = true;
         } else if (strcmp(*argv, "--noserialize") == 0) {
             doSerialize = false;
-        } else if (strcmp(*argv, "--notexturecache") == 0) {
-#if SK_SUPPORT_GPU
-            disableTextureCache = true;
-#endif
         } else if (strcmp(*argv, "--tiledPipe") == 0) {
             doTiledPipe = true;
         } else if (!strcmp(*argv, "--verbose") || !strcmp(*argv, "-v")) {
             doVerbose = true;
         } else if ((0 == strcmp(*argv, "--writePath")) ||
             (0 == strcmp(*argv, "-w"))) {
             argv++;
             if (argv < stop && **argv) {
                 writePath = *argv;
             }
@@ skipping 80 matching lines @@
     }
 
     // Accumulate success of all tests.
     int testsRun = 0;
     int testsPassed = 0;
     int testsFailed = 0;
     int testsMissingReferenceImages = 0;
 
 #if SK_SUPPORT_GPU
     GrContextFactory* grFactory = new GrContextFactory;
-    if (disableTextureCache) {
-        skiagm::GetGr()->setTextureCacheLimits(0, 0);
-    }
 #endif
 
     int gmIndex = -1;
     SkString moduloStr;
 
     // If we will be writing out files, prepare subdirectories.
     if (writePath) {
         if (!sk_mkdir(writePath)) {
             return -1;
         }
@@ skipping 74 matching lines @@
                     desc.fHeight = gm->getISize().height();
                     desc.fSampleCnt = config.fSampleCnt;
                     GrTexture* tex = gr->createUncachedTexture(desc, NULL, 0);
                     if (tex) {
                         rt.reset(tex->asRenderTarget());
                         rt.get()->ref();
                         tex->unref();
                         autogr.set(gr);
                         renderTarget = rt.get();
                         grSuccess = NULL != renderTarget;
                     }

[robertphillips, 2013/03/08 19:51:51]

// Set the passed in texture cache limits?

[bsalomon, 2013/03/08 20:00:12]

Done.

+                    size_t bytes;
+                    int count;
+                    gr->getTextureCacheLimits(&count, &bytes);
+                    if (-1 != gpuCacheSize.fBytes) {
+                        bytes = gpuCacheSize.fBytes;
+                    }
+                    if (-1 != gpuCacheSize.fCount) {
+                        count = gpuCacheSize.fCount;
+                    }
+                    gr->setTextureCacheLimits(count, bytes);
                 }
                 if (!grSuccess) {
                     renderErrors |= kNoGpuContext_ErrorBitmask;
                 }
             }
 #endif
 
             SkBitmap comparisonBitmap;
 
             if (kEmptyErrorBitfield == renderErrors) {
@@ skipping 182 matching lines @@
     SkGraphics::Term();
 
     return (0 == testsFailed) ? 0 : -1;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif