Skip to content

GitLab

T
tangled
Commit d681414e authored by Jamie Madill's avatar Jamie Madill Committed by Commit Bot
Browse files
Options

Add ANGLE gold trace tests to GPU.FYI. 

Skia Gold requires tests to run on CI before registering golden
images in the dashboard. This fixes odd behaviour we were seeing
where only one golden image was visible on the UI despite accepting
many of them.

This adds the ANGLE restricted trace tests to 8 bots:

- Win10 FYI x64 Release (Intel UHD 630)
- Win10 FYI x64 Release (Intel HD 630)
- Win10 FYI x64 Exp Release (Intel HD 630)
- Win10 FYI x64 Release (NVIDIA)
- Win10 FYI x64 Exp Release (NVIDIA)
- Linux FYI Release (NVIDIA)
- Linux FYI Release (Intel UHD 630)
- Linux FYI Release (Intel HD 630)

Once we move to the chromium.angle waterfall we can remove these
tests entirely from GPU.FYI.

Bug: angleproject:5297
Change-Id: Ic36932cc7aa5dbb922565517a3f7a64f6e694ac8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517621Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823694}
parent de49adac
Show whitespace changes
Inline Side-by-side
Showing with 265 additions and 3 deletions
testing/buildbot/chromium.gpu.fyi.json
View file @ d681414e
...@@ -10830,6 +10830,37 @@ ...@@ -10830,6 +10830,37 @@
} }
], ],
"isolated_scripts": [ "isolated_scripts": [
{
"args": [
"--test-machine-name",
"${buildername}",
"--git-revision=${got_angle_revision}"
],
"isolate_name": "angle_restricted_trace_gold_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_restricted_trace_gold_tests",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:5912-19.0.2",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://third_party/angle/src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
},
{ {
"args": [ "args": [
"context_lost", "context_lost",
...@@ -11620,6 +11651,38 @@ ...@@ -11620,6 +11651,38 @@
} }
], ],
"isolated_scripts": [ "isolated_scripts": [
{
"args": [
"--test-machine-name",
"${buildername}",
"--git-revision=${got_angle_revision}"
],
"isolate_name": "angle_restricted_trace_gold_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_restricted_trace_gold_tests",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:3e92-19.0.8",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"expiration": 14400,
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://third_party/angle/src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
},
{ {
"args": [ "args": [
"context_lost", "context_lost",
...@@ -12454,6 +12517,37 @@ ...@@ -12454,6 +12517,37 @@
}, },
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/" "test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/"
}, },
{
"args": [
"--test-machine-name",
"${buildername}",
"--git-revision=${got_angle_revision}"
],
"isolate_name": "angle_restricted_trace_gold_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_restricted_trace_gold_tests",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://third_party/angle/src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
},
{ {
"args": [ "args": [
"context_lost", "context_lost",
...@@ -26791,6 +26885,38 @@ ...@@ -26791,6 +26885,38 @@
}, },
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/" "test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/"
}, },
{
"args": [
"--test-machine-name",
"${buildername}",
"--git-revision=${got_angle_revision}"
],
"isolate_name": "angle_restricted_trace_gold_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_restricted_trace_gold_tests",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:5912-26.20.100.7870|8086:5912-26.20.100.8141|8086:3e92-26.20.100.8141",
"os": "Windows-10",
"pool": "chromium.tests.gpu.experimental"
}
],
"expiration": 21600,
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://third_party/angle/src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
},
{ {
"args": [ "args": [
"context_lost", "context_lost",
...@@ -27762,6 +27888,38 @@ ...@@ -27762,6 +27888,38 @@
}, },
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/" "test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/"
}, },
{
"args": [
"--test-machine-name",
"${buildername}",
"--git-revision=${got_angle_revision}"
],
"isolate_name": "angle_restricted_trace_gold_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_restricted_trace_gold_tests",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-27.21.14.5148",
"os": "Windows-10-18363",
"pool": "chromium.tests.gpu.experimental"
}
],
"expiration": 21600,
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://third_party/angle/src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
},
{ {
"args": [ "args": [
"context_lost", "context_lost",
...@@ -29539,6 +29697,37 @@ ...@@ -29539,6 +29697,37 @@
}, },
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/" "test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/"
}, },
{
"args": [
"--test-machine-name",
"${buildername}",
"--git-revision=${got_angle_revision}"
],
"isolate_name": "angle_restricted_trace_gold_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_restricted_trace_gold_tests",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286|8086:5912-26.20.100.8141|8086:3e92-26.20.100.8141",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://third_party/angle/src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
},
{ {
"args": [ "args": [
"context_lost", "context_lost",
...@@ -30493,6 +30682,38 @@ ...@@ -30493,6 +30682,38 @@
}, },
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/" "test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/"
}, },
{
"args": [
"--test-machine-name",
"${buildername}",
"--git-revision=${got_angle_revision}"
],
"isolate_name": "angle_restricted_trace_gold_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_restricted_trace_gold_tests",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:3e92-24.20.100.6286",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
],
"expiration": 14400,
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://third_party/angle/src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
},
{ {
"args": [ "args": [
"context_lost", "context_lost",
...@@ -32354,6 +32575,37 @@ ...@@ -32354,6 +32575,37 @@
}, },
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/" "test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/"
}, },
{
"args": [
"--test-machine-name",
"${buildername}",
"--git-revision=${got_angle_revision}"
],
"isolate_name": "angle_restricted_trace_gold_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_restricted_trace_gold_tests",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-27.21.14.5148",
"os": "Windows-10-18363",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://third_party/angle/src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
},
{ {
"args": [ "args": [
"context_lost", "context_lost",
testing/buildbot/test_suites.pyl
View file @ d681414e
...@@ -5029,6 +5029,7 @@ ...@@ -5029,6 +5029,7 @@
'gpu_angle_and_desktop_representative_perf_fyi_isolated_scripts': [ 'gpu_angle_and_desktop_representative_perf_fyi_isolated_scripts': [
'gpu_angle_perf_smoke_isolated_scripts', 'gpu_angle_perf_smoke_isolated_scripts',
'gpu_angle_restricted_trace_gold_isolated_scripts',
'rendering_desktop_representative_perf_tests_isolated_scripts', 'rendering_desktop_representative_perf_tests_isolated_scripts',
], ],
...@@ -5512,6 +5513,13 @@ ...@@ -5512,6 +5513,13 @@
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests', 'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
], ],
'gpu_fyi_win_nvidia_release_x64_isolated_scripts': [
'gpu_angle_perf_smoke_isolated_scripts',
'gpu_angle_restricted_trace_gold_isolated_scripts',
'gpu_command_buffer_perf_passthrough_isolated_scripts',
'rendering_desktop_representative_perf_tests_isolated_scripts',
],
'gpu_fyi_win_optional_gtests': [ 'gpu_fyi_win_optional_gtests': [
'gpu_angle_end2end_gtests', 'gpu_angle_end2end_gtests',
'gpu_angle_gles1_conformance_gtests', 'gpu_angle_gles1_conformance_gtests',
......
testing/buildbot/waterfalls.pyl
View file @ d681414e
...@@ -3836,6 +3836,7 @@ ...@@ -3836,6 +3836,7 @@
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests', 'gtest_tests': 'gpu_fyi_linux_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests', 'gpu_telemetry_tests': 'gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests',
'isolated_scripts': 'gpu_angle_restricted_trace_gold_isolated_scripts',
}, },
}, },
'Linux FYI Release (Intel UHD 630)': { 'Linux FYI Release (Intel UHD 630)': {
...@@ -3847,6 +3848,7 @@ ...@@ -3847,6 +3848,7 @@
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests', 'gtest_tests': 'gpu_fyi_linux_release_gtests',
'gpu_telemetry_tests': 'gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests', 'gpu_telemetry_tests': 'gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests',
'isolated_scripts': 'gpu_angle_restricted_trace_gold_isolated_scripts',
}, },
}, },
'Linux FYI Release (NVIDIA)': { 'Linux FYI Release (NVIDIA)': {
...@@ -3857,8 +3859,8 @@ ...@@ -3857,8 +3859,8 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_linux_release_gtests', 'gtest_tests': 'gpu_fyi_linux_release_gtests',
'isolated_scripts': 'gpu_angle_perf_smoke_isolated_scripts',
'gpu_telemetry_tests': 'gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests', 'gpu_telemetry_tests': 'gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests',
'isolated_scripts': 'gpu_angle_isolated_scripts',
}, },
}, },
'Linux FYI SkiaRenderer Dawn Release (Intel HD 630)': { 'Linux FYI SkiaRenderer Dawn Release (Intel HD 630)': {
...@@ -4251,8 +4253,8 @@ ...@@ -4251,8 +4253,8 @@
# 'Win10 FYI x64 Release (NVIDIA)' # 'Win10 FYI x64 Release (NVIDIA)'
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_win_gtests', 'gtest_tests': 'gpu_fyi_win_gtests',
'isolated_scripts': 'gpu_angle_fyi_win_optional_and_representative_perf_isolated_scripts',
'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests', 'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests',
'isolated_scripts': 'gpu_fyi_win_nvidia_release_x64_isolated_scripts',
}, },
}, },
'Win10 FYI x64 Release (AMD RX 550)': { 'Win10 FYI x64 Release (AMD RX 550)': {
...@@ -4328,8 +4330,8 @@ ...@@ -4328,8 +4330,8 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_win_gtests', 'gtest_tests': 'gpu_fyi_win_gtests',
'isolated_scripts': 'gpu_angle_fyi_win_optional_and_representative_perf_isolated_scripts',
'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests', 'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests',
'isolated_scripts': 'gpu_fyi_win_nvidia_release_x64_isolated_scripts',
}, },
}, },
'Win10 FYI x64 Release XR Perf (NVIDIA)': { 'Win10 FYI x64 Release XR Perf (NVIDIA)': {
......
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