Commit 1fede15c authored by Geoff Lang's avatar Geoff Lang Committed by Commit Bot

Run WebGL2 conformance tests on Mac with the passthrough command decoder.

Adds these tests to the chromium.gpu.fyi bots only, and not trybots yet,
due to lack of capacity.

BUG=982294

Change-Id: I3332c981c4102577aaf1d16af29b3cd351637bd3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1839031
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704870}
parent cb0d667a
...@@ -11798,6 +11798,39 @@ ...@@ -11798,6 +11798,39 @@
"idempotent": false "idempotent": false
} }
}, },
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough --force_high_performance_gpu",
"--webgl-conformance-version=2.0.1",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl2_conformance_gl_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "1002:6821",
"os": "Mac-10.14.6",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false,
"shards": 20
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -12387,6 +12420,38 @@ ...@@ -12387,6 +12420,38 @@
"idempotent": false "idempotent": false
} }
}, },
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough --force_high_performance_gpu",
"--webgl-conformance-version=2.0.1",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl2_conformance_gl_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.14.6"
}
],
"expiration": 21600,
"idempotent": false,
"shards": 20
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -12991,6 +13056,39 @@ ...@@ -12991,6 +13056,39 @@
"idempotent": false "idempotent": false
} }
}, },
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough --force_high_performance_gpu",
"--webgl-conformance-version=2.0.1",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl2_conformance_gl_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:0fe9",
"os": "Mac-10.14.6",
"pool": "Chrome-GPU"
}
],
"expiration": 21600,
"idempotent": false,
"shards": 20
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -14217,6 +14315,43 @@ ...@@ -14217,6 +14315,43 @@
"idempotent": false "idempotent": false
} }
}, },
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough --force_high_performance_gpu",
"--webgl-conformance-version=2.0.1",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl2_conformance_gl_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "mac-intel-stable"
},
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 20
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -14825,6 +14960,37 @@ ...@@ -14825,6 +14960,37 @@
"idempotent": false "idempotent": false
} }
}, },
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough --force_high_performance_gpu",
"--webgl-conformance-version=2.0.1",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl2_conformance_gl_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "mac-intel-stable"
}
],
"idempotent": false,
"shards": 20
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -16454,6 +16620,39 @@ ...@@ -16454,6 +16620,39 @@
"idempotent": false "idempotent": false
} }
}, },
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough --force_high_performance_gpu",
"--webgl-conformance-version=2.0.1",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl2_conformance_gl_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "mac-amd-stable",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 20
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
......
...@@ -1722,6 +1722,9 @@ ...@@ -1722,6 +1722,9 @@
'remove_from': [ 'remove_from': [
# Not enough capacity. https://crbug.com/946694 # Not enough capacity. https://crbug.com/946694
'ANGLE GPU Win10 x64 Release (Intel HD 630)', 'ANGLE GPU Win10 x64 Release (Intel HD 630)',
# Not enough capacity. https://crbug.com/982294
'Mac Pro FYI Release (AMD)',
'Mac FYI Retina Release (NVIDIA)',
], ],
}, },
'webgl2_conformance_tests': { 'webgl2_conformance_tests': {
......
...@@ -5695,6 +5695,7 @@ ...@@ -5695,6 +5695,7 @@
'gpu_telemetry_tests', 'gpu_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests', 'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests', 'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment