Commit 750cbd40 authored by Brandon Jones's avatar Brandon Jones Committed by Chromium LUCI CQ

Run Dawn Validation Layer Tests Sequentially

Changes Dawn validation layer tests to run sequentially, rather than in
parallel jobs. This may address flaky failures being seen on Intel GPUs
when running with D3D12's GPU-based validation.

Bug: dawn:598
Change-Id: Ie53656f63bd2550d66f55f3f43f9c0baa19e1c91
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2629610Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Reviewed-by: default avatarAustin Eng <enga@chromium.org>
Commit-Queue: Brandon Jones <brandon1.jones@intel.com>
Cr-Commit-Position: refs/heads/master@{#845335}
parent 18cf26b2
...@@ -2288,6 +2288,7 @@ ...@@ -2288,6 +2288,7 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-jobs=1",
"--enable-backend-validation", "--enable-backend-validation",
"--use-gpu-in-tests", "--use-gpu-in-tests",
"--test-launcher-retry-limit=0", "--test-launcher-retry-limit=0",
...@@ -2782,6 +2783,7 @@ ...@@ -2782,6 +2783,7 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-jobs=1",
"--enable-backend-validation", "--enable-backend-validation",
"--use-gpu-in-tests", "--use-gpu-in-tests",
"--test-launcher-retry-limit=0", "--test-launcher-retry-limit=0",
...@@ -3278,6 +3280,7 @@ ...@@ -3278,6 +3280,7 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-jobs=1",
"--enable-backend-validation", "--enable-backend-validation",
"--use-gpu-in-tests", "--use-gpu-in-tests",
"--test-launcher-retry-limit=0", "--test-launcher-retry-limit=0",
...@@ -3768,6 +3771,7 @@ ...@@ -3768,6 +3771,7 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-jobs=1",
"--enable-backend-validation", "--enable-backend-validation",
"--use-gpu-in-tests", "--use-gpu-in-tests",
"--test-launcher-retry-limit=0", "--test-launcher-retry-limit=0",
......
...@@ -2525,18 +2525,6 @@ ...@@ -2525,18 +2525,6 @@
}, },
}, },
# GPU gtests that test only Dawn with backend validation layers
'gpu_dawn_extra_gtests': {
'dawn_end2end_validation_layers_tests': {
'mixins': ['dawn_end2end_gpu_test'],
'args': [
'--enable-backend-validation',
],
'linux_args': [ '--no-xvfb' ],
'test': 'dawn_end2end_tests',
},
},
# GPU gtests that test only Dawn # GPU gtests that test only Dawn
'gpu_dawn_gtests': { 'gpu_dawn_gtests': {
'dawn_end2end_skip_validation_tests': { 'dawn_end2end_skip_validation_tests': {
...@@ -2561,6 +2549,32 @@ ...@@ -2561,6 +2549,32 @@
}, },
}, },
# GPU gtests that test only Dawn with backend validation layers
'gpu_dawn_gtests_with_validation': {
'dawn_end2end_validation_layers_tests': {
'mixins': ['dawn_end2end_gpu_test'],
'args': [
'--enable-backend-validation',
],
'linux_args': [ '--no-xvfb' ],
'test': 'dawn_end2end_tests',
},
},
# GPU gtests that test only Dawn with backend validation layers
# to accommodate less powerful Intel GPUs
'gpu_dawn_gtests_with_validation_win_intel': {
'dawn_end2end_validation_layers_tests': {
'mixins': ['dawn_end2end_gpu_test'],
'args': [
'--test-launcher-jobs=1',
'--enable-backend-validation',
],
'linux_args': [ '--no-xvfb' ],
'test': 'dawn_end2end_tests',
},
},
'gpu_dawn_perf_smoke_isolated_scripts': { 'gpu_dawn_perf_smoke_isolated_scripts': {
'dawn_perf_tests': { 'dawn_perf_tests': {
'args': [ 'args': [
...@@ -5875,13 +5889,21 @@ ...@@ -5875,13 +5889,21 @@
# These tests are run both on the CI and trybots which test DEPS Dawn. # These tests are run both on the CI and trybots which test DEPS Dawn.
'gpu_dawn_integration_gtests_passthrough': [ 'gpu_dawn_integration_gtests_passthrough': [
'gpu_dawn_gtests', 'gpu_dawn_gtests',
'gpu_dawn_extra_gtests', 'gpu_dawn_gtests_with_validation',
'gpu_common_gtests_passthrough',
],
# GPU gtests that test Dawn and integration with Chromium
# These tests are run both on the CI and trybots which test DEPS Dawn.
'gpu_dawn_integration_gtests_passthrough_win_intel': [
'gpu_dawn_gtests',
'gpu_dawn_gtests_with_validation_win_intel',
'gpu_common_gtests_passthrough', 'gpu_common_gtests_passthrough',
], ],
'gpu_dawn_integration_gtests_validating': [ 'gpu_dawn_integration_gtests_validating': [
'gpu_dawn_gtests', 'gpu_dawn_gtests',
'gpu_dawn_extra_gtests', 'gpu_dawn_gtests_with_validation',
'gpu_common_gtests_validating', 'gpu_common_gtests_validating',
], ],
......
...@@ -2207,7 +2207,7 @@ ...@@ -2207,7 +2207,7 @@
'win10_intel_hd_630_stable', 'win10_intel_hd_630_stable',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests_passthrough', 'gtest_tests': 'gpu_dawn_integration_gtests_passthrough_win_intel',
'isolated_scripts': 'gpu_dawn_isolated_scripts', 'isolated_scripts': 'gpu_dawn_isolated_scripts',
}, },
}, },
...@@ -2229,7 +2229,7 @@ ...@@ -2229,7 +2229,7 @@
'win10_intel_hd_630_stable', 'win10_intel_hd_630_stable',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests_passthrough', 'gtest_tests': 'gpu_dawn_integration_gtests_passthrough_win_intel',
'isolated_scripts': 'gpu_dawn_isolated_scripts', 'isolated_scripts': 'gpu_dawn_isolated_scripts',
}, },
}, },
...@@ -2253,7 +2253,7 @@ ...@@ -2253,7 +2253,7 @@
'win10_intel_hd_630_stable', 'win10_intel_hd_630_stable',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests_passthrough', 'gtest_tests': 'gpu_dawn_integration_gtests_passthrough_win_intel',
'isolated_scripts': 'gpu_dawn_isolated_scripts', 'isolated_scripts': 'gpu_dawn_isolated_scripts',
}, },
}, },
...@@ -2275,7 +2275,7 @@ ...@@ -2275,7 +2275,7 @@
'win10_intel_hd_630_stable', 'win10_intel_hd_630_stable',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests_passthrough', 'gtest_tests': 'gpu_dawn_integration_gtests_passthrough_win_intel',
'isolated_scripts': 'gpu_dawn_isolated_scripts', 'isolated_scripts': 'gpu_dawn_isolated_scripts',
}, },
}, },
......
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