| 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-VisualBench.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| similarity index 75%
|
| copy from infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json
|
| copy to infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| index e737719ab5a4ac69ba280c20aeec7ed6ab2dc52e..ee4385f0aec814d5840ea83e99093f855f1c2e61 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-Valgrind.json
|
| @@ -5,14 +5,14 @@
|
| "-u",
|
| "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
|
| "/path/to/tmp/json",
|
| - "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench"
|
| + "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@ \"visualbench\"@@@",
|
| + "@@@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\", @@@",
|
| @@ -20,7 +20,7 @@
|
| "@@@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@ \"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\", @@@",
|
| @@ -33,12 +33,12 @@
|
| "@@@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@ \"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\": true, @@@",
|
| + "@@@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@@@"
|
| @@ -89,7 +89,7 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data"
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data"
|
| ],
|
| "env": {
|
| "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
|
| @@ -111,7 +111,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data",
|
| "511"
|
| ],
|
| "name": "makedirs data",
|
| @@ -130,8 +130,14 @@
|
| },
|
| {
|
| "cmd": [
|
| - "catchsegv",
|
| - "[SLAVE_BUILD]/out/Release/visualbench",
|
| + "valgrind",
|
| + "--gen-suppressions=all",
|
| + "--leak-check=full",
|
| + "--track-origins=yes",
|
| + "--error-exitcode=1",
|
| + "--num-callers=40",
|
| + "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp",
|
| + "[SLAVE_BUILD]/out/Release/nanobench",
|
| "--undefok",
|
| "-i",
|
| "[SLAVE_BUILD]/skia/resources",
|
| @@ -142,7 +148,7 @@
|
| "--nocpu",
|
| "--dummy-flags",
|
| "--outResultsFile",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data/nanobench_abc123.json",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123.json",
|
| "--properties",
|
| "gitHash",
|
| "abc123",
|
| @@ -158,7 +164,7 @@
|
| "cpu_or_gpu_value",
|
| "GTX550Ti",
|
| "extra_config",
|
| - "VisualBench",
|
| + "Valgrind",
|
| "model",
|
| "ShuttleA",
|
| "os",
|
| @@ -167,17 +173,69 @@
|
| "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_release_optimization_level=1 skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| - "name": "visualbench"
|
| + "name": "nanobench"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "valgrind",
|
| + "--gen-suppressions=all",
|
| + "--leak-check=full",
|
| + "--track-origins=yes",
|
| + "--error-exitcode=1",
|
| + "--num-callers=40",
|
| + "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp",
|
| + "[SLAVE_BUILD]/out/Release/nanobench",
|
| + "--undefok",
|
| + "-i",
|
| + "[SLAVE_BUILD]/skia/resources",
|
| + "--skps",
|
| + "[SLAVE_BUILD]/skp",
|
| + "--images",
|
| + "[SLAVE_BUILD]/skimage/nanobench",
|
| + "--nocpu",
|
| + "--dummy-flags",
|
| + "--outResultsFile",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123.json",
|
| + "--properties",
|
| + "gitHash",
|
| + "abc123",
|
| + "build_number",
|
| + "5",
|
| + "--key",
|
| + "arch",
|
| + "x86_64",
|
| + "compiler",
|
| + "GCC",
|
| + "cpu_or_gpu",
|
| + "GPU",
|
| + "cpu_or_gpu_value",
|
| + "GTX550Ti",
|
| + "extra_config",
|
| + "Valgrind",
|
| + "model",
|
| + "ShuttleA",
|
| + "os",
|
| + "Ubuntu",
|
| + "--abandonGpuContext",
|
| + "--nocpu"
|
| + ],
|
| + "env": {
|
| + "BUILDTYPE": "Release",
|
| + "CHROME_HEADLESS": "1",
|
| + "GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_release_optimization_level=1 skia_warnings_as_errors=0",
|
| + "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| + },
|
| + "name": "nanobench --abandonGpuContext"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data",
|
| "511"
|
| ],
|
| "name": "makedirs perf_dir",
|
|
|