Revert "Omit some SKPs that seem to cause GalaxyS9 to crash."
This reverts commit 93b94512391327fb74b07d162aac8f1f677375f4.
Reason for revert: Didn't help.
Original change's description:
> Omit some SKPs that seem to cause GalaxyS9 to crash.
>
> Bug: skia:8854
> Change-Id: I7bf90ba1217ec05e60dd976a66f3b61290396767
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/200059
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Auto-Submit: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,benjaminwagner@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: skia:8854
Change-Id: I0a3603c45069f3734a6689fc5ab9db467a922ac2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201608
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan.json
deleted file mode 100644
index 3e0c4d8..0000000
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan.json
+++ /dev/null
@@ -1,675 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[START_DIR]/tmp"
- ],
- "infra_step": true,
- "name": "makedirs tmp_dir"
- },
- {
- "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": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "mkdir",
- "-p",
- "/sdcard/revenge_of_the_skiabot/resources"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "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(['/usr/bin/adb.1.0.35', '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"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "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(['/usr/bin/adb.1.0.35', '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",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/skia/infra/bots/assets/skp/VERSION",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "Get skp VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "42",
- "[START_DIR]/tmp/SKP_VERSION"
- ],
- "infra_step": true,
- "name": "write SKP_VERSION"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "cat",
- "/sdcard/revenge_of_the_skiabot/SKP_VERSION"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
- "stdout": "/path/to/tmp/"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "rm",
- "-f",
- "/sdcard/revenge_of_the_skiabot/SKP_VERSION"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "rm",
- "-rf",
- "/sdcard/revenge_of_the_skiabot/skps"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "rm /sdcard/revenge_of_the_skiabot/skps"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "mkdir",
- "-p",
- "/sdcard/revenge_of_the_skiabot/skps"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "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(['/usr/bin/adb.1.0.35', '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"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "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(['/usr/bin/adb.1.0.35', '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": [
- "/usr/bin/adb.1.0.35",
- "push",
- "[START_DIR]/tmp/SKP_VERSION",
- "/sdcard/revenge_of_the_skiabot/SKP_VERSION"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "Get skimage VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "42",
- "[START_DIR]/tmp/SK_IMAGE_VERSION"
- ],
- "infra_step": true,
- "name": "write SK_IMAGE_VERSION"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "cat",
- "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
- "stdout": "/path/to/tmp/"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "rm",
- "-f",
- "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "rm",
- "-rf",
- "/sdcard/revenge_of_the_skiabot/images"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "rm /sdcard/revenge_of_the_skiabot/images"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "mkdir",
- "-p",
- "/sdcard/revenge_of_the_skiabot/images"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "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(['/usr/bin/adb.1.0.35', '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"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "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(['/usr/bin/adb.1.0.35', '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": [
- "/usr/bin/adb.1.0.35",
- "push",
- "[START_DIR]/tmp/SK_IMAGE_VERSION",
- "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/skia/infra/bots/assets/svg/VERSION",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "Get svg VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "42",
- "[START_DIR]/tmp/SVG_VERSION"
- ],
- "infra_step": true,
- "name": "write SVG_VERSION"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "cat",
- "/sdcard/revenge_of_the_skiabot/SVG_VERSION"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
- "stdout": "/path/to/tmp/"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "rm",
- "-f",
- "/sdcard/revenge_of_the_skiabot/SVG_VERSION"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "rm",
- "-rf",
- "/sdcard/revenge_of_the_skiabot/svgs"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "rm /sdcard/revenge_of_the_skiabot/svgs"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "shell",
- "mkdir",
- "-p",
- "/sdcard/revenge_of_the_skiabot/svgs"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "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(['/usr/bin/adb.1.0.35', '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"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "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(['/usr/bin/adb.1.0.35', '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": [
- "/usr/bin/adb.1.0.35",
- "push",
- "[START_DIR]/tmp/SVG_VERSION",
- "/sdcard/revenge_of_the_skiabot/SVG_VERSION"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
- },
- {
- "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": [
- "/usr/bin/adb.1.0.35",
- "push",
- "[START_DIR]/build/nanobench",
- "/data/local/tmp/"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "push nanobench"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "set -x; /data/local/tmp/nanobench -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 --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --nocpu --config vk --match ~blurroundrect ~patch_grid ~desk_carsvg ~^top25desk_techcrunch.skp_1.1_mpd$ ~^top25desk_cnn.skp_1.1_mpd$ ~^top25desk_linkedin.skp_1.1_mpd$ ~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"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "write nanobench.sh"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "push",
- "[START_DIR]/tmp/nanobench.sh",
- "/data/local/tmp/"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "push nanobench.sh"
- },
- {
- "cmd": [
- "/usr/bin/adb.1.0.35",
- "logcat",
- "-c"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "clear log"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', '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"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "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(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])@@@",
- "@@@STEP_LOG_LINE@python.inline@try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', '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(['/usr/bin/adb.1.0.35', '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]/build"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "dump log",
- "timeout": 300,
- "~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(['/usr/bin/adb.1.0.35', '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": [
- "/usr/bin/adb.1.0.35",
- "kill-server"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "kill adb server"
- },
- {
- "jsonResult": null,
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index 171b336..14e18d7 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -250,11 +250,6 @@
match.append('~^top25desk_techcrunch.skp_1$')
match.append('~^top25desk_techcrunch.skp_1.1_mpd$')
match.append('~^top25desk_techcrunch.skp_1.1$')
- if 'GalaxyS9' in bot and 'Debug' in bot and 'Vulkan' in bot:
- # skia:8854
- match.append('~^top25desk_techcrunch.skp_1.1_mpd$')
- match.append('~^top25desk_cnn.skp_1.1_mpd$')
- match.append('~^top25desk_linkedin.skp_1.1_mpd$')
# We do not need or want to benchmark the decodes of incomplete images.
# In fact, in nanobench we assert that the full image decode succeeds.
@@ -403,7 +398,6 @@
TEST_BUILDERS = [
- 'Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan',
'Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android',
('Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-'
'Android_NoGPUThreads'),
