From fb98a9204d5f67062bd4d579c7e2870fd1e639fa Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 25 Jul 2018 13:49:32 +0000 Subject: Revert "Blacklist hanging test." This reverts commit e3e68cf14f6b202540717020e79fb53be4151c38. Reason for revert: The test was hanging due to https://skia-review.googlesource.com/c/skia/+/142102, which has been reverted. Original change's description: > Blacklist hanging test. > > Blacklist gr_mipmap_build_511x512 for nanobench on the Acer Chromebook > R13 Convertible to avoid timeouts for Release build. > > Bug: skia:8187 > No-Try: true > Change-Id: Ic63fb705a6a6cc6576978c96a8dd5206dc59ba0d > Reviewed-on: https://skia-review.googlesource.com/143162 > Commit-Queue: Brian Osman > Auto-Submit: Ben Wagner > Reviewed-by: Brian Osman TBR=benjaminwagner@google.com,brianosman@google.com Change-Id: Id5144f1ada6d2059e473a2891816775ea7fe2663 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:8187 Reviewed-on: https://skia-review.googlesource.com/143320 Reviewed-by: Ben Wagner Commit-Queue: Ben Wagner --- ...vertible-GPU-PowerVRGX6250-arm-Release-All.json | 833 --------------------- infra/bots/recipes/perf.py | 4 - 2 files changed, 837 deletions(-) delete mode 100644 infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All.json diff --git a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All.json b/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All.json deleted file mode 100644 index e9a2af5e5c..0000000000 --- a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All.json +++ /dev/null @@ -1,833 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/tmp" - ], - "infra_step": true, - "name": "makedirs tmp_dir" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nSSH_MACHINE_FILE = os.path.expanduser('~/ssh_machine.json')\nwith open(SSH_MACHINE_FILE, 'r') as f:\n print f.read()\n" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "read chromeos ip", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@SSH_MACHINE_FILE = os.path.expanduser('~/ssh_machine.json')@@@", - "@@@STEP_LOG_LINE@python.inline@with open(SSH_MACHINE_FILE, 'r') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ print f.read()@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "mkdir", - "-p", - "/home/chronos/user/resources" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /home/chronos/user/resources" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "sudo", - "mount", - "-i", - "-o", - "remount,exec", - "/home/chronos" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "remount /home/chronos/user/ as exec" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "rm", - "-rf", - "/home/chronos/user/bin" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /home/chronos/user/bin" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "mkdir", - "-p", - "/home/chronos/user/bin" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /home/chronos/user/bin" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", - "[START_DIR]/skia/resources", - "foo@127.0.0.1:/home/chronos/user/resources" - ], - "infra_step": true, - "name": "scp -r [START_DIR]/skia/resources foo@127.0.0.1:/home/chronos/user/resources", - "~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@src = sys.argv[1] + '/*'@@@", - "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get skp VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "infra_step": true, - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "cat", - "/home/chronos/user/SKP_VERSION" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "read /home/chronos/user/SKP_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "rm", - "-f", - "/home/chronos/user/SKP_VERSION" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /home/chronos/user/SKP_VERSION" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "rm", - "-rf", - "/home/chronos/user/skps" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /home/chronos/user/skps" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "mkdir", - "-p", - "/home/chronos/user/skps" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /home/chronos/user/skps" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", - "[START_DIR]/skp", - "foo@127.0.0.1:/home/chronos/user/skps" - ], - "infra_step": true, - "name": "scp -r [START_DIR]/skp foo@127.0.0.1:/home/chronos/user/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@src = sys.argv[1] + '/*'@@@", - "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n", - "[START_DIR]/tmp/SKP_VERSION", - "foo@127.0.0.1:/home/chronos/user/SKP_VERSION" - ], - "infra_step": true, - "name": "scp [START_DIR]/tmp/SKP_VERSION foo@127.0.0.1:/home/chronos/user/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@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print subprocess.check_output(['scp', host, device])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "infra_step": true, - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "cat", - "/home/chronos/user/SK_IMAGE_VERSION" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "read /home/chronos/user/SK_IMAGE_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "rm", - "-f", - "/home/chronos/user/SK_IMAGE_VERSION" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /home/chronos/user/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "rm", - "-rf", - "/home/chronos/user/images" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /home/chronos/user/images" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "mkdir", - "-p", - "/home/chronos/user/images" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /home/chronos/user/images" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", - "[START_DIR]/skimage", - "foo@127.0.0.1:/home/chronos/user/images" - ], - "infra_step": true, - "name": "scp -r [START_DIR]/skimage foo@127.0.0.1:/home/chronos/user/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@src = sys.argv[1] + '/*'@@@", - "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n", - "[START_DIR]/tmp/SK_IMAGE_VERSION", - "foo@127.0.0.1:/home/chronos/user/SK_IMAGE_VERSION" - ], - "infra_step": true, - "name": "scp [START_DIR]/tmp/SK_IMAGE_VERSION foo@127.0.0.1:/home/chronos/user/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@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print subprocess.check_output(['scp', host, device])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get svg VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "infra_step": true, - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "cat", - "/home/chronos/user/SVG_VERSION" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "read /home/chronos/user/SVG_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "rm", - "-f", - "/home/chronos/user/SVG_VERSION" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /home/chronos/user/SVG_VERSION" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "rm", - "-rf", - "/home/chronos/user/svgs" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /home/chronos/user/svgs" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "mkdir", - "-p", - "/home/chronos/user/svgs" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /home/chronos/user/svgs" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", - "[START_DIR]/svg", - "foo@127.0.0.1:/home/chronos/user/svgs" - ], - "infra_step": true, - "name": "scp -r [START_DIR]/svg foo@127.0.0.1:/home/chronos/user/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@src = sys.argv[1] + '/*'@@@", - "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n", - "[START_DIR]/tmp/SVG_VERSION", - "foo@127.0.0.1:/home/chronos/user/SVG_VERSION" - ], - "infra_step": true, - "name": "scp [START_DIR]/tmp/SVG_VERSION foo@127.0.0.1:/home/chronos/user/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@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print subprocess.check_output(['scp', host, device])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "rm", - "-rf", - "/home/chronos/user/perf" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /home/chronos/user/perf" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "mkdir", - "-p", - "/home/chronos/user/perf" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /home/chronos/user/perf" - }, - { - "cmd": [ - "python", - "-u", - "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" - ], - "name": "get swarming bot id", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" - ], - "name": "get swarming task id", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rmtree [SWARM_OUT_DIR]" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "makedirs [SWARM_OUT_DIR]" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n", - "[START_DIR]/build/nanobench", - "foo@127.0.0.1:/home/chronos/user/bin/nanobench" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "scp [START_DIR]/build/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print subprocess.check_output(['scp', host, device])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "chmod", - "+x", - "/home/chronos/user/bin/nanobench" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "chmod nanobench" - }, - { - "cmd": [ - "ssh", - "-oConnectTimeout=15", - "-oBatchMode=yes", - "-t", - "-t", - "foo@127.0.0.1", - "/home/chronos/user/bin/nanobench", - "-i", - "/home/chronos/user/resources", - "--skps", - "/home/chronos/user/skps", - "--images", - "/home/chronos/user/images/nanobench", - "--svgs", - "/home/chronos/user/svgs", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--nocpu", - "--config", - "gles", - "--match", - "~^gr_mipmap_build_511x512$", - "~inc0.gif", - "~inc1.gif", - "~incInterlaced.gif", - "~inc0.jpg", - "~incGray.jpg", - "~inc0.wbmp", - "~inc1.wbmp", - "~inc0.webp", - "~inc1.webp", - "~inc0.ico", - "~inc1.ico", - "~inc0.png", - "~inc1.png", - "~inc2.png", - "~inc12.png", - "~inc13.png", - "~inc14.png", - "~inc0.webp", - "~inc1.webp", - "--outResultsFile", - "/home/chronos/user/perf/nanobench_abc123_1337000001.json", - "--properties", - "gitHash", - "abc123", - "swarming_bot_id", - "skia-bot-123", - "swarming_task_id", - "123456", - "--key", - "arch", - "arm", - "compiler", - "Clang", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "PowerVRGX6250", - "model", - "AcerChromebookR13Convertible", - "os", - "ChromeOS" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "nanobench" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "infra_step": true, - "name": "makedirs perf_dir" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", - "foo@127.0.0.1:/home/chronos/user/perf", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "infra_step": true, - "name": "scp -r foo@127.0.0.1:/home/chronos/user/perf [START_DIR]/[SWARM_OUT_DIR]", - "~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@src = sys.argv[1] + '/*'@@@", - "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -] \ No newline at end of file diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index f812d4a0ed..9eadca5c5f 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -213,8 +213,6 @@ def nanobench_flags(api, bot): if ('ASAN' in bot or 'UBSAN' in bot) and 'CPU' in bot: # floor2int_undef benches undefined behavior, so ASAN correctly complains. match.append('~^floor2int_undef$') - if 'AcerChromebookR13Convertible' in bot and 'Release' in bot: - match.append('~^gr_mipmap_build_511x512$') # We do not need or want to benchmark the decodes of incomplete images. # In fact, in nanobench we assert that the full image decode succeeds. @@ -367,8 +365,6 @@ TEST_BUILDERS = [ 'Android_NoGPUThreads'), 'Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan', 'Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All', - ('Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm' - '-Release-All'), 'Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All', 'Perf-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All', 'Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN', -- cgit v1.2.3