Allow use of "--config defaults" in bench, like GM

bench/benchmain.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.
  */
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
@@ skipping 25 matching lines @@
     kNormal_BenchMode,
     kDeferred_BenchMode,
     kDeferredSilent_BenchMode,
     kRecord_BenchMode,
     kPictureRecord_BenchMode
 };
 const char* BenchMode_Name[] = {
     "normal", "deferred", "deferredSilent", "record", "picturerecord"
 };
 
+static const char kDefaultsConfigStr[] = "defaults";
+
 ///////////////////////////////////////////////////////////////////////////////
 
 static void erase(SkBitmap& bm) {
     if (bm.config() == SkBitmap::kA8_Config) {
         bm.eraseColor(SK_ColorTRANSPARENT);
     } else {
         bm.eraseColor(SK_ColorWHITE);
     }
 }
 
@@ skipping 210 matching lines @@
                           "$ requires the end of the test to match\n"
                           "^ and $ requires an exact match\n"
                           "If a test does not match any list entry,\n"
                           "it is skipped unless some list entry starts with ~\n");
 DEFINE_string(mode, "normal",
              "normal:         draw to a normal canvas;\n"
              "deferred:       draw to a deferred canvas;\n"
              "deferredSilent: deferred with silent playback;\n"
              "record:         draw to an SkPicture;\n"
              "picturerecord:  draw from an SkPicture to an SkPicture.\n");
 DEFINE_string(config, "", "Run configs given.  If empty, runs the defaults set in gConfigs.");

[scroggo, 2013/09/16 18:01:47]

Maybe update the help line?

[mtklein, 2013/09/16 18:02:59]

Why don't we default this to "defaults", and cut out the part about what happens
when empty?

[borenet, 2013/09/16 18:23:51]

Done.

 DEFINE_string(logFile, "", "Also write stdout here.");
 DEFINE_int32(minMs, 20,  "Shortest time we'll allow a benchmark to run.");
 DEFINE_int32(maxMs, 4000, "Longest time we'll allow a benchmark to run.");
 DEFINE_double(error, 0.01,
               "Ratio of subsequent bench measurements must drop within 1±error to converge.");
 DEFINE_string(timeFormat, "%9.2f", "Format to print results, in milliseconds per 1000 loops.");
 DEFINE_bool2(verbose, v, false, "Print more.");
 
 // Has this bench converged?  First arguments are milliseconds / loop iteration,
 // last is overall runtime in milliseconds.
@@ skipping 30 matching lines @@
     }
 
     BenchMode benchMode = kNormal_BenchMode;
     for (size_t i = 0; i < SK_ARRAY_COUNT(BenchMode_Name); i++) {
         if (strcmp(FLAGS_mode[0], BenchMode_Name[i]) == 0) {
             benchMode = static_cast<BenchMode>(i);
         }
     }
 
     SkTDArray<int> configs;
+    bool runDefaultConfigs = false;
     // Try user-given configs first.
     for (int i = 0; i < FLAGS_config.count(); i++) {
         for (size_t j = 0; j < SK_ARRAY_COUNT(gConfigs); j++) {
             if (0 == strcmp(FLAGS_config[i], gConfigs[j].name)) {
                 *configs.append() = j;
+            } else if (0 == strcmp(FLAGS_config[i], kDefaultsConfigStr)) {

[mtklein, 2013/09/16 18:02:59]

This may seem like heresy, but I think "defaults" might be easier to read than
kDefaultsConfigStr.  If nothing else it's shorter and you don't have to cross
reference it.

[borenet, 2013/09/16 18:23:51]

I kept it the same, since I added a reference in the help line.  For the record,
this is the name used in GM.

+                runDefaultConfigs = true;
             }
         }
     }
     // If there weren't any, fill in with defaults.
-    if (configs.count() == 0) {
+    if (configs.count() == 0 || runDefaultConfigs) {

[mtklein, 2013/09/16 18:02:59]

If you change the default value of --config, I'd cut out the configs.count() ==
0 part here.  Keeps it simpler.

[borenet, 2013/09/16 18:23:51]

Removing that condition causes no configs to be run when I do something like,
"bench --config someNonExistantConfig", whereas now it would just run the
defaults.  Do we care?

I'm also not doing any checking for whether you've provided one of the defaults
in addition to "defaults", so, for example, running "bench --config defaults
GPU" will run the GPU benches twice.

         for (size_t i = 0; i < SK_ARRAY_COUNT(gConfigs); ++i) {
             if (gConfigs[i].runByDefault) {
                 *configs.append() = i;
             }
         }
     }
     // Filter out things we can't run.
     if (kNormal_BenchMode != benchMode) {
         // Non-rendering configs only run in normal mode
         for (int i = 0; i < configs.count(); ++i) {
@@ skipping 305 matching lines @@
     gContextFactory.destroyContexts();
 #endif
     return 0;
 }
 
 #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