infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json - Issue 2352653002: GN: remove old Android recipe code.

Unified Diff: infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json

Issue 2352653002: GN: remove old Android recipe code. (Closed)

Patch Set: missing json Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « infra/bots/recipes/swarm_perf.py ('k') | infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json

diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json

similarity index 60%

copy from infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json

copy to infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json

index 4f17e4dd85650b3767cc378f21e556823c05e298..b0acf416cb14f75f562e0ec18455ce541d907b19 100644

--- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json

+++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json

@@ -350,174 +350,33 @@

{

"cmd": [

- "python",

- "-u",

- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",

- "[CUSTOM_[SWARM_OUT_DIR]]/dm"

- ],

- "env": {

- "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"

- },

- "name": "rmtree dm",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",

- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",

- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",

- "@@@STEP_LOG_END@python.inline@@@"

- ]

- },

- {

- "cmd": [

- "python",

- "-u",

- "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",

- "[CUSTOM_[SWARM_OUT_DIR]]/dm",

- "511"

- ],

- "name": "makedirs dm",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",

- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",

- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",

- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",

- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",

- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",

- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",

- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",

- "@@@STEP_LOG_END@python.inline@@@"

- ]

- },

- {

- "cmd": [

- "adb",

- "shell",

- "rm",

- "-rf",

- "/sdcard/revenge_of_the_skiabot/dm_out"

- ],

- "cwd": "[SLAVE_BUILD]/skia",

- "name": "rm /sdcard/revenge_of_the_skiabot/dm_out"

- },

- {

- "cmd": [

- "adb",

- "shell",

- "mkdir",

- "-p",

- "/sdcard/revenge_of_the_skiabot/dm_out"

- ],

- "cwd": "[SLAVE_BUILD]/skia",

- "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out"

- },

- {

- "cmd": [

- "python",

- "-u",

- "[SLAVE_BUILD]/tmp",

- "511"

- ],

- "name": "makedirs tmp_dir",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",

- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",

- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",

- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",

- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",

- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",

- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",

- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",

- "@@@STEP_LOG_END@python.inline@@@"

- ]

- },

- {

- "cmd": [

- "python",

- "-u",

- "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\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[1], '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",

- "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt"

- ],

- "cwd": "[SLAVE_BUILD]/skia",

- "name": "get uninteresting hashes",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",

- "@@@STEP_LOG_LINE@python.inline@import math@@@",

- "@@@STEP_LOG_LINE@python.inline@import socket@@@",

- "@@@STEP_LOG_LINE@python.inline@import sys@@@",

- "@@@STEP_LOG_LINE@python.inline@import time@@@",

- "@@@STEP_LOG_LINE@python.inline@import urllib2@@@",

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://gold.skia.org/_/hashes'@@@",

- "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@",

- "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@",

- "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@",

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@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[1], '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)@@@",

- "@@@STEP_LOG_END@python.inline@@@"

- ]

- },

- {

- "cmd": [

"adb",

"push",

- "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",

- "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt"

- ],

- "cwd": "[SLAVE_BUILD]/skia",

- "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt"

- },

- {

- "cmd": [

- "adb",

- "push",

- "[SLAVE_BUILD]/out/Release/dm",

+ "[SLAVE_BUILD]/out/Debug/nanobench",

"/data/local/tmp/"

"cwd": "[SLAVE_BUILD]/skia",

- "name": "push dm"

+ "name": "push nanobench"

{

"cmd": [

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "set -x; /data/local/tmp/dm --undefok --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 --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value MT6582 extra_config GN_Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 gpu gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut --match ~WritePixels; echo $? >/data/local/tmp/rc",

- "[SLAVE_BUILD]/tmp/dm.sh"

+ "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config vk --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc",

+ "[SLAVE_BUILD]/tmp/nanobench.sh"

- "name": "write dm.sh"

+ "name": "write nanobench.sh"

{

"cmd": [

"adb",

"push",

- "[SLAVE_BUILD]/tmp/dm.sh",

+ "[SLAVE_BUILD]/tmp/nanobench.sh",

"/data/local/tmp/"

"cwd": "[SLAVE_BUILD]/skia",

- "name": "push dm.sh"

+ "name": "push nanobench.sh"

{

"cmd": [

@@ -534,9 +393,9 @@

"-u",

"\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n",

"/data/local/tmp/",

- "dm.sh"

+ "nanobench.sh"

- "name": "dm",

+ "name": "nanobench",

"~followup_annotations": [

"@@@STEP_LOG_LINE@python.inline@@@@",

"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",

@@ -556,16 +415,6 @@

{

"cmd": [

"adb",

- "pull",

- "/sdcard/revenge_of_the_skiabot/dm_out",

- "[CUSTOM_[SWARM_OUT_DIR]]/dm"

- ],

- "cwd": "[SLAVE_BUILD]/skia",

- "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm"

- },

- {

- "cmd": [

- "adb",

"logcat",

"-d"