Wire up configurations properly in VisualBench

tools/VisualBench/VisualBenchmarkStream.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 
 #include <VisualBench/VisualBenchmarkStream.h>
 #include <VisualBench/WrappedBenchmark.h>
 #include "GMBench.h"
 #include "SkOSFile.h"
 #include "SkPath.h"
 #include "SkPictureRecorder.h"
 #include "SkStream.h"
 #include "sk_tool_utils.h"
-#include "VisualFlags.h"
 #include "VisualSKPBench.h"
 
-DEFINE_bool(cpu, false, "Run in CPU mode?");
 DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of bench name to run.\n"
                "Multiple matches may be separated by spaces.\n"
                "~ causes a matching bench to always be skipped\n"
                "^ requires the start of the bench to match\n"
                "$ requires the end of the bench to match\n"
                "^ and $ requires an exact match\n"
                "If a bench does not match any list entry,\n"
                "it is skipped unless some list entry starts with ~");
 DEFINE_string(skps, "skps", "Directory to read skps from.");
@@ skipping 37 matching lines @@
         if (SkStrEndsWith(FLAGS_skps[i], ".skp")) {
             fSKPs.push_back() = FLAGS_skps[i];
         } else {
             SkOSFile::Iter it(FLAGS_skps[i], ".skp");
             SkString path;
             while (it.next(&path)) {
                 fSKPs.push_back() = SkOSPath::Join(FLAGS_skps[0], path.c_str());
             }
         }
     }
-
-    // seed with an initial benchmark
-    // NOTE the initial benchmark will not have preTimingHooks called, but that is okay because
-    // it is the warmupbench
-    this->next();
 }
 
 bool VisualBenchmarkStream::ReadPicture(const char* path, SkAutoTUnref<SkPicture>* pic) {
     // Not strictly necessary, as it will be checked again later,
     // but helps to avoid a lot of pointless work if we're going to skip it.
     if (SkCommandLineFlags::ShouldSkip(FLAGS_match, path)) {
         return false;
     }
 
     SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(path));
     if (stream.get() == nullptr) {
         SkDebugf("Could not read %s.\n", path);
         return false;
     }
 
     pic->reset(SkPicture::CreateFromStream(stream.get()));
     if (pic->get() == nullptr) {
         SkDebugf("Could not read %s as an SkPicture.\n", path);
         return false;
     }
     return true;
 }
 
-Benchmark* VisualBenchmarkStream::next() {
+Benchmark* VisualBenchmarkStream::next(Configs::Config config) {
     Benchmark* bench;
     if (!fIsWarmedUp) {
         fIsWarmedUp = true;
         bench = new WarmupBench;
     } else {
         // skips non matching benches
         while ((bench = this->innerNext()) &&
                (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName()) ||
                 !bench->isSuitableFor(Benchmark::kGPU_Backend))) {
             bench->unref();
         }
     }
 
-    // TODO move this all to --config
-    if (bench && FLAGS_cpu) {
-        bench = new CpuWrappedBenchmark(bench);
-    } else if (bench && FLAGS_nvpr) {
-        bench = new NvprWrappedBenchmark(bench, 4);
+    if (bench) {
+        switch (config.fType) {
+            case Configs::Config::kCpu_Type:
+                bench = new CpuWrappedBenchmark(bench);
+                break;
+            case Configs::Config::kNvpr_Type:
+                bench = new NvprWrappedBenchmark(bench, config.fNumSamples);
+                break;
+            default:
+                // These are the only two configs we need to wrap right now
+                break;
+        }
     }
 
     fBenchmark.reset(bench);
     return fBenchmark;
 }
 
 Benchmark* VisualBenchmarkStream::innerNext() {
     while (fBenches) {
         Benchmark* bench = fBenches->factory()(nullptr);
         fBenches = fBenches->next();
@@ skipping 24 matching lines @@
         }
 
         SkString name = SkOSPath::Basename(path.c_str());
         fSourceType = "skp";
         fBenchType = "playback";
         return new VisualSKPBench(name.c_str(), pic.get());
     }
 
     return nullptr;
 }