Add raster timing to ImageDecodeBench

third_party/WebKit/Source/platform/testing/ImageDecodeBench.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Provides a minimal wrapping of the Blink image decoders. Used to perform
-// a non-threaded, memory-to-memory image decode using micro second accuracy
-// clocks to measure image decode time. Optionally applies color correction
-// during image decoding on supported platforms (default off). Usage:
+// Provides a minimal wrapping of the Blink image decoders & Skia raster.
+// Used to perform a non-threaded, memory-to-memory image decode/raster using
+// micro second accuracy clocks to measure image decode time. Optionally
+// applies color correction during image decoding on supported platforms
+// (default off). Usage:
 //
 //   % ninja -C out/Release image_decode_bench &&
-//      ./out/Release/image_decode_bench file [iterations]
+//      ./out/Release/image_decode_bench file [--raster] [iterations]
 //
 // The output is formatted for use in a csv file (comma-separated variable).
 // Each row represents successive frames in an animated image.
 // Each column represents a successive iteration of decoding the whole animated
 // image.
 // This means non-animated images will show up as one column.
+// Raster timing also shows up as one column.
 //
 // TODO(noel): Consider adding md5 checksum support to WTF. Use it to compute
 // the decoded image frame md5 and output that value.
 //
 // TODO(noel): Consider integrating this tool in Chrome telemetry for realz,
 // using the image corpii used to assess Blink image decode performance. Refer
 // to http://crbug.com/398235#c103 and http://crbug.com/258324#c5
 
 #include <memory>
 #include <vector>
 #include "base/command_line.h"
 #include "platform/SharedBuffer.h"
 #include "platform/image-decoders/ImageDecoder.h"
 #include "platform/wtf/PassRefPtr.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/Platform.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/test/icc_profiles.h"
 
 #if defined(_WIN32)
 #include <mmsystem.h>
 #include <sys/stat.h>
 #include <time.h>
 #define stat(x, y) _stat(x, y)
 typedef struct _stat sttype;
 #else
 #include <sys/stat.h>
@@ skipping 259 matching lines @@
 
     if (all_data_received || decoder->Failed()) {
       fprintf(stderr, "Image decode failed\n");
       exit(3);
     }
   }
 
   Print2DResults(timings);
 }
 
+void TimeRaster(ImageDecoder* decoder,
+                PassRefPtr<SharedBuffer> data,
+                size_t iterations) {
+  const bool all_data_received = true;
+  decoder->SetData(data.Get(), all_data_received);
+
+  if (!decoder->IsSizeAvailable()) {
+    fprintf(stderr, "failed to decode size\n");
+    exit(3);

[scroggo_chromium, 2017/05/23 15:57:09]

Right now it looks like we pass the following values to exit:
1: error in the arguments
2: error reading the file
3: error decoding

Should we use different numbers for failures to decode the size, versus
incomplete image, etc?

[cblume, 2017/05/23 18:07:31]

ImageDecodeBench currently (prior to this patch) reuses exit values for
categories.

For example, both failing to open the file [1] and failing to read the file [2]
will exit(2). Both are in the category of file errors.

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/platform/testi...
[2]
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/platform/testi...

Like wise for various command line parsing errors, which exit(1).

I'm okay with different error codes if we want. But maybe we want to do it in a
separate patch since this mirrors existing behavior.

+  }
+  const auto size = decoder->Size();
+
+  ImageFrame* frame = decoder->FrameBufferAtIndex(0);
+  if (frame->GetStatus() != ImageFrame::kFrameComplete) {
+    fprintf(stderr, "failed to decode first frame\n");
+    exit(3);
+  }
+
+  auto surface = SkSurface::MakeRasterN32Premul(size.Width(), size.Height());
+  auto canvas = surface->getCanvas();
+
+  std::vector<double> timings(iterations);
+  for (size_t i = 0; i < iterations; ++i) {
+    double start_time = GetCurrentTime();
+    canvas->drawBitmap(frame->Bitmap(), 0, 0, nullptr);
+    double elapsed_time = GetCurrentTime() - start_time;
+    timings[i] = elapsed_time;
+  }
+
+  for (double iteration_time : timings) {
+    printf("%f,\n", iteration_time);
+  }
+  printf("\n");
+}
+
 }  // namespace
 
 int Main(int argc, char* argv[]) {
   base::CommandLine::Init(argc, argv);
 
   // If the platform supports color correction, allow it to be controlled.
 
   bool apply_color_correction = false;
   if (argc >= 2 && strcmp(argv[1], "--color-correct") == 0) {
     --argc;
     ++argv;
     apply_color_correction = true;
     gfx::ICCProfile profile = gfx::ICCProfileForTestingColorSpin();
     ColorBehavior::SetGlobalTargetColorProfile(profile);
   }
 
+  bool time_raster = false;
+  if (argc >= 2 && strcmp(argv[1], "--raster") == 0) {
+    --argc;
+    ++argv;
+    time_raster = true;
+  }
+
   if (argc < 2) {
     fprintf(stderr,
-            "Usage: %s [--color-correct] file [iterations] [packetSize]\n",
+            "Usage: %s [--color-correct] [--raster] file [iterations] "
+            "[packetSize]\n",
             argv[0]);
     exit(1);
   }
 
   // Control decode bench iterations and packet size.
 
   size_t iterations = 1;
   if (argc >= 3) {
     char* end = 0;
     iterations = strtol(argv[2], &end, 10);
     if (*end != '\0' || !iterations) {
       fprintf(stderr,
               "Second argument should be number of iterations. "
               "The default is 1. You supplied %s\n",
               argv[2]);
       exit(1);
     }
   }
 
   size_t packet_size = 0;
   if (argc >= 4) {
     char* end = 0;
     packet_size = strtol(argv[3], &end, 10);

[scroggo_chromium, 2017/05/23 15:57:09]

What should happen if a user combines packet_size with raster? An error?

[cblume, 2017/05/23 18:07:31]

Packet size should be silently ignored in that case.
When reading the args, --color-correct and --raster alter argc and argv so other
parsing still works.

We'll end up parsing packet_size, but we decode the full image (non-packeted)
once and use it to time raster.

Conceptually, packet size shouldn't matter when timing raster. So silently
ignoring it seemed the most correct.

[scroggo_chromium, 2017/05/23 18:41:18]

My vote is for an error. Since it shouldn't matter, the user may be doing
something wrong if they tried to use both.

[cblume, 2017/05/23 19:18:39]

Yeah, I think you're right.
I added an error for it.

     if (*end != '\0') {
       fprintf(stderr,
               "Third argument should be packet size. Default is "
               "0, meaning to decode the entire image in one packet. You "
               "supplied %s\n",
               argv[3]);
       exit(1);
     }
   }
 
@@ skipping 14 matching lines @@
   }
 
   data->Data();
 
   // Image decode bench for iterations.
 
   std::unique_ptr<ImageDecoder> decoder = ImageDecoder::Create(
       data, true, ImageDecoder::kAlphaPremultiplied,
       apply_color_correction ? ColorBehavior::TransformToTargetForTesting()
                              : ColorBehavior::Ignore());
-  if (packet_size) {
-    TimePacketedDecode(decoder.get(), data.Get(), packet_size, iterations);
+  if (time_raster) {
+    TimeRaster(decoder.get(), data.Get(), iterations);
   } else {
-    TimeDecode(decoder.get(), data.Get(), iterations);
+    if (packet_size) {
+      TimePacketedDecode(decoder.get(), data.Get(), packet_size,
+                         iterations);
+    } else {
+      TimeDecode(decoder.get(), data.Get(), iterations);
+    }
   }
 
   return 0;
 }
 
 }  // namespace blink
 
 int main(int argc, char* argv[]) {
   return blink::Main(argc, argv);
 }