304e6745dc
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
213 lines
6.2 KiB
JSON
213 lines
6.2 KiB
JSON
[
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION",
|
|
"/path/to/tmp/"
|
|
],
|
|
"name": "Get downloaded SKP VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"42",
|
|
"[SLAVE_BUILD]\\tmp\\SKP_VERSION"
|
|
],
|
|
"name": "write SKP_VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
|
|
"/path/to/tmp/"
|
|
],
|
|
"name": "Get downloaded skimage VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"42",
|
|
"[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION"
|
|
],
|
|
"name": "write SK_IMAGE_VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION",
|
|
"/path/to/tmp/"
|
|
],
|
|
"name": "Get downloaded SVG VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"42",
|
|
"[SLAVE_BUILD]\\tmp\\SVG_VERSION"
|
|
],
|
|
"name": "write SVG_VERSION"
|
|
},
|
|
{
|
|
"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]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data"
|
|
],
|
|
"env": {
|
|
"PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts"
|
|
},
|
|
"name": "rmtree data",
|
|
"~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@@@@",
|
|
"@@@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]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data",
|
|
"511"
|
|
],
|
|
"name": "makedirs data",
|
|
"~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": [
|
|
"[SLAVE_BUILD]\\out\\Release_x64\\nanobench",
|
|
"--undefok",
|
|
"-i",
|
|
"[SLAVE_BUILD]\\skia\\resources",
|
|
"--skps",
|
|
"[SLAVE_BUILD]\\skp",
|
|
"--svgs",
|
|
"[SLAVE_BUILD]\\svg",
|
|
"--images",
|
|
"[SLAVE_BUILD]\\skimage\\nanobench",
|
|
"--nogpu",
|
|
"--pre_log",
|
|
"--scales",
|
|
"1.0",
|
|
"1.1",
|
|
"--config",
|
|
"8888",
|
|
"gpu",
|
|
"nonrendering",
|
|
"angle",
|
|
"hwui",
|
|
"f16",
|
|
"srgb",
|
|
"565",
|
|
"msaa16",
|
|
"nvpr16",
|
|
"nvprdit16",
|
|
"--match",
|
|
"~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",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data\\nanobench_abc123.json",
|
|
"--properties",
|
|
"gitHash",
|
|
"abc123",
|
|
"build_number",
|
|
"5",
|
|
"--key",
|
|
"arch",
|
|
"x86_64",
|
|
"compiler",
|
|
"MSVC",
|
|
"cpu_or_gpu",
|
|
"CPU",
|
|
"cpu_or_gpu_value",
|
|
"AVX2",
|
|
"model",
|
|
"GCE",
|
|
"os",
|
|
"Win"
|
|
],
|
|
"env": {
|
|
"BUILDTYPE": "Release_x64",
|
|
"CHROME_HEADLESS": "1",
|
|
"SKIA_OUT": "[SLAVE_BUILD]\\out"
|
|
},
|
|
"name": "nanobench"
|
|
},
|
|
{
|
|
"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]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data",
|
|
"511"
|
|
],
|
|
"name": "makedirs perf_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@@@"
|
|
]
|
|
},
|
|
{
|
|
"name": "$result",
|
|
"recipe_result": null,
|
|
"status_code": 0
|
|
}
|
|
] |