From 318f6acd56c06af7605f1c0a4baf0ad3dbf4db84 Mon Sep 17 00:00:00 2001 From: Jiawei Shao Date: Mon, 23 May 2022 01:07:53 +0000 Subject: [PATCH] Skip several dawn_end2end_tests on specific platforms Bug: dawn:1423, dawn:1429 Test: dawn_end2end_tests Change-Id: Idc9d573f02f7ef70d1901a786e73d362d60697bf Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/91064 Commit-Queue: Jiawei Shao Reviewed-by: Austin Eng Reviewed-by: Corentin Wallez --- src/dawn/tests/DawnTest.cpp | 4 ++++ src/dawn/tests/DawnTest.h | 1 + src/dawn/tests/end2end/ComputeDispatchTests.cpp | 6 +++--- src/dawn/tests/end2end/FirstIndexOffsetTests.cpp | 4 ++++ src/dawn/tests/end2end/TextureZeroInitTests.cpp | 9 +++++++++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/dawn/tests/DawnTest.cpp b/src/dawn/tests/DawnTest.cpp index fba2c2013f..01593b5ed2 100644 --- a/src/dawn/tests/DawnTest.cpp +++ b/src/dawn/tests/DawnTest.cpp @@ -831,6 +831,10 @@ bool DawnTestBase::IsBackendValidationEnabled() const { return gTestEnv->GetBackendValidationLevel() != dawn::native::BackendValidationLevel::Disabled; } +bool DawnTestBase::IsFullBackendValidationEnabled() const { + return gTestEnv->GetBackendValidationLevel() == dawn::native::BackendValidationLevel::Full; +} + bool DawnTestBase::RunSuppressedTests() const { return gTestEnv->RunSuppressedTests(); } diff --git a/src/dawn/tests/DawnTest.h b/src/dawn/tests/DawnTest.h index c917fe3995..513fb737ec 100644 --- a/src/dawn/tests/DawnTest.h +++ b/src/dawn/tests/DawnTest.h @@ -309,6 +309,7 @@ class DawnTestBase { bool UsesWire() const; bool IsBackendValidationEnabled() const; + bool IsFullBackendValidationEnabled() const; bool RunSuppressedTests() const; bool IsDXC() const; diff --git a/src/dawn/tests/end2end/ComputeDispatchTests.cpp b/src/dawn/tests/end2end/ComputeDispatchTests.cpp index 4e089f8c9c..1568a2812d 100644 --- a/src/dawn/tests/end2end/ComputeDispatchTests.cpp +++ b/src/dawn/tests/end2end/ComputeDispatchTests.cpp @@ -219,7 +219,7 @@ TEST_P(ComputeDispatchTests, IndirectBasic) { DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia()); #endif // TODO(crbug.com/dawn/1262): Fails with the full validation turned on. - DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsBackendValidationEnabled()); + DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled()); IndirectTest({2, 3, 4}, 0); } @@ -251,7 +251,7 @@ TEST_P(ComputeDispatchTests, IndirectOffset) { DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia()); #endif // TODO(crbug.com/dawn/1262): Fails with the full validation turned on. - DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsBackendValidationEnabled()); + DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled()); IndirectTest({0, 0, 0, 2, 3, 4}, 3 * sizeof(uint32_t)); } @@ -268,7 +268,7 @@ TEST_P(ComputeDispatchTests, MaxWorkgroups) { DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia()); #endif // TODO(crbug.com/dawn/1262): Fails with the full validation turned on. - DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsBackendValidationEnabled()); + DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled()); // TODO(crbug.com/dawn/1165): Fails with WARP DAWN_SUPPRESS_TEST_IF(IsWARP()); diff --git a/src/dawn/tests/end2end/FirstIndexOffsetTests.cpp b/src/dawn/tests/end2end/FirstIndexOffsetTests.cpp index 768db35b13..c06416f19a 100644 --- a/src/dawn/tests/end2end/FirstIndexOffsetTests.cpp +++ b/src/dawn/tests/end2end/FirstIndexOffsetTests.cpp @@ -280,6 +280,8 @@ TEST_P(FirstIndexOffsetTests, IndexedBothOffset) { // Test that vertex_index starts at 7 when drawn using DrawIndirect() TEST_P(FirstIndexOffsetTests, NonIndexedIndirectVertexOffset) { + // TODO(crbug.com/dawn/1429): Fails with the full validation turned on. + DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled()); TestVertexIndex(DrawMode::NonIndexedIndirect, 7); } @@ -296,6 +298,8 @@ TEST_P(FirstIndexOffsetTests, NonIndexedIndirectBothOffset) { // Test that vertex_index starts at 7 when drawn using DrawIndexedIndirect() TEST_P(FirstIndexOffsetTests, IndexedIndirectVertex) { + // TODO(crbug.com/dawn/1429): Fails with the full validation turned on. + DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled()); TestVertexIndex(DrawMode::IndexedIndirect, 7); } diff --git a/src/dawn/tests/end2end/TextureZeroInitTests.cpp b/src/dawn/tests/end2end/TextureZeroInitTests.cpp index aa303579fb..2e545b1ece 100644 --- a/src/dawn/tests/end2end/TextureZeroInitTests.cpp +++ b/src/dawn/tests/end2end/TextureZeroInitTests.cpp @@ -469,6 +469,9 @@ TEST_P(TextureZeroInitTest, CopyTextureToTextureHalf) { // This tests the texture with depth attachment and load op load will init depth stencil texture to // 0s. TEST_P(TextureZeroInitTest, RenderingLoadingDepth) { + // TODO(crbug.com/dawn/1423): Investigate why this test fails on Windows Vulkan drivers + DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan()); + wgpu::TextureDescriptor srcDescriptor = CreateTextureDescriptor(1, 1, wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::CopyDst | @@ -511,6 +514,9 @@ TEST_P(TextureZeroInitTest, RenderingLoadingDepth) { // This tests the texture with stencil attachment and load op load will init depth stencil texture // to 0s. TEST_P(TextureZeroInitTest, RenderingLoadingStencil) { + // TODO(crbug.com/dawn/1423): Investigate why this test fails on Windows Vulkan drivers + DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan()); + wgpu::TextureDescriptor srcDescriptor = CreateTextureDescriptor(1, 1, wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::CopyDst | @@ -553,6 +559,9 @@ TEST_P(TextureZeroInitTest, RenderingLoadingStencil) { // This tests the texture with depth stencil attachment and load op load will init depth stencil // texture to 0s. TEST_P(TextureZeroInitTest, RenderingLoadingDepthStencil) { + // TODO(crbug.com/dawn/1423): Investigate why this test fails on Windows Vulkan drivers + DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan()); + wgpu::TextureDescriptor srcDescriptor = CreateTextureDescriptor(1, 1, wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::CopyDst |