aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2018-04-19 15:49:18 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-04-19 21:32:34 +0000
commit7464a262a22c1b27a47d042785f012b0d68540d4 (patch)
treeb51db414179b3dcedf5126594ce2497cc0eaa09a
parentd75b34394b5c53b0a5e8144dd28f956fbc8b90b2 (diff)
Add more angle_gl_* configs for NVIDIA.
Bug: skia:7823 Change-Id: I9fbf0875696661ca87b37cf8949bd5f0b48b314d Reviewed-on: https://skia-review.googlesource.com/122600 Commit-Queue: Brian Salomon <bsalomon@google.com> Auto-Submit: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
-rw-r--r--infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json239
-rw-r--r--infra/bots/recipes/perf.py6
-rw-r--r--infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json3
-rw-r--r--infra/bots/recipes/test.py6
-rw-r--r--tools/flags/SkCommonFlagsConfig.cpp2
5 files changed, 256 insertions, 0 deletions
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json
new file mode 100644
index 0000000000..b15557a211
--- /dev/null
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json
@@ -0,0 +1,239 @@
+[
+ {
+ "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": [
+ "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": [
+ "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": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\\data"
+ ],
+ "infra_step": true,
+ "name": "rmtree data"
+ },
+ {
+ "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]\\perfdata\\Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\\data"
+ ],
+ "infra_step": true,
+ "name": "makedirs data"
+ },
+ {
+ "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": [
+ "[START_DIR]\\build\\out\\Release_x64\\nanobench",
+ "-i",
+ "[START_DIR]\\skia\\resources",
+ "--skps",
+ "[START_DIR]\\skp",
+ "--images",
+ "[START_DIR]\\skimage\\nanobench",
+ "--svgs",
+ "[START_DIR]\\svg",
+ "--pre_log",
+ "--images",
+ "--gpuStatsDump",
+ "true",
+ "--scales",
+ "1.0",
+ "1.1",
+ "--nocpu",
+ "--config",
+ "angle_d3d11_es2",
+ "angle_d3d11_es2_msaa8",
+ "angle_gl_es2",
+ "angle_gl_es2_msaa8",
+ "--match",
+ "~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",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json",
+ "--properties",
+ "gitHash",
+ "abc123",
+ "swarming_bot_id",
+ "skia-bot-123",
+ "swarming_task_id",
+ "123456",
+ "--key",
+ "arch",
+ "x86_64",
+ "compiler",
+ "Clang",
+ "cpu_or_gpu",
+ "GPU",
+ "cpu_or_gpu_value",
+ "QuadroP400",
+ "extra_config",
+ "ANGLE",
+ "model",
+ "Golo",
+ "os",
+ "Win10"
+ ],
+ "env": {
+ "BUILDTYPE": "Release_x64",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]\\build\\out"
+ },
+ "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]\\perfdata\\Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
+ ],
+ "infra_step": true,
+ "name": "makedirs perf_dir"
+ },
+ {
+ "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 d023250801..2548265687 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -109,6 +109,11 @@ def nanobench_flags(api, bot):
configs = ['angle_d3d11_es2']
if sample_count is not '':
configs.append('angle_d3d11_es2_msaa' + sample_count)
+ if 'QuadroP400' in bot:
+ # See skia:7823 and chromium:693090.
+ configs.append('angle_gl_es2')
+ if sample_count is not '':
+ configs.append('angle_gl_es2_msaa' + sample_count)
if 'ChromeOS' in bot:
# Just run GLES for now - maybe add gles_msaa4 in the future
@@ -364,6 +369,7 @@ TEST_BUILDERS = [
'Valgrind_SK_CPU_LIMIT_SSE41'),
'Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE',
'Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan',
+ 'Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE',
'Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE',
'Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan',
'Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE',
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
index b567c1cf02..af54af6eb9 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
@@ -260,6 +260,9 @@
"angle_d3d11_es3",
"angle_d3d11_es2_msaa8",
"angle_d3d11_es3_msaa8",
+ "angle_gl_es3",
+ "angle_gl_es2_msaa8",
+ "angle_gl_es3_msaa8",
"--src",
"tests",
"gm",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 5e89abc604..35c92d7f2c 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -209,6 +209,12 @@ def dm_flags(api, bot):
if sample_count is not '':
configs.append('angle_d3d11_es2_msaa' + sample_count)
configs.append('angle_d3d11_es3_msaa' + sample_count)
+ if 'GTX' in bot or 'Quadro' in bot:
+ # See skia:7823 and chromium:693090.
+ configs.append('angle_gl_es3')
+ if sample_count is not '':
+ configs.append('angle_gl_es2_msaa' + sample_count)
+ configs.append('angle_gl_es3_msaa' + sample_count)
# Vulkan bot *only* runs the vk config.
if 'Vulkan' in bot:
diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp
index 663a0b2e00..f70505b662 100644
--- a/tools/flags/SkCommonFlagsConfig.cpp
+++ b/tools/flags/SkCommonFlagsConfig.cpp
@@ -80,6 +80,8 @@ static const struct {
{ "angle_d3d11_es3_msaa8", "gpu", "api=angle_d3d11_es3,samples=8" },
{ "angle_gl_es2", "gpu", "api=angle_gl_es2" },
{ "angle_gl_es3", "gpu", "api=angle_gl_es3" },
+ { "angle_gl_es2_msaa8", "gpu", "api=angle_gl_es2,samples=8" },
+ { "angle_gl_es3_msaa8", "gpu", "api=angle_gl_es3,samples=8" },
{ "commandbuffer", "gpu", "api=commandbuffer" },
{ "mock", "gpu", "api=mock" }
#ifdef SK_VULKAN