AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
76c1ff1566
skia2/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json

1426 lines
64 KiB
JSON
Raw Normal View History

Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
[
{
"cmd": [
"vpython",
"-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",
"~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": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"python",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"-u",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"\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",
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"0",
"1"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "Enabling CPU 0",
"timeout": 30,
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"~followup_annotations": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"@@@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@@@"
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
]
},
{
"cmd": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"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",
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"1",
"1"
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "Enabling CPU 1",
"timeout": 30,
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
"~followup_annotations": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"@@@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@@@"
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
]
},
{
"cmd": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"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",
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"2",
"1"
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "Enabling CPU 2",
"timeout": 30,
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. recipe_engine: https://crrev.com/acfec855b3a03ad8c28df551c3ea7a6bbee75967 [file][cipd] Run YAPF (joshuaseaton@google.com) https://crrev.com/64c4a05dc93199fc5a8aca78f9427b09bd43776c [file] Add read text to presentation (joshuaseaton@google.com) https://crrev.com/1485ed120ff670c0b32905d28c824e7af6f32aa6 [cipd] Add CIPD UI link to register() presentation (joshuaseaton@google.com) R=kjlubick@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: If102c0ccd69f1393348bd02d3619ed4b0b6b3d6b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/251820 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-30 21:44:56 +00:00
"~followup_annotations": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"@@@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@@@"
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. recipe_engine: https://crrev.com/acfec855b3a03ad8c28df551c3ea7a6bbee75967 [file][cipd] Run YAPF (joshuaseaton@google.com) https://crrev.com/64c4a05dc93199fc5a8aca78f9427b09bd43776c [file] Add read text to presentation (joshuaseaton@google.com) https://crrev.com/1485ed120ff670c0b32905d28c824e7af6f32aa6 [cipd] Add CIPD UI link to register() presentation (joshuaseaton@google.com) R=kjlubick@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: If102c0ccd69f1393348bd02d3619ed4b0b6b3d6b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/251820 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-30 21:44:56 +00:00
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"python",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"-u",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"\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",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"3",
"1"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "Enabling CPU 3",
"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@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"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",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"4",
"ondemand"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "Set CPU 4's governor to ondemand",
"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@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"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",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"0",
"ondemand"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "Set CPU 0's governor to ondemand",
"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@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"push",
"[START_DIR]/build/dm",
"/data/local/tmp/"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "push dm"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"glob",
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
"[START_DIR]/skia/resources",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"*"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
],
"infra_step": true,
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"name": "ls [START_DIR]/skia/resources/*",
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
"~followup_annotations": [
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"@@@STEP_LOG_LINE@glob@[START_DIR]/skia/resources/bar.jpg@@@",
"@@@STEP_LOG_LINE@glob@[START_DIR]/skia/resources/foo.png@@@",
"@@@STEP_LOG_END@glob@@@"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
]
},
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
{
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"[START_DIR]/skia/resources/bar.jpg",
"[START_DIR]/skia/resources/foo.png",
"/sdcard/revenge_of_the_skiabot/resources"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
],
"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,
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"[START_DIR]/skia/infra/bots/assets/skp/VERSION",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/path/to/tmp/"
],
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "Get skp VERSION",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. recipe_engine: https://crrev.com/acfec855b3a03ad8c28df551c3ea7a6bbee75967 [file][cipd] Run YAPF (joshuaseaton@google.com) https://crrev.com/64c4a05dc93199fc5a8aca78f9427b09bd43776c [file] Add read text to presentation (joshuaseaton@google.com) https://crrev.com/1485ed120ff670c0b32905d28c824e7af6f32aa6 [cipd] Add CIPD UI link to register() presentation (joshuaseaton@google.com) R=kjlubick@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: If102c0ccd69f1393348bd02d3619ed4b0b6b3d6b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/251820 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-30 21:44:56 +00:00
"~followup_annotations": [
"@@@STEP_LOG_LINE@VERSION@42@@@",
"@@@STEP_LOG_END@VERSION@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"[START_DIR]/tmp/SKP_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "write SKP_VERSION",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"~followup_annotations": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"@@@STEP_LOG_LINE@SKP_VERSION@42@@@",
"@@@STEP_LOG_END@SKP_VERSION@@@"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
]
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"shell",
"cat",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"python",
"-u",
"\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION",
"~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@@@@",
"@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
"@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
"@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@",
"@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = e.output@@@",
"@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@print(output)@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"python",
"-u",
"\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/skps"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/skps",
"~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@@@@",
"@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
"@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
"@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@",
"@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = e.output@@@",
"@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@print(output)@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"shell",
"mkdir",
"-p",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/skps"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"glob",
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
"[START_DIR]/skp",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"*"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
],
"infra_step": true,
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"name": "ls [START_DIR]/skp/*",
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
"~followup_annotations": [
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"@@@STEP_LOG_LINE@glob@[START_DIR]/skp/bar.jpg@@@",
"@@@STEP_LOG_LINE@glob@[START_DIR]/skp/foo.png@@@",
"@@@STEP_LOG_END@glob@@@"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
]
},
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
{
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"[START_DIR]/skp/bar.jpg",
"[START_DIR]/skp/foo.png",
"/sdcard/revenge_of_the_skiabot/skps"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
],
"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,
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"[START_DIR]/tmp/SKP_VERSION",
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/path/to/tmp/"
],
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "Get skimage VERSION",
Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. recipe_engine: https://crrev.com/acfec855b3a03ad8c28df551c3ea7a6bbee75967 [file][cipd] Run YAPF (joshuaseaton@google.com) https://crrev.com/64c4a05dc93199fc5a8aca78f9427b09bd43776c [file] Add read text to presentation (joshuaseaton@google.com) https://crrev.com/1485ed120ff670c0b32905d28c824e7af6f32aa6 [cipd] Add CIPD UI link to register() presentation (joshuaseaton@google.com) R=kjlubick@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: If102c0ccd69f1393348bd02d3619ed4b0b6b3d6b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/251820 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-30 21:44:56 +00:00
"~followup_annotations": [
"@@@STEP_LOG_LINE@VERSION@42@@@",
"@@@STEP_LOG_END@VERSION@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"[START_DIR]/tmp/SK_IMAGE_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "write SK_IMAGE_VERSION",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"~followup_annotations": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"@@@STEP_LOG_LINE@SK_IMAGE_VERSION@42@@@",
"@@@STEP_LOG_END@SK_IMAGE_VERSION@@@"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
]
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"shell",
"cat",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"python",
"-u",
"\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
"~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@@@@",
"@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
"@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
"@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@",
"@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = e.output@@@",
"@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@print(output)@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"python",
"-u",
"\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/images"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/images",
"~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@@@@",
"@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
"@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
"@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@",
"@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = e.output@@@",
"@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@print(output)@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"shell",
"mkdir",
"-p",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/images"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"glob",
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
"[START_DIR]/skimage",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"*"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
],
"infra_step": true,
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"name": "ls [START_DIR]/skimage/*",
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
"~followup_annotations": [
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"@@@STEP_LOG_LINE@glob@[START_DIR]/skimage/bar.jpg@@@",
"@@@STEP_LOG_LINE@glob@[START_DIR]/skimage/foo.png@@@",
"@@@STEP_LOG_END@glob@@@"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
]
},
[infra] Retry failed pushes in Android flavor It seems like we see quite a few "force quarantined" bots when pushing resources to the device fails. Rewrite copy_directory_contents_to_device to use the _adb method, which automatically retries. Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 17:03:50 +00:00
{
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"[START_DIR]/skimage/bar.jpg",
"[START_DIR]/skimage/foo.png",
"/sdcard/revenge_of_the_skiabot/images"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
],
"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,
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"[START_DIR]/tmp/SK_IMAGE_VERSION",
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"copy",
"[START_DIR]/skia/infra/bots/assets/svg/VERSION",
"/path/to/tmp/"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "Get svg VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@VERSION@42@@@",
"@@@STEP_LOG_END@VERSION@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"copy",
"42",
"[START_DIR]/tmp/SVG_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "write SVG_VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@SVG_VERSION@42@@@",
"@@@STEP_LOG_END@SVG_VERSION@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"shell",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"cat",
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"python",
"-u",
"\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION",
"~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@@@@",
"@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
"@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
"@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@",
"@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = e.output@@@",
"@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@print(output)@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"python",
"-u",
"\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/usr/bin/adb.1.0.35",
"/sdcard/revenge_of_the_skiabot/svgs"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/svgs",
"~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@@@@",
"@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
"@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
"@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@",
"@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = e.output@@@",
"@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@print(output)@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"shell",
"mkdir",
"-p",
"/sdcard/revenge_of_the_skiabot/svgs"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
},
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"glob",
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
"[START_DIR]/svg",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"*"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
],
"infra_step": true,
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"name": "ls [START_DIR]/svg/*",
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
"~followup_annotations": [
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"@@@STEP_LOG_LINE@glob@[START_DIR]/svg/bar.jpg@@@",
"@@@STEP_LOG_LINE@glob@[START_DIR]/svg/foo.png@@@",
"@@@STEP_LOG_END@glob@@@"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
]
},
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
{
"cmd": [
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"push",
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"[START_DIR]/svg/bar.jpg",
"[START_DIR]/svg/foo.png",
"/sdcard/revenge_of_the_skiabot/svgs"
Revert "Simplify pushing directories to android devices" This reverts commit 81a58cfe3bf853b7c03e2308ca6adc4391aeb18e. Reason for revert: Breaks with CIPD packages / symlinks? Original change's description: > Simplify pushing directories to android devices > > Change-Id: I5f0ce6720be821ae3825b58afc94dbeb2f50e2d8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372217 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,brianosman@google.com Change-Id: I1c0a35a7a149292aa1fe7c3ab0452c4203a9f357 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372477 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-19 15:53:27 +00:00
],
"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,
retry fast adb push This time, push host/* instead of host/. This cuts the time it takes to push resources from ~11m to ~8s on Android One phones. I tried ignoring version files and blindly pushing packages, but in the end kept the version files for compatibility with bots running at head (or after this lands, bisecting bots), and those version files still do save a good chunk of time. In PS12 I faked version file mismatch and it took ~2m extra to push all the packages back. I also tried but got nervous about --sync so I've left it for a follow up. It's not clear that we can rely on it for packages where files will be removed, but it's probably fine for resources/ if we want to go faster than 8s. Change-Id: I84de90f13177393e4d8a599ef880545538b6af81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375076 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2021-02-24 14:29:14 +00:00
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"push",
"[START_DIR]/tmp/SVG_VERSION",
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"cwd": "[START_DIR]/skia",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"env": {
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"vpython",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"-u",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"rmtree",
"[START_DIR]/test"
],
"infra_step": true,
"name": "rmtree test"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/test"
],
"infra_step": true,
"name": "makedirs test"
},
{
"cmd": [
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"python",
"-u",
"\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"/usr/bin/adb.1.0.35",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"/sdcard/revenge_of_the_skiabot/dm_out"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
Reland "[recipes] Verify that we actually deleted the file/dir on android" This is a reland of aed15a701a317bdbb5a67ac0b497ea28626a9e71 Original change's description: > [recipes] Verify that we actually deleted the file/dir on android > > Bug: skia:10539 > Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 > Reviewed-by: Ravi Mistry <rmistry@google.com> > Reviewed-by: Kevin Lubick <kjlubick@google.com> > Commit-Queue: Eric Boren <borenet@google.com> Bug: skia:10539 Change-Id: I23c6f85e5d446eea3fbd61cff3db29379e0b0702 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307794 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-08-04 18:19:16 +00:00
"name": "rm /sdcard/revenge_of_the_skiabot/dm_out",
"~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@@@@",
"@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
"@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
"@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
"@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
"@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@",
"@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ output = e.output@@@",
"@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@print(output)@@@",
"@@@STEP_LOG_LINE@python.inline@print('======')@@@",
"@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"shell",
"mkdir",
"-p",
"/sdcard/revenge_of_the_skiabot/dm_out"
],
"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/dm_out"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"python",
"-u",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = sys.argv[1]\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[2], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"https://example.com/hashes.txt",
"[START_DIR]/tmp/uninteresting_hashes.txt"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "get uninteresting hashes",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
"@@@STEP_LOG_LINE@python.inline@import math@@@",
"@@@STEP_LOG_LINE@python.inline@import socket@@@",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@import time@@@",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"@@@STEP_LOG_LINE@python.inline@@@@",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"@@@STEP_LOG_LINE@python.inline@HASHES_URL = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@",
"@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@",
"@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"@@@STEP_LOG_LINE@python.inline@@@@",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@",
"@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@",
"@@@STEP_LOG_LINE@python.inline@ try:@@@",
"@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@",
"@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@",
"@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@",
"@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@",
"@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@",
"@@@STEP_LOG_LINE@python.inline@ break@@@",
"@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@",
"@@@STEP_LOG_LINE@python.inline@ print e@@@",
"@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise@@@",
"@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@",
"@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@",
"@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"[START_DIR]/tmp/uninteresting_hashes.txt",
"/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt"
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
],
"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,
[infra] Move app installation to install method This generally makes things tidier (e.g. perf_skottietrace.py no longer needs special logic so that the app is only installed once), and it means iOS can install only the app that's going to be run instead of installing everything. Change-Id: Ic07c56e724d0379255c8da5f204d9d6379b646ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273002 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-02-24 21:45:14 +00:00
"name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt"
},
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
],
"name": "get swarming task id",
"~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@@@"
]
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
Update SVG corpus on gold to include images - Updated asset version to 13, which includes the image resources and modified directory hierarchy. - Updated dm --svgs arg in infra/bots/recipes/test.py to add "svg" subdirectory (relative to corpus asset root). - Ran 'make train' in infra/bots/ Bug: skia:11229 Change-Id: I4e3c5da5945ee7ee4034ec453fdeb84c5fa08394 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/361560 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2021-02-01 14:30:03 +00:00
"set -x; LD_LIBRARY_PATH=/data/local/tmp/ /data/local/tmp/dm --example --flags --properties bot skia-bot-123 key1 value1 task 123456 --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --svgs /sdcard/revenge_of_the_skiabot/svgs/svg --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out; echo $? >/data/local/tmp/rc",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"[START_DIR]/tmp/dm.sh"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "write dm.sh",
"~followup_annotations": [
Update SVG corpus on gold to include images - Updated asset version to 13, which includes the image resources and modified directory hierarchy. - Updated dm --svgs arg in infra/bots/recipes/test.py to add "svg" subdirectory (relative to corpus asset root). - Ran 'make train' in infra/bots/ Bug: skia:11229 Change-Id: I4e3c5da5945ee7ee4034ec453fdeb84c5fa08394 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/361560 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2021-02-01 14:30:03 +00:00
"@@@STEP_LOG_LINE@dm.sh@set -x; LD_LIBRARY_PATH=/data/local/tmp/ /data/local/tmp/dm --example --flags --properties bot skia-bot-123 key1 value1 task 123456 --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --svgs /sdcard/revenge_of_the_skiabot/svgs/svg --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out; echo $? >/data/local/tmp/rc@@@",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"@@@STEP_LOG_END@dm.sh@@@"
]
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/tmp/dm.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 dm.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/",
"dm.sh"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "dm",
"~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": [],
"name": "adb pull"
},
{
"cmd": [
"/usr/bin/adb.1.0.35",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
"[CLEANUP]/adb_pull_tmp_1"
],
"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": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"glob",
"[CLEANUP]/adb_pull_tmp_1",
"dm_out/*"
],
"infra_step": true,
"name": "adb pull.list pulled files",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@",
"@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[CLEANUP]/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": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[CLEANUP]/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@@@"
]
},
[infra] Remove Upload tasks for Test.* jobs using the default recipe. Bug: skia:11785 Change-Id: Ie66d0c49c978c02c23412b6525ee5d5e94f5d5d1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388137 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2021-03-25 15:49:12 +00:00
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"glob",
"[START_DIR]/[SWARM_OUT_DIR]",
"*.png"
],
"infra_step": true,
"name": "find .png images",
"~followup_annotations": [
"@@@STEP_LOG_LINE@glob@[START_DIR]/[SWARM_OUT_DIR]/someimage.png@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
{
"cmd": [
"gsutil",
"-m",
"cp",
"[START_DIR]/[SWARM_OUT_DIR]/*.png",
"gs://skia-infra-gm/dm-images-v1"
],
"name": "upload .png images"
},
{
"cmd": [
"gsutil",
"cp",
"-Z",
"[START_DIR]/[SWARM_OUT_DIR]/dm.json",
"gs://skia-infra-gm/trybot/dm-json-v1/2012/05/14/12/1234_7/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android/1337000001/dm.json"
],
"name": "upload dm.json"
},
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
{
"cmd": [
"python",
"-u",
[infra] Handle failure from addr2line An error from addr2line (e.g. unknown binary type) can truncate the output, hiding the remainder of the stack trace. Instead print the original line. Change-Id: I563aae4333a79a17560378e399e79b60c79f9ac7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261288 Commit-Queue: Kevin Lubick <kjlubick@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2019-12-21 00:06:12 +00:00
"\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 try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print line\n",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"[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):@@@",
[infra] Handle failure from addr2line An error from addr2line (e.g. unknown binary type) can truncate the output, hiding the remainder of the stack trace. Instead print the original line. Change-Id: I563aae4333a79a17560378e399e79b60c79f9ac7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261288 Commit-Queue: Kevin Lubick <kjlubick@google.com> Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2019-12-21 00:06:12 +00:00
"@@@STEP_LOG_LINE@python.inline@ try:@@@",
"@@@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@ except subprocess.CalledProcessError:@@@",
"@@@STEP_LOG_LINE@python.inline@ pass@@@",
Fix precompiling shaders on GLES / Android We need to specify attribute locations and (sometimes) frag shader output locations. Desktop GL worked fine without this, but Flutter ran into this problem, and a Pixel 2 reproduced the issue. Note that both APIs (BindFragDataLocation and BindAttribLocation) don't take effect until the next time the program is linked, so we have to relink the program after applying those changes. I was afraid that re-linking would eliminate the perf benefits of pre-compiling the shaders, but (at least on Pixel 2) that's not the case. I traced the life of a single program, and the initial link (during precompile) was 4.4 ms. The re-link took 0.23 ms. Change-Id: Iadb3b425a8cf9f6a52e015c2e37f875c0fd73d6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241758 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-16 16:38:04 +00:00
"@@@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"
},
{
"name": "$result"
}
]
Reference in New Issue Copy Permalink