From 58e68e0665ba20889e28ccf1312bff52efcecbfa Mon Sep 17 00:00:00 2001 From: Bryan Bernhart Date: Fri, 30 Aug 2019 19:20:36 +0000 Subject: [PATCH] Disable flaky BC texture tests. Disables all BC texture tests failing on non-wire Intel/Vulkan bots. BUG=dawn:199 Change-Id: I8e4dd32c3fc79b94b94103484c2e9b6013e008ee Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/10721 Commit-Queue: Austin Eng Reviewed-by: Austin Eng Reviewed-by: Kai Ninomiya --- .../end2end/CompressedTextureFormatTests.cpp | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/tests/end2end/CompressedTextureFormatTests.cpp b/src/tests/end2end/CompressedTextureFormatTests.cpp index 2d9c698c2c..8315a50d78 100644 --- a/src/tests/end2end/CompressedTextureFormatTests.cpp +++ b/src/tests/end2end/CompressedTextureFormatTests.cpp @@ -459,9 +459,9 @@ class CompressedTextureBCFormatTest : public DawnTest { // Test copying into the whole BC texture with 2x2 blocks and sampling from it. TEST_P(CompressedTextureBCFormatTest, Basic) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows()); @@ -481,9 +481,9 @@ TEST_P(CompressedTextureBCFormatTest, Basic) { // Test copying into a sub-region of a texture with BC formats works correctly. TEST_P(CompressedTextureBCFormatTest, CopyIntoSubRegion) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); DAWN_SKIP_TEST_IF(!IsBCFormatSupported()); @@ -504,9 +504,9 @@ TEST_P(CompressedTextureBCFormatTest, CopyIntoSubRegion) { // Test using rowPitch == 0 in the copies with BC formats works correctly. TEST_P(CompressedTextureBCFormatTest, CopyWithZeroRowPitch) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows()); @@ -532,9 +532,9 @@ TEST_P(CompressedTextureBCFormatTest, CopyWithZeroRowPitch) { // Test copying into the non-zero layer of a 2D array texture with BC formats works correctly. TEST_P(CompressedTextureBCFormatTest, CopyIntoNonZeroArrayLayer) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows()); @@ -558,9 +558,9 @@ TEST_P(CompressedTextureBCFormatTest, CopyIntoNonZeroArrayLayer) { // Test copying into a non-zero mipmap level of a texture with BC texture formats. TEST_P(CompressedTextureBCFormatTest, CopyBufferIntoNonZeroMipmapLevel) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows()); @@ -598,9 +598,9 @@ TEST_P(CompressedTextureBCFormatTest, CopyBufferIntoNonZeroMipmapLevel) { // Test texture-to-texture whole-size copies with BC formats. TEST_P(CompressedTextureBCFormatTest, CopyWholeTextureSubResourceIntoNonZeroMipmapLevel) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows()); @@ -661,9 +661,9 @@ TEST_P(CompressedTextureBCFormatTest, CopyIntoSubresourceWithPhysicalSizeNotEqua // subresource and does not fit in another one on OpenGL. DAWN_SKIP_TEST_IF(IsOpenGL()); - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); CopyConfig srcConfig; srcConfig.textureDescriptor.size = {60, 60, 1}; @@ -725,9 +725,9 @@ TEST_P(CompressedTextureBCFormatTest, CopyFromSubresourceWithPhysicalSizeNotEqua // subresource and does not fit in another one on OpenGL. DAWN_SKIP_TEST_IF(IsOpenGL()); - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); CopyConfig srcConfig; srcConfig.textureDescriptor.size = {60, 60, 1}; @@ -784,9 +784,9 @@ TEST_P(CompressedTextureBCFormatTest, MultipleCopiesWithPhysicalSizeNotEqualToVi // subresource and does not fit in another one on OpenGL. DAWN_SKIP_TEST_IF(IsOpenGL()); - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); constexpr uint32_t kTotalCopyCount = 2; std::array srcConfigs; @@ -861,9 +861,9 @@ TEST_P(CompressedTextureBCFormatTest, MultipleCopiesWithPhysicalSizeNotEqualToVi // Test the special case of the B2T copies on the D3D12 backend that the buffer offset and texture // extent exactly fit the RowPitch. TEST_P(CompressedTextureBCFormatTest, BufferOffsetAndExtentFitRowPitch) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows()); @@ -894,9 +894,9 @@ TEST_P(CompressedTextureBCFormatTest, BufferOffsetAndExtentFitRowPitch) { // backend the texelOffset.y will be greater than 0 after calcuting the texelOffset in the function // ComputeTexelOffsets(). TEST_P(CompressedTextureBCFormatTest, BufferOffsetExceedsSlicePitch) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows()); @@ -929,9 +929,9 @@ TEST_P(CompressedTextureBCFormatTest, BufferOffsetExceedsSlicePitch) { // Test the special case of the B2T copies on the D3D12 backend that the buffer offset and texture // extent exceed the RowPitch. On D3D12 backend two copies are required for this case. TEST_P(CompressedTextureBCFormatTest, CopyWithBufferOffsetAndExtentExceedRowPitch) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows()); @@ -963,9 +963,9 @@ TEST_P(CompressedTextureBCFormatTest, CopyWithBufferOffsetAndExtentExceedRowPitc // rowPitch. On D3D12 backend the texelOffset.z will be greater than 0 after calcuting the // texelOffset in the function ComputeTexelOffsets(). TEST_P(CompressedTextureBCFormatTest, RowPitchEqualToSlicePitch) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); DAWN_SKIP_TEST_IF(!IsBCFormatSupported()); @@ -994,9 +994,9 @@ TEST_P(CompressedTextureBCFormatTest, RowPitchEqualToSlicePitch) { // copyExtent.depth) on Metal backends. As copyExtent.depth can only be 1 for BC formats, on Metal // backend we will use two copies to implement such copy. TEST_P(CompressedTextureBCFormatTest, LargeImageHeight) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows()); @@ -1019,9 +1019,9 @@ TEST_P(CompressedTextureBCFormatTest, LargeImageHeight) { // Test the workaround in the B2T copies when (bufferSize - bufferOffset < bytesPerImage * // copyExtent.depth) and copyExtent needs to be clamped. TEST_P(CompressedTextureBCFormatTest, LargeImageHeightAndClampedCopyExtent) { - // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan wire + // TODO(jiawei.shao@intel.com): find out why this test is flaky on Windows Intel Vulkan // bots. - DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows() && UsesWire()); + DAWN_SKIP_TEST_IF(IsIntel() && IsVulkan() && IsWindows()); // TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers. DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());