diff options
author | 2016-08-04 11:07:10 -0700 | |
---|---|---|
committer | 2016-08-04 11:07:10 -0700 | |
commit | 538d5b68e8b6a8745ac8947f15abf1c7c6de8f18 (patch) | |
tree | 7fe5f965dde6785a2c3b89a4415f36b78adce561 /infra/bots/recipes/swarm_perf.expected | |
parent | 4e44efe50474d4eebcb30b762e784b3ef2126750 (diff) |
Move builder_spec, [dm|nanobench]_flags, builder_name_schema to recipes
- builder_name_schema becomes its own recipe module.
- builder_spec, dm, and nanobench flags move into vars module.
- recipe expectation diffs include:
- no more buildbot_spec.py step
- "real" dm and nanobench flags, instead of --dummy-flags
- some inconsequential stuff in visualbench, which is removed anyway.
BUG=skia:5578
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2215803002
Review-Url: https://codereview.chromium.org/2215803002
Diffstat (limited to 'infra/bots/recipes/swarm_perf.expected')
7 files changed, 345 insertions, 321 deletions
diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json index e88e5498f8..ebcafc34eb 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release" - ], - "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\": \"Arm7\", @@@", - "@@@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\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@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=arm skia_dump_stats=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@ \"product.board\": \"grouper\", @@@", - "@@@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": [ "which", "adb" ], @@ -398,7 +352,50 @@ "--images", "/storage/emulated/legacy/skiabot/skia_images/nanobench", "--nocpu", - "--dummy-flags", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--useThermalManager", + "1,1,10,1000", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "f16", + "srgb", + "msaa4", + "nvpr4", + "nvprdit4", + "--match", + "~blurroundrect", + "~patch_grid", + "~desk_carsvg", + "~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", "/storage/emulated/legacy/skiabot/skia_perf/nanobench_abc123.json", "--properties", 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 ee4385f0ae..e07b9db17e 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", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json index e737719ab5..31712422fa 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.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-VisualBench" - ], - "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@ \"visualbench\"@@@", - "@@@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\": \"VisualBench\", @@@", - "@@@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_use_sdl=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\": 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/" @@ -140,7 +95,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-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data/nanobench_abc123.json", "--properties", @@ -167,7 +163,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_use_sdl=1 skia_warnings_as_errors=0", + "GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0", "SKIA_OUT": "[SLAVE_BUILD]/out" }, "name": "visualbench" diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index 0ef017ec6f..b9afc16b65 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug" - ], - "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\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug_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/4.8.5/ skia_arch_type=x86_64 skia_gpu=0 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\": false@@@", - "@@@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/" @@ -94,7 +50,45 @@ "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nogpu", - "--dummy-flags" + "--pre_log", + "--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" ], "env": { "BUILDTYPE": "Debug_x64", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index e530601a86..1d8378b2d4 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release" - ], - "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\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@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/4.8.5/ skia_arch_type=x86_64 skia_gpu=0 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,45 @@ "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nogpu", - "--dummy-flags", + "--pre_log", + "--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-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data\\nanobench_abc123.json", "--properties", 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 81a2a618c3..e565defb0e 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", diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json index 70d5b823df..d98e6680d2 100644 --- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_perf.expected/big_issue_number.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", |