Adding new benchmark to test image decoding performance.

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 "ProcStats.h"
 #include "ResultsWriter.h"
 #include "RecordingBench.h"
+#include "Resources.h"
 #include "SKPBench.h"
+#include "SKDBench.h"
 #include "Stats.h"
 #include "Timer.h"
 
 #include "SkBBoxHierarchy.h"
 #include "SkCanvas.h"
 #include "SkCommonFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
@@ skipping 405 matching lines @@
 }
 #endif
 
 class BenchmarkStream {
 public:
     BenchmarkStream() : fBenches(BenchRegistry::Head())
                       , fGMs(skiagm::GMRegistry::Head())
                       , fCurrentRecording(0)
                       , fCurrentScale(0)
                       , fCurrentSKP(0)
-                      , fCurrentUseMPD(0) {
+                      , fCurrentUseMPD(0)
+                      , fCurrentColorType(0) {
         for (int i = 0; i < FLAGS_skps.count(); i++) {
             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());
                 }
             }
         }
 
         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);
         }
 
         for (int i = 0; i < FLAGS_scales.count(); i++) {
             if (1 != sscanf(FLAGS_scales[i], "%f", &fScales.push_back())) {
                 SkDebugf("Can't parse %s from --scales as an SkScalar.\n", FLAGS_scales[i]);
                 exit(1);
             }
         }
 
         fUseMPDs.push_back() = false;
         if (FLAGS_mpd) {
             fUseMPDs.push_back() = true;
         }
+        
+        // Get the resource path for SKD benchmarks
+        fResourceDir = GetResourcePath();

[scroggo, 2015/02/11 19:38:10]

Sorry, I think I mislead you in conversation; I think it would be better to have
a separate flag for images, just like we do with skps.

Using the resource path means you'll attempt to decode anything that ends up in
that folder (which is sort of a catch all). If we use a separate flag, we can
choose any folder, and still use the resources for general purposes.

[msarett, 2015/02/11 21:57:01]

Done.

+        if (fResourceDir.isEmpty()) {
+            SkDebugf("SKDBench Failed: fResourceDir is not specified");
+        }
+
+        // Get an iterator for resource files
+        fFileIter = *(new SkOSFile::Iter(fResourceDir.c_str()));

[mtklein, 2015/02/11 19:15:36]

This pattern seems odd.  It's allocating on the heap, copying to the member, and
then leaking the one on the heap?

Let's instead try adding
   , fFileIter(GetResourcePath().c_str())
to the initializer list?

[msarett, 2015/02/11 21:57:01]

Done.

+        
+        // Choose the candidate color types
+        SkColorType colorTypes[3] = { kN32_SkColorType,
+                                      kRGB_565_SkColorType,
+                                      kAlpha_8_SkColorType };
+        fColorTypes = *(new SkTArray<SkColorType>(colorTypes, 3));

[mtklein, 2015/02/11 19:15:36]

If this sticks, I think you might want to write this as:

SkColorType colorTypes[] = 
    { kN32_SkColorType, kRGB_565_SkColorType, kAlpha_8_SkColorType };
fColorTypes.push_back_n(SK_ARRAY_COUNT(colorTypes), colorTypes);

Otherwise, again we're both hitting the heap pointlessly, and leaking the
allocation we make there.

[msarett, 2015/02/11 21:57:01]

Done.

     }
 
     static bool 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));
@@ skipping 73 matching lines @@
                             (name.c_str(), pic.get(), fClip,
                              fScales[fCurrentScale], fUseMPDs[fCurrentUseMPD++]));
                 }
                 fCurrentUseMPD = 0;
                 fCurrentSKP++;
             }
             fCurrentSKP = 0;
             fCurrentScale++;
         }
 
+        // Run the SKDBenches
+        SkString file;
+        while (fFileIter.next(&file)) {
+            // Run a separate benchmark for each image and color type
+            SkString path = SkOSPath::Join(fResourceDir.c_str(), file.c_str());
+            return SkNEW_ARGS(SKDBench, ("SKD", path,

[scroggo, 2015/02/11 19:38:10]

As with SKPs and images in DM, I think we should check to make sure the image
decodes before creating a benchmark.

[msarett, 2015/02/11 21:57:01]

Done.

+                                         fColorTypes[fCurrentColorType]));
+        }
+        // Reset the iterator for the next color type
+        if (++fCurrentColorType < fColorTypes.count()) {
+            fFileIter.reset(fResourceDir.c_str());
+            while (fFileIter.next(&file)) {
+                SkString path = SkOSPath::Join(fResourceDir.c_str(),
+                                               file.c_str());
+                return SkNEW_ARGS(SKDBench, ("SKD", path,
+                                             fColorTypes[fCurrentColorType]));
+            }
+        }
+
         return NULL;
     }
 
     void fillCurrentOptions(ResultsWriter* log) const {
         log->configOption("source_type", fSourceType);
         log->configOption("bench_type",  fBenchType);
         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());
             if (fCurrentUseMPD > 0) {
                 SkASSERT(1 == fCurrentUseMPD || 2 == fCurrentUseMPD);
                 log->configOption("multi_picture_draw", fUseMPDs[fCurrentUseMPD-1] ? "true" : "false");
             }
         }
         if (0 == strcmp(fBenchType, "recording")) {
             log->metric("bytes", fSKPBytes);
             log->metric("ops",   fSKPOps);
         }
     }
 
 private:
     const BenchRegistry* fBenches;
     const skiagm::GMRegistry* fGMs;
     SkIRect            fClip;
     SkTArray<SkScalar> fScales;
     SkTArray<SkString> fSKPs;
     SkTArray<bool>     fUseMPDs;
+    SkString           fResourceDir;
+    SkOSFile::Iter     fFileIter;
 
     double fSKPBytes, fSKPOps;
 
     const char* fSourceType;  // What we're benching: bench, GM, SKP, ...
     const char* fBenchType;   // How we bench it: micro, recording, playback, ...
     int fCurrentRecording;
     int fCurrentScale;
     int fCurrentSKP;
     int fCurrentUseMPD;
+    SkTArray<SkColorType> fColorTypes;
+    int fCurrentColorType;
 };
 
 int nanobench_main();
 int nanobench_main() {
     SetupCrashHandler();
     SkAutoGraphics ag;
     SkTaskGroup::Enabler enabled;
 
 #if SK_SUPPORT_GPU
     GrContext::Options grContextOpts;
@@ skipping 180 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif