aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-09-09 07:59:46 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-09-09 07:59:46 -0700
commitea65bfa8ded918b908287e3e3474aaf5cbd12fea (patch)
tree466469207e976828154517fe8201f8032d9e0433 /bench
parent197ceda92966359962c51923a01dd2b0018b080f (diff)
Update DM JSON format.
Ex. dm --match patch -w bad --key arch x86 gpu nvidia model z620 --properties git_hash abcd build_number 20 -> { "build_number" : "20", "git_hash" : "abcd", "key" : { "arch" : "x86", "gpu" : "nvidia", "model" : "z620" }, "results" : [ { "key" : { "config" : "565", "name" : "ninepatch-stretch" }, "md5" : "f78cfafcbabaf815f3dfcf61fb59acc7", "options" : { "source_type" : "GM" } }, { "key" : { "config" : "8888", "name" : "ninepatch-stretch" }, "md5" : "3e8a42f35a1e76f00caa191e6310d789", "options" : { "source_type" : "GM" } }, ... This breaks -r, but that's okay. Going to follow up this CL with one that removes that entirely. BUG=skia: R=stephana@google.com, jcgregorio@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/551873003
Diffstat (limited to 'bench')
-rw-r--r--bench/nanobench.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 452da1f083..a8274d800a 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -66,11 +66,6 @@ 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(properties, "",
- "Space-separated key/value pairs to add to JSON identifying this nanobench run.");
-DEFINE_string(key, "",
- "Space-separated key/value pairs to add to JSON identifying this bench config.");
-
DEFINE_string(clip, "0,0,1000,1000", "Clip for SKPs.");
DEFINE_string(scales, "1.0", "Space-separated scales for SKPs.");
DEFINE_bool(bbh, true, "Build a BBH for SKPs?");
@@ -492,7 +487,7 @@ public:
SkTileGridFactory factory(info);
SkPictureRecorder recorder;
pic->playback(recorder.beginRecording(pic->cullRect().width(),
- pic->cullRect().height(),
+ pic->cullRect().height(),
&factory));
pic.reset(recorder.endRecording());
}