add wildcard test name matching to 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.
  */
 
 
 #include "BenchTimer.h"
@@ skipping 253 matching lines @@
 static int findConfig(const char config[]) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(gConfigs); i++) {
         if (!strcmp(config, gConfigs[i].fName)) {
             return i;
         }
     }
     return -1;
 }
 
 static bool skip_name(const SkTDArray<const char*> array, const char name[]) {
-    if (0 == array.count()) {
-        // no names, so don't skip anything
-        return false;
-    }
+    // FIXME: this duplicates the logic in skia_test.cpp, gmmain.cpp -- consolidate
+    int count = array.count();
+    size_t testLen = strlen(name);
+    bool anyExclude = count == 0;
     for (int i = 0; i < array.count(); ++i) {
-        if (strstr(name, array[i])) {
-            // found the name, so don't skip
-            return false;
+        const char* matchName = array[i];
+        size_t matchLen = strlen(matchName);
+        bool matchExclude, matchStart, matchEnd;
+        if ((matchExclude = matchName[0] == '~')) {
+            anyExclude = true;
+            matchName++;
+            matchLen--;
+        }
+        if ((matchStart = matchName[0] == '^')) {
+            matchName++;
+            matchLen--;
+        }
+        if ((matchEnd = matchName[matchLen - 1] == '$')) {
+            matchLen--;
+        }
+        if (matchStart ? (!matchEnd || matchLen == testLen)
+                && strncmp(name, matchName, matchLen) == 0
+                : matchEnd ? matchLen <= testLen
+                && strncmp(name + testLen - matchLen, matchName, matchLen) == 0
+                : strstr(name, matchName) != 0) {
+            return matchExclude;
         }
     }
-    return true;
+    return !anyExclude;
 }
 
 static void help() {
     SkString configsStr;
     static const size_t kConfigCount = SK_ARRAY_COUNT(gConfigs);
     for (size_t i = 0; i < kConfigCount; ++i) {
         configsStr.appendf("%s%s", gConfigs[i].fName, ((i == kConfigCount - 1) ? "" : "|"));
     }
 
     SkDebugf("Usage: bench [-o outDir] [--repeat nr] [--logPerIter] "
@@ skipping 27 matching lines @@
     SkDebugf("    --forceDither 1|0 : "
              "Enable/disable dithering, default is disabled.\n");
     SkDebugf("    --forceBlend 1|0 : "
              "Enable/disable dithering, default is disabled.\n");
 #if SK_SUPPORT_GPU
     SkDebugf("    --gpuCacheSize <bytes> <count>: "
              "limits gpu cache to  bytes size or object count.\n");
     SkDebugf("      -1 for either value means use the default. 0 for either disables the cache.\n");
 #endif
     SkDebugf("    --strokeWidth width : The width for path stroke.\n");
-    SkDebugf("    --match name : Only run bench whose name is matched.\n");
+    SkDebugf("    --match [~][^]substring[$] [...] of test name to run.\n"
+             "             Multiple matches may be separated by spaces.\n"
+             "             ~ causes a matching test to always be skipped\n"
+             "             ^ requires the start of the test to match\n"
+             "             $ 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");
     SkDebugf("    --mode normal|deferred|deferredSilent|record|picturerecord :\n"
              "             Run in the corresponding mode\n"
              "                 normal, Use a normal canvas to draw to;\n"
              "                 deferred, Use a deferrred canvas when drawing;\n"
              "                 deferredSilent, deferred with silent playback;\n"
              "                 record, Benchmark the time to record to an SkPicture;\n"
              "                 picturerecord, Benchmark the time to do record from a \n"
              "                                SkPicture to a SkPicture.\n");
     SkDebugf("    --logFile filename : destination for writing log output, in addition to stdout.\n");
     SkDebugf("    --config %s:\n", configsStr.c_str());
@@ skipping 176 matching lines @@
                   return -1;
                 }
                 hasStrokeWidth = true;
             } else {
                 logger.logError("missing arg for --strokeWidth\n");
                 help();
                 return -1;
             }
         } else if (strcmp(*argv, "--match") == 0) {
             argv++;
-            if (argv < stop) {
-                *fMatches.append() = *argv;
-            } else {
+            while (argv < stop && (*argv)[0] != '-') {
+                *fMatches.append() = *argv++;
+            }
+            argv--;
+            if (!fMatches.count()) {
                 logger.logError("missing arg for --match\n");
                 help();
                 return -1;
             }
         } else if (strcmp(*argv, "--config") == 0) {
             argv++;
             if (argv < stop) {
                 int index = findConfig(*argv);
                 if (index >= 0) {
                     *configs.append() = index;
@@ skipping 413 matching lines @@
     }
 
     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