Index: infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json |
diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json |
index 81a2a618c3b7de0671583fd6af7de10c7140207c..e565defb0ef088231cf2f170d598d2b982b266de 100644 |
--- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json |
+++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json |
@@ -3,50 +3,6 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py", |
- "/path/to/tmp/json", |
- "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot" |
- ], |
- "cwd": "[SLAVE_BUILD]\\skia", |
- "name": "exec buildbot_spec.py", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"HD4600\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleB\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win8\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": true@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", |
"/path/to/tmp/" |
@@ -138,7 +94,48 @@ |
"--images", |
"[SLAVE_BUILD]\\skimage\\nanobench", |
"--nocpu", |
- "--dummy-flags", |
+ "--pre_log", |
+ "--images", |
+ "--gpuStatsDump", |
+ "true", |
+ "--scales", |
+ "1.0", |
+ "1.1", |
+ "--config", |
+ "565", |
+ "8888", |
+ "gpu", |
+ "nonrendering", |
+ "angle", |
+ "hwui", |
+ "f16", |
+ "srgb", |
+ "msaa16", |
+ "nvpr16", |
+ "nvprdit16", |
+ "--match", |
+ "~interlaced1.png", |
+ "~interlaced2.png", |
+ "~interlaced3.png", |
+ "~inc0.gif", |
+ "~inc1.gif", |
+ "~incInterlaced.gif", |
+ "~inc0.jpg", |
+ "~incGray.jpg", |
+ "~inc0.wbmp", |
+ "~inc1.wbmp", |
+ "~inc0.webp", |
+ "~inc1.webp", |
+ "~inc0.ico", |
+ "~inc1.ico", |
+ "~inc0.png", |
+ "~inc1.png", |
+ "~inc2.png", |
+ "~inc12.png", |
+ "~inc13.png", |
+ "~inc14.png", |
+ "~inc0.webp", |
+ "~inc1.webp", |
"--outResultsFile", |
"[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data\\nanobench_abc123.json", |
"--properties", |