diff options
| author |  Eric Boren <borenet@google.com> | 2017-01-12 08:46:20 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-12 14:29:12 +0000 |
| commit | 5de544b3ca278b61e9825cee7eb24fa26c8b1215 (patch) | |
| tree | 316964456d7ba52b7f27de32a0441e68f1624eaf /infra/bots/recipes/swarm_perf.expected | |
| parent | 2b861d3a391f2a9c93f97163d783c78935b7e72d (diff) | |
Move recipe expectations into example.py recipes inside of modules
Each top-level recipe still needs one test and expectation file.
BUG=skia:6070
Change-Id: I3b14e8a11a86af68f5558177536f0018b644be4d
Reviewed-on: https://skia-review.googlesource.com/6943
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/swarm_perf.expected')
20 files changed, 4 insertions, 5680 deletions
diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json deleted file mode 100644 index 4c222d112c..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json +++ /dev/null @@ -1,455 +0,0 @@ -[ - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skia/resources", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skp", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SKP_VERSION", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skimage", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SK_IMAGE_VERSION", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/svg", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SVG_VERSION", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/out/Debug/nanobench", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config vk --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; echo $? >/data/local/tmp/rc", - "[START_DIR]/tmp/nanobench.sh" - ], - "name": "write nanobench.sh" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/nanobench.sh", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench.sh" - }, - { - "cmd": [ - "adb", - "logcat", - "-c" - ], - "cwd": "[START_DIR]/skia", - "name": "clear log" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n", - "/data/local/tmp/", - "nanobench.sh" - ], - "name": "nanobench", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',@@@", - "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", - "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" - ], - "name": "dump log", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb', 'logcat', '-d'])@@@", - "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", - "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", - "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", - "@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@", - "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", - "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", - "@@@STEP_LOG_LINE@python.inline@ print line@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "kill-server" - ], - "cwd": "[START_DIR]/skia", - "name": "kill adb server" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json deleted file mode 100644 index 199abf21f0..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json +++ /dev/null @@ -1,455 +0,0 @@ -[ - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skia/resources", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skp", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SKP_VERSION", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skimage", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SK_IMAGE_VERSION", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/svg", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SVG_VERSION", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/out/Debug/nanobench", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~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; echo $? >/data/local/tmp/rc", - "[START_DIR]/tmp/nanobench.sh" - ], - "name": "write nanobench.sh" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/nanobench.sh", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench.sh" - }, - { - "cmd": [ - "adb", - "logcat", - "-c" - ], - "cwd": "[START_DIR]/skia", - "name": "clear log" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n", - "/data/local/tmp/", - "nanobench.sh" - ], - "name": "nanobench", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',@@@", - "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", - "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" - ], - "name": "dump log", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb', 'logcat', '-d'])@@@", - "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", - "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", - "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", - "@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@", - "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", - "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", - "@@@STEP_LOG_LINE@python.inline@ print line@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "kill-server" - ], - "cwd": "[START_DIR]/skia", - "name": "kill adb server" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json deleted file mode 100644 index f6101b463a..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json +++ /dev/null @@ -1,509 +0,0 @@ -[ - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skia/resources", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skp", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SKP_VERSION", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skimage", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SK_IMAGE_VERSION", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/svg", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SVG_VERSION", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/perf" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/out/Release/nanobench", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 esinst --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 /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android; echo $? >/data/local/tmp/rc", - "[START_DIR]/tmp/nanobench.sh" - ], - "name": "write nanobench.sh" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/nanobench.sh", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench.sh" - }, - { - "cmd": [ - "adb", - "logcat", - "-c" - ], - "cwd": "[START_DIR]/skia", - "name": "clear log" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n", - "/data/local/tmp/", - "nanobench.sh" - ], - "name": "nanobench", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',@@@", - "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", - "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(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-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android/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@@@" - ] - }, - { - "cmd": [ - "adb", - "pull", - "/sdcard/revenge_of_the_skiabot/perf", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android/data" - ], - "cwd": "[START_DIR]/skia", - "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android/data" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" - ], - "name": "dump log", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb', 'logcat', '-d'])@@@", - "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", - "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", - "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", - "@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@", - "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", - "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", - "@@@STEP_LOG_LINE@python.inline@ print line@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "kill-server" - ], - "cwd": "[START_DIR]/skia", - "name": "kill adb server" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json deleted file mode 100644 index e847a237d6..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json +++ /dev/null @@ -1,509 +0,0 @@ -[ - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skia/resources", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skp", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SKP_VERSION", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skimage", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SK_IMAGE_VERSION", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/svg", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SVG_VERSION", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/perf" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/out/Release/nanobench", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering 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 /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android; echo $? >/data/local/tmp/rc", - "[START_DIR]/tmp/nanobench.sh" - ], - "name": "write nanobench.sh" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/nanobench.sh", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench.sh" - }, - { - "cmd": [ - "adb", - "logcat", - "-c" - ], - "cwd": "[START_DIR]/skia", - "name": "clear log" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n", - "/data/local/tmp/", - "nanobench.sh" - ], - "name": "nanobench", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',@@@", - "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", - "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(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-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android/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@@@" - ] - }, - { - "cmd": [ - "adb", - "pull", - "/sdcard/revenge_of_the_skiabot/perf", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android/data" - ], - "cwd": "[START_DIR]/skia", - "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android/data" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" - ], - "name": "dump log", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb', 'logcat', '-d'])@@@", - "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", - "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", - "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", - "@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@", - "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", - "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", - "@@@STEP_LOG_LINE@python.inline@ print line@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "kill-server" - ], - "cwd": "[START_DIR]/skia", - "name": "kill adb server" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json deleted file mode 100644 index c4228de6c1..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json +++ /dev/null @@ -1,509 +0,0 @@ -[ - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skia/resources", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skp", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SKP_VERSION", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skimage", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SK_IMAGE_VERSION", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/svg", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SVG_VERSION", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/perf" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/out/Release/nanobench", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~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 /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch x86 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config GN_Android model NexusPlayer os Android; echo $? >/data/local/tmp/rc", - "[START_DIR]/tmp/nanobench.sh" - ], - "name": "write nanobench.sh" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/nanobench.sh", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench.sh" - }, - { - "cmd": [ - "adb", - "logcat", - "-c" - ], - "cwd": "[START_DIR]/skia", - "name": "clear log" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n", - "/data/local/tmp/", - "nanobench.sh" - ], - "name": "nanobench", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',@@@", - "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", - "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android/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@@@" - ] - }, - { - "cmd": [ - "adb", - "pull", - "/sdcard/revenge_of_the_skiabot/perf", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android/data" - ], - "cwd": "[START_DIR]/skia", - "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android/data" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" - ], - "name": "dump log", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb', 'logcat', '-d'])@@@", - "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", - "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", - "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", - "@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@", - "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", - "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", - "@@@STEP_LOG_LINE@python.inline@ print line@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "kill-server" - ], - "cwd": "[START_DIR]/skia", - "name": "kill adb server" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json deleted file mode 100644 index 35b20726c3..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json +++ /dev/null @@ -1,509 +0,0 @@ -[ - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skia/resources", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skp", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SKP_VERSION", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skimage", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SK_IMAGE_VERSION", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/svg", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/SVG_VERSION", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "name": "rm /sdcard/revenge_of_the_skiabot/perf" - }, - { - "cmd": [ - "adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/out/Release/nanobench", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 esinst esinst4 --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 /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model PixelC os Android; echo $? >/data/local/tmp/rc", - "[START_DIR]/tmp/nanobench.sh" - ], - "name": "write nanobench.sh" - }, - { - "cmd": [ - "adb", - "push", - "[START_DIR]/tmp/nanobench.sh", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "name": "push nanobench.sh" - }, - { - "cmd": [ - "adb", - "logcat", - "-c" - ], - "cwd": "[START_DIR]/skia", - "name": "clear log" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n", - "/data/local/tmp/", - "nanobench.sh" - ], - "name": "nanobench", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',@@@", - "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", - "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(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-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android/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@@@" - ] - }, - { - "cmd": [ - "adb", - "pull", - "/sdcard/revenge_of_the_skiabot/perf", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android/data" - ], - "cwd": "[START_DIR]/skia", - "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android/data" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" - ], - "name": "dump log", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb', 'logcat', '-d'])@@@", - "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", - "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", - "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", - "@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@", - "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", - "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", - "@@@STEP_LOG_LINE@python.inline@ print line@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "adb", - "kill-server" - ], - "cwd": "[START_DIR]/skia", - "name": "kill adb server" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json deleted file mode 100644 index 9492e955a7..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json +++ /dev/null @@ -1,208 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "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-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/data" - ], - "env": { - "PYTHONPATH": "[START_DIR]/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-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/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": [ - "[START_DIR]/out/Release/nanobench", - "--undefok", - "-i", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/nanobench", - "--svgs", - "[START_DIR]/svg", - "--nogpu", - "--pre_log", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "glinst", - "glinst16", - "--match", - "~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-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/data/nanobench_abc123_1337000001.json", - "--properties", - "gitHash", - "abc123", - "build_number", - "5", - "--key", - "arch", - "x86_64", - "compiler", - "Clang", - "cpu_or_gpu", - "CPU", - "cpu_or_gpu_value", - "AVX", - "extra_config", - "GN", - "model", - "MacMini6.2", - "os", - "Mac" - ], - "cwd": "[START_DIR]/skia", - "name": "nanobench" - }, - { - "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-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/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 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json deleted file mode 100644 index 16a2734c6e..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ /dev/null @@ -1,113 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "[START_DIR]/out/Debug/nanobench", - "--undefok", - "-i", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/nanobench", - "--svgs", - "[START_DIR]/svg", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "commandbuffer", - "--match", - "~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" - ], - "cwd": "[START_DIR]/skia", - "name": "nanobench" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json index 3b4b94c675..64bc9ad556 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json @@ -64,7 +64,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-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release/data" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -86,7 +86,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-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release/data", "511" ], "name": "makedirs data", @@ -153,7 +153,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data/nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release/data/nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -168,8 +168,6 @@ "CPU", "cpu_or_gpu_value", "AVX2", - "extra_config", - "GN", "model", "GCE", "os", @@ -183,7 +181,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-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release/data", "511" ], "name": "makedirs perf_dir", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json deleted file mode 100644 index 7eda498082..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json +++ /dev/null @@ -1,212 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "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-ANGLE/data" - ], - "env": { - "PYTHONPATH": "[START_DIR]/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-ANGLE/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": [ - "catchsegv", - "[START_DIR]/out/Release/nanobench", - "--undefok", - "-i", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/nanobench", - "--svgs", - "[START_DIR]/svg", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "angle_d3d11_es2", - "angle_gl_es2", - "--match", - "~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-ANGLE/data/nanobench_abc123_1337000001.json", - "--properties", - "gitHash", - "abc123", - "build_number", - "5", - "--key", - "arch", - "x86_64", - "compiler", - "GCC", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "GTX550Ti", - "extra_config", - "ANGLE", - "model", - "ShuttleA", - "os", - "Ubuntu" - ], - "cwd": "[START_DIR]/skia", - "name": "nanobench" - }, - { - "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-ANGLE/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 - } -]
\ No newline at end of file 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 deleted file mode 100644 index ff596e3b53..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ /dev/null @@ -1,207 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "valgrind", - "--gen-suppressions=all", - "--leak-check=full", - "--track-origins=yes", - "--error-exitcode=1", - "--num-callers=40", - "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/nanobench", - "--undefok", - "-i", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/nanobench", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--loops", - "1", - "--samples", - "1", - "--keepAlive", - "true", - "--match", - "~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": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, - "name": "nanobench" - }, - { - "cmd": [ - "valgrind", - "--gen-suppressions=all", - "--leak-check=full", - "--track-origins=yes", - "--error-exitcode=1", - "--num-callers=40", - "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/nanobench", - "--undefok", - "-i", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/nanobench", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--loops", - "1", - "--samples", - "1", - "--keepAlive", - "true", - "--match", - "~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", - "--abandonGpuContext", - "--nocpu" - ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, - "name": "nanobench --abandonGpuContext" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file 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 deleted file mode 100644 index f3fd6492cb..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ /dev/null @@ -1,119 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "[START_DIR]\\out\\Debug_x64\\nanobench", - "--undefok", - "-i", - "[START_DIR]\\skia\\resources", - "--skps", - "[START_DIR]\\skp", - "--images", - "[START_DIR]\\skimage\\nanobench", - "--svgs", - "[START_DIR]\\svg", - "--nogpu", - "--pre_log", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "565", - "msaa16", - "nvpr16", - "nvprdit16", - "--match", - "~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" - ], - "cwd": "[START_DIR]\\skia", - "name": "nanobench" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file 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 deleted file mode 100644 index 9a94744ff1..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ /dev/null @@ -1,205 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "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-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data" - ], - "env": { - "PYTHONPATH": "[START_DIR]\\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-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\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": [ - "[START_DIR]\\out\\Release_x64\\nanobench", - "--undefok", - "-i", - "[START_DIR]\\skia\\resources", - "--skps", - "[START_DIR]\\skp", - "--images", - "[START_DIR]\\skimage\\nanobench", - "--svgs", - "[START_DIR]\\svg", - "--nogpu", - "--pre_log", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "565", - "msaa16", - "nvpr16", - "nvprdit16", - "--match", - "~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_1337000001.json", - "--properties", - "gitHash", - "abc123", - "build_number", - "5", - "--key", - "arch", - "x86_64", - "compiler", - "MSVC", - "cpu_or_gpu", - "CPU", - "cpu_or_gpu_value", - "AVX2", - "model", - "GCE", - "os", - "Win" - ], - "cwd": "[START_DIR]\\skia", - "name": "nanobench" - }, - { - "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-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\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 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json deleted file mode 100644 index 4db8b0ba3d..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json +++ /dev/null @@ -1,211 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "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-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE\\data" - ], - "env": { - "PYTHONPATH": "[START_DIR]\\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-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE\\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": [ - "[START_DIR]\\out\\Release_x64\\nanobench", - "--undefok", - "-i", - "[START_DIR]\\skia\\resources", - "--skps", - "[START_DIR]\\skp", - "--images", - "[START_DIR]\\skimage\\nanobench", - "--svgs", - "[START_DIR]\\svg", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "angle_d3d11_es2", - "--match", - "~tile_image_filter_tiled_64", - "~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-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE\\data\\nanobench_abc123_1337000001.json", - "--properties", - "gitHash", - "abc123", - "build_number", - "5", - "--key", - "arch", - "x86_64", - "compiler", - "MSVC", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "IntelIris540", - "extra_config", - "ANGLE", - "model", - "NUC", - "os", - "Win10" - ], - "cwd": "[START_DIR]\\skia", - "name": "nanobench" - }, - { - "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-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE\\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 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json deleted file mode 100644 index 3e02cdd9f1..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ /dev/null @@ -1,122 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "[START_DIR]\\out\\Debug_x64\\nanobench", - "--undefok", - "-i", - "[START_DIR]\\skia\\resources", - "--skps", - "[START_DIR]\\skp", - "--images", - "[START_DIR]\\skimage\\nanobench", - "--svgs", - "[START_DIR]\\svg", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "angle_d3d11_es2", - "--match", - "~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" - ], - "cwd": "[START_DIR]\\skia", - "name": "nanobench" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file 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 deleted file mode 100644 index c743570a0f..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ /dev/null @@ -1,213 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "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-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" - ], - "env": { - "PYTHONPATH": "[START_DIR]\\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-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\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": [ - "[START_DIR]\\out\\Release_x64\\nanobench", - "--undefok", - "-i", - "[START_DIR]\\skia\\resources", - "--skps", - "[START_DIR]\\skp", - "--images", - "[START_DIR]\\skimage\\nanobench", - "--svgs", - "[START_DIR]\\svg", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--match", - "~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_1337000001.json", - "--properties", - "gitHash", - "abc123", - "build_number", - "5", - "issue", - "500", - "patchset", - "1", - "patch_storage", - "rietveld", - "--key", - "arch", - "x86_64", - "compiler", - "MSVC", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "HD4600", - "model", - "ShuttleB", - "os", - "Win8" - ], - "cwd": "[START_DIR]\\skia", - "name": "nanobench" - }, - { - "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-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\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 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json deleted file mode 100644 index a5c89e7611..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ /dev/null @@ -1,429 +0,0 @@ -[ - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_install" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "install iOSShell" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[START_DIR]/skia/resources", - "skiabot/skia_resources" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "push resources to skia_resources" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", - "skiabot/skia_tmp_dir/SKP_VERSION" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "read SKP_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", - "skiabot/skia_tmp_dir/SKP_VERSION" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "rm skiabot/skia_tmp_dir/SKP_VERSION" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", - "skiabot/skia_skp/skps" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "rmdir skiabot/skia_skp/skps" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", - "skiabot/skia_skp/skps" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "mkdir skiabot/skia_skp/skps" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[START_DIR]/skp", - "skiabot/skia_skp/skps" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "push skp to skps" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", - "[START_DIR]/tmp/SKP_VERSION", - "skiabot/skia_tmp_dir/SKP_VERSION" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "push [START_DIR]/tmp/SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", - "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "read SK_IMAGE_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", - "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", - "skiabot/skia_images" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "rmdir skiabot/skia_images" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", - "skiabot/skia_images" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "mkdir skiabot/skia_images" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[START_DIR]/skimage", - "skiabot/skia_images" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "push skimage to skia_images" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", - "[START_DIR]/tmp/SK_IMAGE_VERSION", - "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", - "skiabot/skia_tmp_dir/SVG_VERSION" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "read SVG_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", - "skiabot/skia_tmp_dir/SVG_VERSION" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "rm skiabot/skia_tmp_dir/SVG_VERSION" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", - "skiabot/skia_svg/svgs" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "rmdir skiabot/skia_svg/svgs" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", - "skiabot/skia_svg/svgs" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "mkdir skiabot/skia_svg/svgs" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[START_DIR]/svg", - "skiabot/skia_svg/svgs" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "push svg to svgs" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", - "[START_DIR]/tmp/SVG_VERSION", - "skiabot/skia_tmp_dir/SVG_VERSION" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "push [START_DIR]/tmp/SVG_VERSION" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia", - "--nanobench", - "--undefok", - "-i", - "skiabot/skia_resources", - "--skps", - "skiabot/skia_skp/skps", - "--images", - "skiabot/skia_images/nanobench", - "--svgs", - "skiabot/skia_svg/svgs", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--skps", - "ignore_skps", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--match", - "~blurroundrect", - "~patch_grid", - "~desk_carsvg", - "~keymobi", - "~path_hairline", - "~GLInstancedArraysBench", - "~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", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "nanobench" - }, - { - "cmd": [ - "[START_DIR]/skia/platform_tools/ios/bin/ios_restart" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "reboot" - }, - { - "cmd": [ - "sleep", - "20" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out", - "XCODEBUILD": "[START_DIR]/xcodebuild" - }, - "name": "wait for reboot" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json deleted file mode 100644 index 2817618709..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json +++ /dev/null @@ -1,213 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "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-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" - ], - "env": { - "PYTHONPATH": "[START_DIR]\\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-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\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": [ - "[START_DIR]\\out\\Release_x64\\nanobench", - "--undefok", - "-i", - "[START_DIR]\\skia\\resources", - "--skps", - "[START_DIR]\\skp", - "--images", - "[START_DIR]\\skimage\\nanobench", - "--svgs", - "[START_DIR]\\svg", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--match", - "~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_1337000001.json", - "--properties", - "gitHash", - "abc123", - "build_number", - "5", - "issue", - "2147533002", - "patchset", - "1", - "patch_storage", - "rietveld", - "--key", - "arch", - "x86_64", - "compiler", - "MSVC", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "HD4600", - "model", - "ShuttleB", - "os", - "Win8" - ], - "cwd": "[START_DIR]\\skia", - "name": "nanobench" - }, - { - "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-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\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 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/nobuildbot.json b/infra/bots/recipes/swarm_perf.expected/nobuildbot.json deleted file mode 100644 index 01b485bc21..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/nobuildbot.json +++ /dev/null @@ -1,247 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]\\tmp\\SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "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-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" - ], - "env": { - "PYTHONPATH": "[START_DIR]\\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-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\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": [ - "python", - "-u", - "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" - ], - "name": "get swarming bot id", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" - ], - "name": "get swarming task id", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "[START_DIR]\\out\\Release_x64\\nanobench", - "--undefok", - "-i", - "[START_DIR]\\skia\\resources", - "--skps", - "[START_DIR]\\skp", - "--images", - "[START_DIR]\\skimage\\nanobench", - "--svgs", - "[START_DIR]\\svg", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--match", - "~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_1337000001.json", - "--properties", - "gitHash", - "abc123", - "build_number", - "571", - "issue", - "456789", - "patchset", - "12", - "patch_storage", - "gerrit", - "no_buildbot", - "True", - "swarming_bot_id", - "skia-bot-123", - "swarming_task_id", - "123456", - "--key", - "arch", - "x86_64", - "compiler", - "MSVC", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "HD4600", - "model", - "ShuttleB", - "os", - "Win8" - ], - "cwd": "[START_DIR]\\skia", - "name": "nanobench" - }, - { - "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-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\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 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json deleted file mode 100644 index ed45dac5ab..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json +++ /dev/null @@ -1,229 +0,0 @@ -[ - { - "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", - "[START_DIR]/tmp", - "511" - ], - "name": "makedirs tmp_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@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "valgrind", - "--gen-suppressions=all", - "--leak-check=full", - "--track-origins=yes", - "--error-exitcode=1", - "--num-callers=40", - "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/nanobench", - "--undefok", - "-i", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/nanobench", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--loops", - "1", - "--samples", - "1", - "--keepAlive", - "true", - "--match", - "~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": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, - "name": "nanobench" - }, - { - "cmd": [ - "valgrind", - "--gen-suppressions=all", - "--leak-check=full", - "--track-origins=yes", - "--error-exitcode=1", - "--num-callers=40", - "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/nanobench", - "--undefok", - "-i", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/nanobench", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--loops", - "1", - "--samples", - "1", - "--keepAlive", - "true", - "--match", - "~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", - "--abandonGpuContext", - "--nocpu" - ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, - "name": "nanobench --abandonGpuContext" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file |