SKPs-as-benches in nanobench

bench/nanobench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <ctype.h>
 
 #include "Benchmark.h"
 #include "CrashHandler.h"
 #include "GMBench.h"
 #include "ResultsWriter.h"
+#include "SKPBench.h"
 #include "Stats.h"
 #include "Timer.h"
 
+#include "SkOSFile.h"
 #include "SkCanvas.h"
 #include "SkCommonFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkString.h"
 #include "SkSurface.h"
 
 #if SK_SUPPORT_GPU
     #include "gl/GrGLDefines.h"
     #include "GrContextFactory.h"
@@ skipping 15 matching lines @@
 DEFINE_double(gpuMs, 5, "Target bench time in millseconds for GPU.");
 DEFINE_int32(gpuFrameLag, 5, "Overestimate of maximum number of frames GPU allows to lag.");
 
 DEFINE_string(outResultsFile, "", "If given, write results here as JSON.");
 DEFINE_int32(maxCalibrationAttempts, 3,
              "Try up to this many times to guess loops for a bench, or skip the bench.");
 DEFINE_int32(maxLoops, 1000000, "Never run a bench more times than this.");
 DEFINE_string(key, "", "Space-separated key/value pairs to add to JSON.");
 DEFINE_string(gitHash, "", "Git hash to add to JSON.");
 
+DEFINE_string(clip, "0,0,1000,1000", "Clip for SKPs.");
+DEFINE_string(scales, "1.0,1.1", "Scales for SKPs.");

[bsalomon, 2014/08/01 13:23:24]

Maybe the default should just be 1.0?

[mtklein, 2014/08/01 13:55:34]

Done.

Oddly, having a single value by default makes the parsing code simpler, because
we can just space separate them and lean more on SkCommandlineFlags.

+
 static SkString humanize(double ms) {
     if (ms > 1e+3) return SkStringPrintf("%.3gs",  ms/1e3);
     if (ms < 1e-3) return SkStringPrintf("%.3gns", ms*1e6);
 #ifdef SK_BUILD_FOR_WIN
     if (ms < 1)    return SkStringPrintf("%.3gus", ms*1e3);
 #else
     if (ms < 1)    return SkStringPrintf("%.3gµs", ms*1e3);
 #endif
     return SkStringPrintf("%.3gms", ms);
 }
@@ skipping 288 matching lines @@
     SK_GL_RET(*ctx, version, GetString(GR_GL_VENDOR));
     log->configOption("GL_VENDOR", (const char*) version);
 
     SK_GL_RET(*ctx, version, GetString(GR_GL_SHADING_LANGUAGE_VERSION));
     log->configOption("GL_SHADING_LANGUAGE_VERSION", (const char*) version);
 }
 #endif
 
 class BenchmarkStream {
 public:
-    BenchmarkStream() : fBenches(BenchRegistry::Head()) , fGMs(skiagm::GMRegistry::Head()) {}
+    BenchmarkStream() : fBenches(BenchRegistry::Head())
+                      , fGMs(skiagm::GMRegistry::Head())
+                      , fCurrentScale(0)
+                      , fCurrentSKP(0) {
+        if (!FLAGS_skps.isEmpty()) {
+            SkOSFile::Iter it(FLAGS_skps[0], ".skp");
+            SkString path;
+            while (it.next(&path)) {
+                fSKPs.push_back() = SkOSPath::Join(FLAGS_skps[0], path.c_str());
+            }
+        }
 
-    Benchmark* next(const char** sourceType) {
+        if (4 != sscanf(FLAGS_clip[0], "%d,%d,%d,%d",
+                        &fClip.fLeft, &fClip.fTop, &fClip.fRight, &fClip.fBottom)) {
+            SkDebugf("Can't parse %s from --clip as an SkIRect.\n", FLAGS_clip[0]);
+            exit(1);
+        }
+
+        SkTArray<SkString> scales;
+        SkStrSplit(FLAGS_scales[0], ",", &scales);
+        for (int i = 0; i < scales.count(); i++) {
+            if (1 != sscanf(scales[i].c_str(), "%f", &fScales.push_back())) {
+                SkDebugf("Can't parse %s from --scales as an SkScalar.\n", scales[i].c_str());
+                exit(1);
+            }
+        }
+    }
+
+    Benchmark* next() {
         if (fBenches) {
             Benchmark* bench = fBenches->factory()(NULL);
             fBenches = fBenches->next();
-            *sourceType = "bench";
+            fSourceType = "bench";
             return bench;
         }
+
         while (fGMs) {
             SkAutoTDelete<skiagm::GM> gm(fGMs->factory()(NULL));
             fGMs = fGMs->next();
             if (gm->getFlags() & skiagm::GM::kAsBench_Flag) {
-                *sourceType = "gm";
+                fSourceType = "gm";
                 return SkNEW_ARGS(GMBench, (gm.detach()));
             }
         }
+
+        while (fCurrentScale < fScales.count()) {
+            while (fCurrentSKP < fSKPs.count()) {
+                const SkString& path = fSKPs[fCurrentSKP++];
+
+                // 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.c_str())) {
+                    continue;
+                }
+
+                SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path.c_str()));
+                if (stream.get() == NULL) {
+                    SkDebugf("Could not read %s.\n", path.c_str());
+                    exit(1);
+                }
+
+                SkAutoTUnref<SkPicture> pic(SkPicture::CreateFromStream(stream.get()));
+                if (pic.get() == NULL) {
+                    SkDebugf("Could not read %s as an SkPicture.\n", path.c_str());
+                    exit(1);
+                }
+
+                SkString name = SkOSPath::Basename(path.c_str());
+
+                fSourceType = "skp";
+                return SkNEW_ARGS(SKPBench,
+                        (name.c_str(), pic.get(), fClip, fScales[fCurrentScale]));
+            }
+            fCurrentSKP = 0;
+            fCurrentScale++;
+        }
+
         return NULL;
     }
+
+    void fillCurrentOptions(ResultsWriter* log) const {
+        log->configOption("source_type", fSourceType);
+        if (0 == strcmp(fSourceType, "skp")) {
+            log->configOption("clip",
+                    SkStringPrintf("%d %d %d %d", fClip.fLeft, fClip.fTop,
+                                                  fClip.fRight, fClip.fBottom).c_str());
+            log->configOption("scale", SkStringPrintf("%.2g", fScales[fCurrentScale]).c_str());
+        }
+    }
+
 private:
     const BenchRegistry* fBenches;
     const skiagm::GMRegistry* fGMs;
+    SkIRect            fClip;
+    SkTArray<SkScalar> fScales;
+    SkTArray<SkString> fSKPs;
+
+    const char* fSourceType;
+    int fCurrentScale;
+    int fCurrentSKP;
 };
 
 int nanobench_main();
 int nanobench_main() {
     SetupCrashHandler();
     SkAutoGraphics ag;
 
     if (FLAGS_runOnce) {
         FLAGS_samples     = 1;
         FLAGS_gpuFrameLag = 0;
@@ skipping 28 matching lines @@
         // No header.
     } else if (FLAGS_quiet) {
         SkDebugf("median\tbench\tconfig\n");
     } else {
         SkDebugf("loops\tmin\tmedian\tmean\tmax\tstddev\tsamples\tconfig\tbench\n");
     }
 
     SkTDArray<Config> configs;
     create_configs(&configs);
 
-    BenchmarkStream benches;
-    const char* sourceType;
-    while (Benchmark* b = benches.next(&sourceType)) {
+    BenchmarkStream benchStream;
+    while (Benchmark* b = benchStream.next()) {
         SkAutoTDelete<Benchmark> bench(b);
         if (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getName())) {
             continue;
         }
 
         SkTDArray<Target*> targets;
         create_targets(&targets, bench.get(), configs);
 
         if (!targets.isEmpty()) {
             log.bench(bench->getName(), bench->getSize().fX, bench->getSize().fY);
             bench->preDraw();
         }
         for (int j = 0; j < targets.count(); j++) {
             SkCanvas* canvas = targets[j]->surface.get() ? targets[j]->surface->getCanvas() : NULL;
             const char* config = targets[j]->config.name;
 
+#if SK_DEBUG
+            // FIXME: Some SKPs SkASSERT in debug mode.  Skip them for now until we can fix things.

[bsalomon, 2014/08/01 13:23:24]

Should prolly file a bug and stick a link to it here.

[mtklein, 2014/08/01 13:55:34]

Done.

+            if (0 == strcmp("565", config)
+                    && (  SkStrStartsWith(bench->getName(), "desk_carsvg.skp")
+                       || SkStrStartsWith(bench->getName(), "desk_forecastio.skp")
+                       || SkStrStartsWith(bench->getName(), "tabl_cnet.skp")
+                       || SkStrStartsWith(bench->getName(), "tabl_googlecalendar.skp"))) {
+                SkDebugf("Skipping 565 %s.  It'd assert.\n", bench->getName());
+                continue;
+            }
+#endif
+
             const int loops =
 #if SK_SUPPORT_GPU
                 Benchmark::kGPU_Backend == targets[j]->config.backend
                 ? gpu_bench(targets[j]->gl, bench.get(), canvas, samples.get())
                 :
 #endif
                  cpu_bench(       overhead, bench.get(), canvas, samples.get());
 
             if (loops == 0) {
                 SkDebugf("Unable to time %s\t%s (overhead %s)\n",
                          bench->getName(), config, HUMANIZE(overhead));
                 continue;
             }
 
             Stats stats(samples.get(), FLAGS_samples);
             log.config(config);
-            log.configOption("source_type", sourceType);
+            benchStream.fillCurrentOptions(&log);
 #if SK_SUPPORT_GPU
             if (Benchmark::kGPU_Backend == targets[j]->config.backend) {
                 fill_gpu_options(&log, targets[j]->gl);
             }
 #endif
             log.timer("min_ms",    stats.min);
             log.timer("median_ms", stats.median);
             log.timer("mean_ms",   stats.mean);
             log.timer("max_ms",    stats.max);
             log.timer("stddev_ms", sqrt(stats.var));
@@ skipping 42 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif