Specify bench_type & source_type for image benches

bench/nanobench.cpp

Index: bench/nanobench.cpp
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index a7a47c52769ce11d8cd0de989f09b3fdae5f0d59..8945445b0d3c1ee404af5388c271f923d9fa1095 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -790,8 +790,9 @@ public:
             }
         }
 
-
         for (; fCurrentCodec < fImages.count(); fCurrentCodec++) {
+            fSourceType = "image";

[msarett, 2015/10/05 15:45:20]

nit:

Can we use skcodec vs skimagedecoder or codec vs imagedecoder?

[scroggo, 2015/10/05 16:05:18]

Ah, you mean instead of "codec" vs "skimagedecoder" (which is on the next line)?
sgtm

[msarett, 2015/10/05 16:07:21]

Yes!

+            fBenchType = "codec";
             const SkString& path = fImages[fCurrentCodec];
             SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(path.c_str()));
             SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
@@ -845,6 +846,8 @@ public:
 
         // Run the DecodingBenches
         while (fCurrentImage < fImages.count()) {
+            fSourceType = "image";
+            fBenchType = "skimagedecoder";
             while (fCurrentColorType < fColorTypes.count()) {
                 const SkString& path = fImages[fCurrentImage];
                 SkColorType colorType = fColorTypes[fCurrentColorType];
@@ -866,6 +869,8 @@ public:
         bool useCodecOpts[] = { true, false };
         while (fUseCodec < 2) {
             bool useCodec = useCodecOpts[fUseCodec];
+            fSourceType = "image";
+            fBenchType = useCodec ? "codec" : "skimagedecoder";

[mtklein, 2015/10/05 15:40:01]

I take it the subset-ness of these benches is distinguishable some other way,
like name?

[scroggo, 2015/10/05 15:43:19]

Yes. Come to think of it, we also distinguish codec vs imagedecoder by name. I
know that with DM we deliberately use the same name for both, so that Gold lets
us compare the two easily. Should we be doing the same thing here?

[msarett, 2015/10/05 15:45:20]

Good question

             while (fCurrentSubsetImage < fImages.count()) {
                 while (fCurrentColorType < fColorTypes.count()) {
                     const SkString& path = fImages[fCurrentSubsetImage];
@@ -914,9 +919,12 @@ public:
 
         // Run the BRDBenches
         // We will benchmark multiple BRD strategies.
-        const SkBitmapRegionDecoderInterface::Strategy strategies[] = {
-                SkBitmapRegionDecoderInterface::kOriginal_Strategy,
-                SkBitmapRegionDecoderInterface::kCanvas_Strategy,
+        static const struct {
+            SkBitmapRegionDecoderInterface::Strategy    fStrategy;
+            const char*                                 fName;
+        } strategies[] = {
+            { SkBitmapRegionDecoderInterface::kOriginal_Strategy,   "BRD" },
+            { SkBitmapRegionDecoderInterface::kCanvas_Strategy,     "BRD_canvas" },
         };
 
         // We intend to create benchmarks that model the use cases in
@@ -937,12 +945,14 @@ public:
         const uint32_t minOutputSize = 512;
         while (fCurrentBRDImage < fImages.count()) {
             while (fCurrentBRDStrategy < (int) SK_ARRAY_COUNT(strategies)) {
+                fSourceType = "image";
+                fBenchType = strategies[fCurrentBRDStrategy].fName;
                 while (fCurrentColorType < fColorTypes.count()) {
                     while (fCurrentBRDSampleSize < (int) SK_ARRAY_COUNT(sampleSizes)) {
                         while (fCurrentSubsetType <= kLastSingle_SubsetType) {
                             const SkString& path = fImages[fCurrentBRDImage];
                             const SkBitmapRegionDecoderInterface::Strategy strategy =
-                                    strategies[fCurrentBRDStrategy];
+                                    strategies[fCurrentBRDStrategy].fStrategy;
                             SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(path.c_str()));
                             const SkColorType colorType = fColorTypes[fCurrentColorType];
                             uint32_t sampleSize = sampleSizes[fCurrentBRDSampleSize];