diff options
| author |  Stephan Altmueller <stephana@google.com> | 2018-06-20 14:32:57 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-21 15:02:18 +0000 |
| commit | 978b0bb17308aebe14e391a319b52c908dbfad96 (patch) | |
| tree | 3bff9ceaa2fca4831dd228c447565727b94bb2c9 /infra | |
| parent | 61582510eeb8484ad3e12df97bf781a3129f60d0 (diff) | |
[infra] Remove PixelC bot
No-Tree-Checks: true
Bug: skia:
Change-Id: Ib0a5ad3df31f4fca9ab0085a5ba1d174419eee57
Reviewed-on: https://skia-review.googlesource.com/136220
Commit-Queue: Stephan Altmueller <stephana@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
11 files changed, 7 insertions, 2372 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index e842d54544..bebc1c54f7 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -456,7 +456,6 @@ func defaultSwarmDimensions(parts map[string]string) []string { "NexusPlayer": {"fugu", "OPR2.170623.027"}, "Pixel": {"sailfish", "OPM4.171019.016.B1"}, "Pixel2XL": {"taimen", "OPM4.171019.016.B1"}, - "PixelC": {"dragon", "OPM4.171019.016.C1"}, }[parts["model"]] if !ok { glog.Fatalf("Entry %q not found in Android mapping.", parts["model"]) diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index d0cc2bb9a7..019d3f0f65 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -168,9 +168,6 @@ "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench", "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan", "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan_Skpbench", - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench", - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench", - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench", "Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All", "Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All", "Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All", diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py index 021ca04b9f..5ca32b8995 100644 --- a/infra/bots/recipe_modules/flavor/android.py +++ b/infra/bots/recipe_modules/flavor/android.py @@ -66,8 +66,7 @@ class AndroidFlavor(default.DefaultFlavor): self.disable_for_nanobench = { 'Nexus5x': range(0, 4), 'Pixel': range(0, 2), - 'Pixel2XL': range(0, 4), - 'PixelC': range(0, 2) + 'Pixel2XL': range(0, 4) } self.gpu_scaling = { diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json deleted file mode 100644 index b8f1906366..0000000000 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json +++ /dev/null @@ -1,1035 +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": [ - "/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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/perf" - }, - { - "cmd": [ - "/usr/bin/adb.1.0.35", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/perf" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" - }, - { - "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": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", - "/usr/bin/adb.1.0.35", - "0", - "userspace" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "Set CPU 0's governor to userspace", - "timeout": 30, - "~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@import time@@@", - "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", - "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", - "@@@STEP_LOG_LINE@python.inline@print log@@@", - "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", - "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", - "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint 'Setting frequency to %d' % freq\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", - "/usr/bin/adb.1.0.35", - "0.6", - "0" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "Scale CPU 0 to 0.600000", - "timeout": 30, - "~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@import time@@@", - "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", - "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", - "@@@STEP_LOG_LINE@python.inline@print log@@@", - "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@root = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", - "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", - "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", - "@@@STEP_LOG_LINE@python.inline@ available_freqs = sorted(@@@", - "@@@STEP_LOG_LINE@python.inline@ int(i) for i in available_freqs.strip().split())@@@", - "@@@STEP_LOG_LINE@python.inline@else:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise Exception('Could not get list of available frequencies: %s' %@@@", - "@@@STEP_LOG_LINE@python.inline@ available_freqs)@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@maxfreq = available_freqs[-1]@@@", - "@@@STEP_LOG_LINE@python.inline@target = int(round(maxfreq * target_percent))@@@", - "@@@STEP_LOG_LINE@python.inline@freq = maxfreq@@@", - "@@@STEP_LOG_LINE@python.inline@for f in reversed(available_freqs):@@@", - "@@@STEP_LOG_LINE@python.inline@ if f <= target:@@@", - "@@@STEP_LOG_LINE@python.inline@ freq = f@@@", - "@@@STEP_LOG_LINE@python.inline@ break@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@print 'Setting frequency to %d' % freq@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@# If scaling_max_freq is lower than our attempted setting, it won't take.@@@", - "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", - "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", - "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", - "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", - "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", - "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", - "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print 'CPU %d online already %d' % (cpu, value)\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", - "/usr/bin/adb.1.0.35", - "0", - "0" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "Disabling CPU 0", - "timeout": 30, - "~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@import time@@@", - "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", - "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", - "@@@STEP_LOG_LINE@python.inline@print log@@@", - "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", - "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", - "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", - "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'CPU %d online already %d' % (cpu, value)@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", - "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", - "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", - "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", - "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print 'CPU %d online already %d' % (cpu, value)\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", - "/usr/bin/adb.1.0.35", - "1", - "0" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "Disabling CPU 1", - "timeout": 30, - "~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@import time@@@", - "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", - "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", - "@@@STEP_LOG_LINE@python.inline@print log@@@", - "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", - "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", - "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", - "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'CPU %d online already %d' % (cpu, value)@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", - "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", - "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", - "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", - "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", - "@@@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_PACKAGE_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 gles glessrgb glesmsaa4 glesnvpr4 --gpuThreads 0 --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 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config Android_Skpbench model PixelC os Android; echo $? >/data/local/tmp/rc", - "[START_DIR]/tmp/nanobench.sh" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "infra_step": true, - "name": "makedirs perf_dir" - }, - { - "cmd": [], - "name": "adb pull" - }, - { - "cmd": [ - "/usr/bin/adb.1.0.35", - "pull", - "/sdcard/revenge_of_the_skiabot/perf", - "[TMP_BASE]/adb_pull_tmp_1" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "glob", - "[TMP_BASE]/adb_pull_tmp_1", - "perf/*" - ], - "infra_step": true, - "name": "adb pull.list pulled files", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", - "@@@STEP_LOG_END@glob@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "infra_step": true, - "name": "adb pull.copy 1.png", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "infra_step": true, - "name": "adb pull.copy 2.png", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" - ], - "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "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_PACKAGE_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_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "kill adb server" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index cf66c0def1..e282d80ac3 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -140,11 +140,6 @@ def nanobench_flags(api, bot): args.append('--config') args.extend(configs) - # By default, we test with GPU threading enabled. Leave PixelC devices - # running without threads, just to get some coverage of that code path. - if 'PixelC' in bot: - args.extend(['--gpuThreads', '0']) - if 'Valgrind' in bot: # Don't care about Valgrind performance. args.extend(['--loops', '1']) @@ -373,7 +368,6 @@ def RunSteps(api): TEST_BUILDERS = [ 'Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android', 'Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan', - 'Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench', 'Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All', 'Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All', 'Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All', diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json deleted file mode 100644 index eb0d21080e..0000000000 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json +++ /dev/null @@ -1,350 +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": [ - "/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_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" - }, - { - "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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "infra_step": true, - "name": "makedirs perf_dir" - }, - { - "cmd": [ - "adb.1.0.35", - "push", - "[START_DIR]/build/skpbench", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push skpbench" - }, - { - "cmd": [ - "python", - "-u", - "[START_DIR]/skia/tools/skpbench/skpbench.py", - "/data/local/tmp/skpbench", - "--resultsfile", - "[START_DIR]/[SWARM_OUT_DIR]/table", - "--config", - "gles", - "-v5", - "--adb", - "--adb_binary", - "adb.1.0.35", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "skpbench" - }, - { - "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": [ - "python", - "-u", - "[START_DIR]/skia/tools/skpbench/skiaperf.py", - "[START_DIR]/[SWARM_OUT_DIR]/table", - "--properties", - "gitHash", - "abc123", - "swarming_bot_id", - "skia-bot-123", - "swarming_task_id", - "123456", - "--outfile", - "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json", - "--key", - "arch", - "arm64", - "compiler", - "Clang", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "TegraX1", - "extra_config", - "Android_Skpbench", - "model", - "PixelC", - "os", - "Android", - "test_filter", - "All" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "Parse skpbench output into Perf json" - }, - { - "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_PACKAGE_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_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "kill adb server" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json deleted file mode 100644 index c29c253814..0000000000 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json +++ /dev/null @@ -1,350 +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": [ - "/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_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" - }, - { - "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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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_PACKAGE_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", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "infra_step": true, - "name": "makedirs perf_dir" - }, - { - "cmd": [ - "adb.1.0.35", - "push", - "[START_DIR]/build/skpbench", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push skpbench" - }, - { - "cmd": [ - "python", - "-u", - "[START_DIR]/skia/tools/skpbench/skpbench.py", - "/data/local/tmp/skpbench", - "--resultsfile", - "[START_DIR]/[SWARM_OUT_DIR]/table", - "--config", - "vk", - "-v5", - "--adb", - "--adb_binary", - "adb.1.0.35", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "skpbench" - }, - { - "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": [ - "python", - "-u", - "[START_DIR]/skia/tools/skpbench/skiaperf.py", - "[START_DIR]/[SWARM_OUT_DIR]/table", - "--properties", - "gitHash", - "abc123", - "swarming_bot_id", - "skia-bot-123", - "swarming_task_id", - "123456", - "--outfile", - "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json", - "--key", - "arch", - "arm64", - "compiler", - "Clang", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "TegraX1", - "extra_config", - "Android_Vulkan_Skpbench", - "model", - "PixelC", - "os", - "Android", - "test_filter", - "All" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "Parse skpbench output into Perf json" - }, - { - "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_PACKAGE_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_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "kill adb server" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json index 7545aa31bf..b0e7e0429b 100644 --- a/infra/bots/recipes/skpbench.expected/trybot.json +++ b/infra/bots/recipes/skpbench.expected/trybot.json @@ -215,7 +215,7 @@ "--resultsfile", "[START_DIR]/[SWARM_OUT_DIR]/table", "--config", - "gles", + "vk", "-v5", "--adb", "--adb_binary", @@ -285,11 +285,11 @@ "cpu_or_gpu", "GPU", "cpu_or_gpu_value", - "TegraX1", + "Adreno540", "extra_config", - "Android_Skpbench", + "Android_Vulkan_Skpbench", "model", - "PixelC", + "Pixel2XL", "os", "Android", "test_filter", diff --git a/infra/bots/recipes/skpbench.py b/infra/bots/recipes/skpbench.py index f2e419ab30..b70cbcf9ae 100644 --- a/infra/bots/recipes/skpbench.py +++ b/infra/bots/recipes/skpbench.py @@ -136,9 +136,6 @@ def RunSteps(api): TEST_BUILDERS = [ - 'Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench', - ('Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-' - 'Android_Vulkan_Skpbench'), ('Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-' 'Android_CCPR_Skpbench'), 'Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench', @@ -170,8 +167,8 @@ def GenTests(api): yield test - b = ('Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-' - 'Android_Skpbench') + b = ('Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-' + 'Android_Vulkan_Skpbench') yield ( api.test('trybot') + api.properties(buildername=b, diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 55d12b4639..57bda7fca6 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -94,7 +94,6 @@ def dm_flags(api, bot): # is ignored and dm will keep attempting to proceed until we actually # exhaust the available resources. if ('NexusPlayer' in bot or - 'PixelC' in bot or 'Chromecast' in bot): args.append('--ignoreSigInt') diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index f1a402ef35..28a250f60b 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -1022,24 +1022,6 @@ "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan_Skpbench" ] }, - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": { - "priority": 0.8, - "tasks": [ - "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench" - ] - }, - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": { - "priority": 0.8, - "tasks": [ - "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench" - ] - }, - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench": { - "priority": 0.8, - "tasks": [ - "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench" - ] - }, "Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All": { "priority": 0.8, "tasks": [ @@ -23442,303 +23424,6 @@ ], "priority": 0.8 }, - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:ad60019cb66a75b59991d43b95a43f68e3fff81b" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "skpbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-arm64-Release-Android", - "Housekeeper-PerCommit-IsolateSKP" - ], - "dimensions": [ - "device_os:OPM4.171019.016.C1", - "device_type:dragon", - "os:Android", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "skpbench_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" - ], - "priority": 0.8 - }, - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:ad60019cb66a75b59991d43b95a43f68e3fff81b" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "skpbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-arm64-Release-Android", - "Housekeeper-PerCommit-IsolateSKP" - ], - "dimensions": [ - "device_os:OPM4.171019.016.C1", - "device_type:dragon", - "os:Android", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "skpbench_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" - ], - "priority": 0.8 - }, - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:ad60019cb66a75b59991d43b95a43f68e3fff81b" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "skpbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-arm64-Release-Android_Vulkan", - "Housekeeper-PerCommit-IsolateSKP" - ], - "dimensions": [ - "device_os:OPM4.171019.016.C1", - "device_type:dragon", - "os:Android", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "skpbench_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" - ], - "priority": 0.8 - }, "Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All": { "caches": [ { @@ -74515,306 +74200,6 @@ "priority": 0.8, "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" }, - "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:ad60019cb66a75b59991d43b95a43f68e3fff81b" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-highmem-2", - "os:Debian-9.4", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "execution_timeout_ns": 3600000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 3600000000000, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:ad60019cb66a75b59991d43b95a43f68e3fff81b" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-highmem-2", - "os:Debian-9.4", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "execution_timeout_ns": 3600000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 3600000000000, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:ad60019cb66a75b59991d43b95a43f68e3fff81b" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-highmem-2", - "os:Debian-9.4", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "execution_timeout_ns": 3600000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 3600000000000, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, "Upload-Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": { "caches": [ { |