Add support for reading a directory of images with --expectations (-r).
DM writes out its images in a hierarchy that's a little different than GM,
so this can't read GM's output. But it can read its own, written with -w.
Example usage:
$ out/Release/dm -w /tmp/baseline
$ out/Release/dm -r /tmp/baseline -w /tmp/new
(and optionally)
$ mkdir /tmp/diff; out/Release/skdiff /tmp/baseline /tmp/new /tmp/diff
GM's IndividualImageExpectationsSource and Expectations are a little too eager
about decoding and hashing the expected images, so I took the opportunity to
add DM::Expectations that mostly replaces skiagm::ExpectationsSource and
skiagm::Expectations in DM. It mainly exists to move the image decoding and
comparison off the main thread, which would otherwise be a major speed
bottleneck.
I tried to use skiagm code where possible. One notable place where I differed
is in this new feature. When -r is a directory of images, DM does no hashing.
It considerably faster to read the expected file into an SkBitmap and do a
byte-for-byte comparison than to hash the two bitmaps and check those.
The example usage above isn't quite working 100% yet. Expectations on some GMs
fail, even with no binary change. I haven't pinned down whether this is due to
- a bug in DM
- flaky GMs
- unthreadsafe GMs
- flaky image decoding
- unthreadsafe image decoding
- something else
but I intend to. Leon, Derek and I have suspected PNG decoding isn't
threadsafe, but are as yet unable to prove it.
I also seem to be able to cause malloc to fail on my laptop if I run too many
configs at once, though I never seem to be using more than ~1G of RAM. Will
track that down too.
BUG=
R=reed@google.com, bsalomon@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/108963002
git-svn-id: http://skia.googlecode.com/svn/trunk@12596 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/dm/DMCpuTask.h b/dm/DMCpuTask.h
index 998ed7b..c1ee715 100644
--- a/dm/DMCpuTask.h
+++ b/dm/DMCpuTask.h
@@ -1,6 +1,7 @@
#ifndef DMCpuTask_DEFINED
#define DMCpuTask_DEFINED
+#include "DMExpectations.h"
#include "DMReporter.h"
#include "DMTask.h"
#include "DMTaskRunner.h"
@@ -8,12 +9,9 @@
#include "SkString.h"
#include "SkTemplates.h"
#include "gm.h"
-#include "gm_expectations.h"
// This is the main entry point for drawing GMs with the CPU. Commandline
// flags control whether this kicks off various comparison tasks when done.
-// Currently:
-// --replay: spawn a DMReplayTask to record into a picture, draw the picture, and compare.
namespace DM {
@@ -22,7 +20,7 @@
CpuTask(const char* name,
Reporter*,
TaskRunner*,
- const skiagm::ExpectationsSource&,
+ const Expectations&,
skiagm::GMRegistry::Factory,
SkBitmap::Config);
@@ -35,7 +33,7 @@
skiagm::GMRegistry::Factory fGMFactory;
SkAutoTDelete<skiagm::GM> fGM;
const SkString fName;
- const skiagm::Expectations fExpectations;
+ const Expectations& fExpectations;
const SkBitmap::Config fConfig;
};