Disable ANGLE GL backed on windows perf bots
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3501 Change-Id: I0e3a166cd07560501cb350b780e264c274c81601 Reviewed-on: https://skia-review.googlesource.com/3501 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Brian Salomon
parent
dd4645b305
commit
f61abec299
@ -0,0 +1,215 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"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-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE/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-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE/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": [
|
||||||
|
"catchsegv",
|
||||||
|
"[SLAVE_BUILD]/out/Release/nanobench",
|
||||||
|
"--undefok",
|
||||||
|
"-i",
|
||||||
|
"[SLAVE_BUILD]/skia/resources",
|
||||||
|
"--skps",
|
||||||
|
"[SLAVE_BUILD]/skp",
|
||||||
|
"--images",
|
||||||
|
"[SLAVE_BUILD]/skimage/nanobench",
|
||||||
|
"--svgs",
|
||||||
|
"[SLAVE_BUILD]/svg",
|
||||||
|
"--nocpu",
|
||||||
|
"--pre_log",
|
||||||
|
"--images",
|
||||||
|
"--gpuStatsDump",
|
||||||
|
"true",
|
||||||
|
"--scales",
|
||||||
|
"1.0",
|
||||||
|
"1.1",
|
||||||
|
"--config",
|
||||||
|
"8888",
|
||||||
|
"gpu",
|
||||||
|
"nonrendering",
|
||||||
|
"hwui",
|
||||||
|
"f16",
|
||||||
|
"srgb",
|
||||||
|
"msaa16",
|
||||||
|
"nvpr16",
|
||||||
|
"nvprdit16",
|
||||||
|
"angle_d3d11_es2",
|
||||||
|
"angle_gl_es2",
|
||||||
|
"--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-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE/data/nanobench_abc123_1337000001.json",
|
||||||
|
"--properties",
|
||||||
|
"gitHash",
|
||||||
|
"abc123",
|
||||||
|
"build_number",
|
||||||
|
"5",
|
||||||
|
"--key",
|
||||||
|
"arch",
|
||||||
|
"x86_64",
|
||||||
|
"compiler",
|
||||||
|
"GCC",
|
||||||
|
"cpu_or_gpu",
|
||||||
|
"GPU",
|
||||||
|
"cpu_or_gpu_value",
|
||||||
|
"GTX550Ti",
|
||||||
|
"extra_config",
|
||||||
|
"ANGLE",
|
||||||
|
"model",
|
||||||
|
"ShuttleA",
|
||||||
|
"os",
|
||||||
|
"Ubuntu"
|
||||||
|
],
|
||||||
|
"cwd": "[SLAVE_BUILD]/skia",
|
||||||
|
"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-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE/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
|
||||||
|
}
|
||||||
|
]
|
||||||
@ -89,7 +89,6 @@
|
|||||||
"msaa16",
|
"msaa16",
|
||||||
"nvpr16",
|
"nvpr16",
|
||||||
"nvprdit16",
|
"nvprdit16",
|
||||||
"angle_gl_es2",
|
|
||||||
"angle_d3d11_es2",
|
"angle_d3d11_es2",
|
||||||
"--match",
|
"--match",
|
||||||
"~interlaced1.png",
|
"~interlaced1.png",
|
||||||
|
|||||||
@ -35,6 +35,7 @@ TEST_BUILDERS = {
|
|||||||
'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN',
|
'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN',
|
||||||
'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
|
'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
|
||||||
'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench',
|
'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench',
|
||||||
|
'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE',
|
||||||
'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug',
|
'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug',
|
||||||
'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release',
|
'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release',
|
||||||
'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
|
'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
|
||||||
@ -97,7 +98,10 @@ def nanobench_flags(bot):
|
|||||||
config = ['vk']
|
config = ['vk']
|
||||||
|
|
||||||
if 'ANGLE' in bot:
|
if 'ANGLE' in bot:
|
||||||
config.extend(['angle_gl_es2', 'angle_d3d11_es2'])
|
config.extend(['angle_d3d11_es2'])
|
||||||
|
# The GL backend of ANGLE crashes on the perf bot currently.
|
||||||
|
if 'Win' not in bot:
|
||||||
|
config.extend(['angle_gl_es2'])
|
||||||
|
|
||||||
args.append('--config')
|
args.append('--config')
|
||||||
args.extend(config)
|
args.extend(config)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user