Reland of Run SVGs through nanobench on all Perf bots (patchset #1 id:1 of https://codereview.chromium.org/2348563003/ )

Reason for revert:
skbug/5770 has been fixed.
Trying out trybots to see if this can be relanded.

Original issue's description:
> Revert of Run SVGs through nanobench on all Perf bots (patchset #5 id:120001 of https://codereview.chromium.org/2343903002/ )
>
> Reason for revert:
> Causing failures:
> https://uberchromegw.corp.google.com/i/client.skia/builders/Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN/builds/812
>
> Original issue's description:
> > Run SVGs through nanobench on all Perf bots.
> >
> > Tested with:
> > python infra/bots/recipes.py run --workdir=../ swarm_trigger path_config=kitchen buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN-Trybot mastername=client.skia slavename=skiabot-linux-swarm-010 buildnumber=1 revision=d8c2476a8b1e1e1a1771b17e8dd4db8645914f8c issue=2343903002 rietveld=https://codereview.chromium.org patchset=80001
> >
> > Example output is here:
> > https://luci-milo.appspot.com/swarming/task/3147c9789b2d0410
> > Nanobench did run on SVGs.
> >
> > BUG=skia:5757
> > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2343903002
> >
> > Committed: https://skia.googlesource.com/skia/+/1c58dcb909642454d91ba36f71e55597511b5d52
>
> TBR=jcgregorio@google.com,fmalita@chromium.org,mtklein@google.com
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:5757
>
> Committed: https://skia.googlesource.com/skia/+/be7e3c0db3caa7a86ae233a6bd26281817b83882

TBR=jcgregorio@google.com,fmalita@chromium.org,mtklein@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:5757
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2350233002

Review-Url: https://codereview.chromium.org/2350233002
This commit is contained in:
rmistry 2016-09-19 13:44:25 -07:00 committed by Commit bot
parent 12c7563d7e
commit 304e6745dc
16 changed files with 30 additions and 5 deletions

View File

@ -363,7 +363,7 @@
"python", "python",
"-u", "-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"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", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --svgs /sdcard/revenge_of_the_skiabot/svgs --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" "[SLAVE_BUILD]/tmp/nanobench.sh"
], ],
"name": "write nanobench.sh" "name": "write nanobench.sh"

View File

@ -363,7 +363,7 @@
"python", "python",
"-u", "-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"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 8888 gpu nonrendering angle hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~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", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --svgs /sdcard/revenge_of_the_skiabot/svgs --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 8888 gpu nonrendering angle hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~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" "[SLAVE_BUILD]/tmp/nanobench.sh"
], ],
"name": "write nanobench.sh" "name": "write nanobench.sh"

View File

@ -385,7 +385,7 @@
"python", "python",
"-u", "-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"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 8888 gpu nonrendering angle hwui f16 srgb msaa4 nvpr4 nvprdit4 esinst --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android; echo $? >/data/local/tmp/rc", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --svgs /sdcard/revenge_of_the_skiabot/svgs --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 8888 gpu nonrendering angle hwui f16 srgb msaa4 nvpr4 nvprdit4 esinst --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android; echo $? >/data/local/tmp/rc",
"[SLAVE_BUILD]/tmp/nanobench.sh" "[SLAVE_BUILD]/tmp/nanobench.sh"
], ],
"name": "write nanobench.sh" "name": "write nanobench.sh"

View File

@ -385,7 +385,7 @@
"python", "python",
"-u", "-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"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 8888 gpu nonrendering angle hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android; echo $? >/data/local/tmp/rc", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --svgs /sdcard/revenge_of_the_skiabot/svgs --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 8888 gpu nonrendering angle hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android; echo $? >/data/local/tmp/rc",
"[SLAVE_BUILD]/tmp/nanobench.sh" "[SLAVE_BUILD]/tmp/nanobench.sh"
], ],
"name": "write nanobench.sh" "name": "write nanobench.sh"

View File

@ -385,7 +385,7 @@
"python", "python",
"-u", "-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"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 8888 gpu nonrendering angle hwui f16 srgb --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~interlaced1.png ~interlaced2.png ~interlaced3.png ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123.json --properties gitHash abc123 build_number 5 --key arch x86 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config GN_Android model NexusPlayer os Android; echo $? >/data/local/tmp/rc", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --svgs /sdcard/revenge_of_the_skiabot/svgs --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 8888 gpu nonrendering angle hwui f16 srgb --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~interlaced1.png ~interlaced2.png ~interlaced3.png ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123.json --properties gitHash abc123 build_number 5 --key arch x86 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config GN_Android model NexusPlayer os Android; echo $? >/data/local/tmp/rc",
"[SLAVE_BUILD]/tmp/nanobench.sh" "[SLAVE_BUILD]/tmp/nanobench.sh"
], ],
"name": "write nanobench.sh" "name": "write nanobench.sh"

View File

@ -111,6 +111,8 @@
"[SLAVE_BUILD]/skia/resources", "[SLAVE_BUILD]/skia/resources",
"--skps", "--skps",
"[SLAVE_BUILD]/skp", "[SLAVE_BUILD]/skp",
"--svgs",
"[SLAVE_BUILD]/svg",
"--images", "--images",
"[SLAVE_BUILD]/skimage/nanobench", "[SLAVE_BUILD]/skimage/nanobench",
"--nogpu", "--nogpu",

View File

@ -112,6 +112,8 @@
"[SLAVE_BUILD]/skia/resources", "[SLAVE_BUILD]/skia/resources",
"--skps", "--skps",
"[SLAVE_BUILD]/skp", "[SLAVE_BUILD]/skp",
"--svgs",
"[SLAVE_BUILD]/svg",
"--images", "--images",
"[SLAVE_BUILD]/skimage/nanobench", "[SLAVE_BUILD]/skimage/nanobench",
"--nogpu", "--nogpu",

View File

@ -118,6 +118,8 @@
"[SLAVE_BUILD]/skia/resources", "[SLAVE_BUILD]/skia/resources",
"--skps", "--skps",
"[SLAVE_BUILD]/skp", "[SLAVE_BUILD]/skp",
"--svgs",
"[SLAVE_BUILD]/svg",
"--images", "--images",
"[SLAVE_BUILD]/skimage/nanobench", "[SLAVE_BUILD]/skimage/nanobench",
"--nocpu", "--nocpu",
@ -213,6 +215,8 @@
"[SLAVE_BUILD]/skia/resources", "[SLAVE_BUILD]/skia/resources",
"--skps", "--skps",
"[SLAVE_BUILD]/skp", "[SLAVE_BUILD]/skp",
"--svgs",
"[SLAVE_BUILD]/svg",
"--images", "--images",
"[SLAVE_BUILD]/skimage/nanobench", "[SLAVE_BUILD]/skimage/nanobench",
"--nocpu", "--nocpu",

View File

@ -112,6 +112,8 @@
"[SLAVE_BUILD]/skia/resources", "[SLAVE_BUILD]/skia/resources",
"--skps", "--skps",
"[SLAVE_BUILD]/skp", "[SLAVE_BUILD]/skp",
"--svgs",
"[SLAVE_BUILD]/svg",
"--images", "--images",
"[SLAVE_BUILD]/skimage/nanobench", "[SLAVE_BUILD]/skimage/nanobench",
"--nocpu", "--nocpu",

View File

@ -67,6 +67,8 @@
"[SLAVE_BUILD]\\skia\\resources", "[SLAVE_BUILD]\\skia\\resources",
"--skps", "--skps",
"[SLAVE_BUILD]\\skp", "[SLAVE_BUILD]\\skp",
"--svgs",
"[SLAVE_BUILD]\\svg",
"--images", "--images",
"[SLAVE_BUILD]\\skimage\\nanobench", "[SLAVE_BUILD]\\skimage\\nanobench",
"--nogpu", "--nogpu",

View File

@ -111,6 +111,8 @@
"[SLAVE_BUILD]\\skia\\resources", "[SLAVE_BUILD]\\skia\\resources",
"--skps", "--skps",
"[SLAVE_BUILD]\\skp", "[SLAVE_BUILD]\\skp",
"--svgs",
"[SLAVE_BUILD]\\svg",
"--images", "--images",
"[SLAVE_BUILD]\\skimage\\nanobench", "[SLAVE_BUILD]\\skimage\\nanobench",
"--nogpu", "--nogpu",

View File

@ -111,6 +111,8 @@
"[SLAVE_BUILD]\\skia\\resources", "[SLAVE_BUILD]\\skia\\resources",
"--skps", "--skps",
"[SLAVE_BUILD]\\skp", "[SLAVE_BUILD]\\skp",
"--svgs",
"[SLAVE_BUILD]\\svg",
"--images", "--images",
"[SLAVE_BUILD]\\skimage\\nanobench", "[SLAVE_BUILD]\\skimage\\nanobench",
"--nocpu", "--nocpu",

View File

@ -337,6 +337,8 @@
"skiabot/skia_resources", "skiabot/skia_resources",
"--skps", "--skps",
"skiabot/skia_skp/skps", "skiabot/skia_skp/skps",
"--svgs",
"skiabot/skia_svg/svgs",
"--images", "--images",
"skiabot/skia_images/nanobench", "skiabot/skia_images/nanobench",
"--nocpu", "--nocpu",

View File

@ -111,6 +111,8 @@
"[SLAVE_BUILD]\\skia\\resources", "[SLAVE_BUILD]\\skia\\resources",
"--skps", "--skps",
"[SLAVE_BUILD]\\skp", "[SLAVE_BUILD]\\skp",
"--svgs",
"[SLAVE_BUILD]\\svg",
"--images", "--images",
"[SLAVE_BUILD]\\skimage\\nanobench", "[SLAVE_BUILD]\\skimage\\nanobench",
"--nocpu", "--nocpu",

View File

@ -140,6 +140,8 @@
"[SLAVE_BUILD]/skia/resources", "[SLAVE_BUILD]/skia/resources",
"--skps", "--skps",
"[SLAVE_BUILD]/skp", "[SLAVE_BUILD]/skp",
"--svgs",
"[SLAVE_BUILD]/svg",
"--images", "--images",
"[SLAVE_BUILD]/skimage/nanobench", "[SLAVE_BUILD]/skimage/nanobench",
"--nocpu", "--nocpu",
@ -241,6 +243,8 @@
"[SLAVE_BUILD]/skia/resources", "[SLAVE_BUILD]/skia/resources",
"--skps", "--skps",
"[SLAVE_BUILD]/skp", "[SLAVE_BUILD]/skp",
"--svgs",
"[SLAVE_BUILD]/svg",
"--images", "--images",
"[SLAVE_BUILD]/skimage/nanobench", "[SLAVE_BUILD]/skimage/nanobench",
"--nocpu", "--nocpu",

View File

@ -183,6 +183,7 @@ def perf_steps(api):
'--undefok', # This helps branches that may not know new flags. '--undefok', # This helps branches that may not know new flags.
'-i', api.flavor.device_dirs.resource_dir, '-i', api.flavor.device_dirs.resource_dir,
'--skps', api.flavor.device_dirs.skp_dir, '--skps', api.flavor.device_dirs.skp_dir,
'--svgs', api.flavor.device_dirs.svg_dir,
'--images', api.flavor.device_path_join( '--images', api.flavor.device_path_join(
api.flavor.device_dirs.images_dir, 'nanobench'), api.flavor.device_dirs.images_dir, 'nanobench'),
] ]