| Index: infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| index ee4385f0aec814d5840ea83e99093f855f1c2e61..e07b9db17ee9fa974f545072f328c6fc2c9edea0 100644
|
| --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| @@ -3,51 +3,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
|
| - "/path/to/tmp/json",
|
| - "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
|
| - ],
|
| - "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\": \"GCC\", @@@",
|
| - "@@@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\": \"GTX550Ti\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Valgrind\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleA\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
|
| - "@@@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\": \"skia_arch_type=x86_64 skia_dump_stats=1 skia_release_optimization_level=1 skia_warnings_as_errors=0\"@@@",
|
| - "@@@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\": false, @@@",
|
| - "@@@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/"
|
| @@ -146,7 +101,54 @@
|
| "--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",
|
| + "--loops",
|
| + "1",
|
| + "--samples",
|
| + "1",
|
| + "--keepAlive",
|
| + "true",
|
| + "--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-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123.json",
|
| "--properties",
|
| @@ -196,7 +198,54 @@
|
| "--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",
|
| + "--loops",
|
| + "1",
|
| + "--samples",
|
| + "1",
|
| + "--keepAlive",
|
| + "true",
|
| + "--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-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123.json",
|
| "--properties",
|
|
|