| 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 b01ae39514fde185970e3fd800019a2c344dedcf..617072afd2a053e198b58be57aba59478e327ce1 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
|
| @@ -61,50 +61,6 @@
|
| },
|
| {
|
| "cmd": [
|
| - "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-Valgrind/data"
|
| - ],
|
| - "env": {
|
| - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
|
| - },
|
| - "name": "rmtree data",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "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-Valgrind/data",
|
| - "511"
|
| - ],
|
| - "name": "makedirs data",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| "valgrind",
|
| "--gen-suppressions=all",
|
| "--leak-check=full",
|
| @@ -169,29 +125,7 @@
|
| "~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_1337018001.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"
|
| + "~inc1.webp"
|
| ],
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| @@ -267,28 +201,6 @@
|
| "~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_1337018001.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"
|
| ],
|
| @@ -300,28 +212,6 @@
|
| "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-Valgrind/data",
|
| - "511"
|
| - ],
|
| - "name": "makedirs perf_dir",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| "name": "$result",
|
| "recipe_result": null,
|
| "status_code": 0
|
|
|