Commit ff5d9296 authored by Jonah Ryan-Davis's avatar Jonah Ryan-Davis Committed by Commit Bot

Enable metal webgl testing on ANGLE/optional/FYI Mac bots

We should enable webgl testing on these bots:
Optional CQ - Intel and AMD
ANGLE CQ - Intel and AMD
FYI - Intel, AMD, NVIDIA and ASAN

Bug: angleproject:4846
Change-Id: I6368808a15afcd4588676892cb8bf47c0da6b085
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302930
Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799375}
parent 8f878a8f
This diff is collapsed.
This diff is collapsed.
......@@ -18935,6 +18935,37 @@
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=metal --use-cmd-decoder=passthrough --force_high_performance_gpu",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl_conformance_metal_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.15.5"
}
],
"idempotent": false,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
},
{
"args": [
"webgl_conformance",
......
......@@ -3029,6 +3029,23 @@
},
},
'gpu_webgl_conformance_metal_passthrough_telemetry_tests': {
'webgl_conformance_metal_passthrough': {
'telemetry_test_name': 'webgl_conformance',
'args': [
# On dual-GPU devices we want the high-performance GPU to be active
'--extra-browser-args=--use-gl=angle --use-angle=metal --use-cmd-decoder=passthrough --force_high_performance_gpu',
# The current working directory when run via isolate is
# out/Debug or out/Release. Reference this file relatively to
# it.
'--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json',
],
'swarming': {
'shards': 3,
},
},
},
'gpu_webgl_conformance_swangle_passthrough_representative_telemetry_tests': {
'webgl_conformance_swangle_passthrough': {
'telemetry_test_name': 'webgl_conformance',
......@@ -4943,6 +4960,7 @@
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_metal_passthrough_telemetry_tests',
'gpu_webgl_conformance_swangle_passthrough_representative_telemetry_tests',
],
......@@ -5161,6 +5179,17 @@
'gpu_swiftshader_gtests',
],
'gpu_fyi_mac_pro_release_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_passthrough_telemetry_tests',
'gpu_validating_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_validating_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_validating_telemetry_tests',
'gpu_webgl_conformance_swangle_passthrough_representative_telemetry_tests',
],
'gpu_fyi_mac_release_gtests': [
'gpu_angle_end2end_gtests',
'gpu_angle_unit_gtests',
......@@ -5180,6 +5209,7 @@
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_validating_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_metal_passthrough_telemetry_tests',
'gpu_webgl_conformance_validating_telemetry_tests',
'gpu_webgl_conformance_swangle_passthrough_representative_telemetry_tests',
],
......@@ -5195,6 +5225,7 @@
'gpu_passthrough_telemetry_tests',
'gpu_webgl2_conformance_validating_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_metal_passthrough_telemetry_tests',
'gpu_webgl_conformance_swangle_passthrough_representative_telemetry_tests',
# Not currently running
# gpu_webgl2_conformance_gl_passthrough_telemetry_tests here due
......
......@@ -3677,7 +3677,7 @@
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_mac_release_telemetry_tests',
'gpu_telemetry_tests': 'gpu_fyi_mac_pro_release_telemetry_tests',
},
},
# BEGIN Fake builder used as mirror targets for Optional GPU tryservers
......
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