gpu and cpu flags for gm and bench.

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 "BenchLogger.h"
 #include "Benchmark.h"
 #include "CrashHandler.h"
@@ skipping 219 matching lines @@
 DEFINE_string(forceDither, "default", "Force dithering: true, false, or default?");
 DEFINE_bool(forceBlend,     false,    "Force alpha blending?");
 
 DEFINE_string(gpuAPI, "", "Force use of specific gpu API.  Using \"gl\" "
               "forces OpenGL API. Using \"gles\" forces OpenGL ES API. "
               "Defaults to empty string, which selects the API native to the "
               "system.");
 DEFINE_int32(gpuCacheBytes, -1, "GPU cache size limit in bytes.  0 to disable cache.");
 DEFINE_int32(gpuCacheCount, -1, "GPU cache size limit in object count.  0 to disable cache.");
 
+DEFINE_bool(gpu, true, "Allows GPU configs to be run. Applied after --configs.");
+DEFINE_bool(cpu, true, "Allows non-GPU configs to be run. Applied after --config.");
+
 DEFINE_bool2(leaks, l, false, "show leaked ref cnt'd objects.");
 DEFINE_string(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");
 DEFINE_string(mode, "normal",
@@ skipping 96 matching lines @@
     if (kNormal_BenchMode != benchMode) {
         // Non-rendering configs only run in normal mode
         for (int i = 0; i < configs.count(); ++i) {
             const Config& config = gConfigs[configs[i]];
             if (Benchmark::kNonRendering_Backend == config.backend) {
                 configs.remove(i, 1);
                 --i;
             }
         }
     }
+    // Apply the gpu/cpu only flags
+    for (int i = 0; i < configs.count(); ++i) {
+        const Config& config = gConfigs[configs[i]];
+        if (config.backend == Benchmark::kGPU_Backend) {
+            if (!FLAGS_gpu) {
+                configs.remove(i, 1);
+                --i;
+            }
+        } else if (!FLAGS_cpu) {
+            configs.remove(i, 1);
+            --i;
+        }
+    }
 
 #if SK_SUPPORT_GPU
     GrGLStandard gpuAPI = kNone_GrGLStandard;
     if (1 == FLAGS_gpuAPI.count()) {
         if (FLAGS_gpuAPI.contains(kGpuAPINameGL)) {
             gpuAPI = kGL_GrGLStandard;
         } else if (FLAGS_gpuAPI.contains(kGpuAPINameGLES)) {
             gpuAPI = kGLES_GrGLStandard;
         } else {
             SkDebugf("Selected gpu API could not be used. Using the default.\n");
@@ skipping 331 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