From f43b92f6e0da5c08495f8984ceeeaa6574ed579e Mon Sep 17 00:00:00 2001
From: Jiawei Shao <jiawei.shao@intel.com>
Date: Fri, 6 Jan 2023 10:10:07 +0000
Subject: [PATCH] Enable end2end tests that can pass on latest Intel bots

This patch enables all the dawn_end2end_tests that fail with old
Windows Intel driver but pass on the newer ones after the driver
of the bots being upgraded to 31.0.101.2111.

Bug: dawn:416, dawn:815, dawn:1070
Test: dawn_end2end_tests
Change-Id: I3022ff09a6c2be21f1c99fab0077743f84f83b34
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/116133
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
---
 .../end2end/CompressedTextureFormatTests.cpp  | 33 -------------------
 .../end2end/CopyTextureForBrowserTests.cpp    |  3 --
 .../tests/white_box/D3D12ResidencyTests.cpp   |  3 --
 3 files changed, 39 deletions(-)

diff --git a/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp b/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp
index 923237d8bb..6083e9cf0e 100644
--- a/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp
+++ b/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp
@@ -673,9 +673,6 @@ class CompressedTextureFormatTest : public DawnTestWithParams<CompressedTextureF
 
 // Test copying into the whole texture with 2x2 blocks and sampling from it.
 TEST_P(CompressedTextureFormatTest, Basic) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     CopyConfig config = GetDefaultSmallConfig();
@@ -700,9 +697,6 @@ TEST_P(CompressedTextureFormatTest, CopyIntoSubRegion) {
 
 // Test copying into the non-zero layer of a 2D array texture works correctly.
 TEST_P(CompressedTextureFormatTest, CopyIntoNonZeroArrayLayer) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     // TODO(crbug.com/dawn/1328): ES3.1 does not support subsetting of compressed textures.
@@ -720,9 +714,6 @@ TEST_P(CompressedTextureFormatTest, CopyIntoNonZeroArrayLayer) {
 
 // Test copying into a non-zero mipmap level of a texture.
 TEST_P(CompressedTextureFormatTest, CopyBufferIntoNonZeroMipmapLevel) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     // TODO(crbug.com/dawn/1328): ES3.1 does not support subsetting of compressed textures.
@@ -738,9 +729,6 @@ TEST_P(CompressedTextureFormatTest, CopyBufferIntoNonZeroMipmapLevel) {
 
 // Test texture-to-texture whole-size copies.
 TEST_P(CompressedTextureFormatTest, CopyWholeTextureSubResourceIntoNonZeroMipmapLevel) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     // TODO(crbug.com/dawn/1328): ES3.1 does not support subsetting of compressed textures.
@@ -983,9 +971,6 @@ TEST_P(CompressedTextureFormatTest, CopyWithMultipleLayerAndPhysicalSizeNotEqual
 // 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(CompressedTextureFormatTest, BufferOffsetAndExtentFitRowPitch) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     CopyConfig config = GetDefaultSmallConfig();
@@ -1005,9 +990,6 @@ TEST_P(CompressedTextureFormatTest, BufferOffsetAndExtentFitRowPitch) {
 // backend the texelOffset.y will be greater than 0 after calcuting the texelOffset in the function
 // ComputeTexelOffsets().
 TEST_P(CompressedTextureFormatTest, BufferOffsetExceedsSlicePitch) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     CopyConfig config = GetDefaultSmallConfig();
@@ -1029,9 +1011,6 @@ TEST_P(CompressedTextureFormatTest, 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(CompressedTextureFormatTest, CopyWithBufferOffsetAndExtentExceedRowPitch) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     constexpr uint32_t kExceedRowBlockCount = 1;
@@ -1074,9 +1053,6 @@ TEST_P(CompressedTextureFormatTest, RowPitchEqualToSlicePitch) {
 // copyExtent.depthOrArrayLayers) on Metal backends. As copyExtent.depthOrArrayLayers can only be 1
 // for compressed formats, on Metal backend we will use two copies to implement such copy.
 TEST_P(CompressedTextureFormatTest, LargeImageHeight) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     CopyConfig config = GetDefaultSmallConfig();
@@ -1089,9 +1065,6 @@ TEST_P(CompressedTextureFormatTest, LargeImageHeight) {
 // Test the workaround in the B2T copies when (bufferSize - bufferOffset < bytesPerImage *
 // copyExtent.depthOrArrayLayers) and copyExtent needs to be clamped.
 TEST_P(CompressedTextureFormatTest, LargeImageHeightAndClampedCopyExtent) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     // TODO(crbug.com/dawn/1328): ES3.1 does not support subsetting of compressed textures.
@@ -1111,9 +1084,6 @@ TEST_P(CompressedTextureFormatTest, LargeImageHeightAndClampedCopyExtent) {
 // Test copying a whole 2D array texture with array layer count > 1 in one copy command works with
 // compressed formats.
 TEST_P(CompressedTextureFormatTest, CopyWhole2DArrayTexture) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     // TODO(crbug.com/dawn/1328): ES3.1 does not support subsetting of compressed textures.
@@ -1131,9 +1101,6 @@ TEST_P(CompressedTextureFormatTest, CopyWhole2DArrayTexture) {
 
 // Test copying a multiple 2D texture array layers in one copy command works.
 TEST_P(CompressedTextureFormatTest, CopyMultiple2DArrayLayers) {
-    // TODO(crbug.com/dawn/815): find out why this test fails on Windows Intel OpenGL drivers.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
-
     DAWN_TEST_UNSUPPORTED_IF(!IsFormatSupported());
 
     // TODO(crbug.com/dawn/1328): ES3.1 does not support subsetting of compressed textures.
diff --git a/src/dawn/tests/end2end/CopyTextureForBrowserTests.cpp b/src/dawn/tests/end2end/CopyTextureForBrowserTests.cpp
index 9302cfd4e7..21b1852b6f 100644
--- a/src/dawn/tests/end2end/CopyTextureForBrowserTests.cpp
+++ b/src/dawn/tests/end2end/CopyTextureForBrowserTests.cpp
@@ -1091,9 +1091,6 @@ TEST_P(CopyTextureForBrowser_Basic, VerifyCopyFromLargeTexture) {
     DAWN_SUPPRESS_TEST_IF(IsOpenGLES());
     DAWN_SUPPRESS_TEST_IF(IsOpenGL() && IsLinux());
 
-    // TODO(crbug.com/dawn/1070): Flaky VK_DEVICE_LOST
-    DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan() && IsIntel());
-
     DoBasicCopyTest({899, 999});
 }
 
diff --git a/src/dawn/tests/white_box/D3D12ResidencyTests.cpp b/src/dawn/tests/white_box/D3D12ResidencyTests.cpp
index 06e809e0eb..c989fe9fe0 100644
--- a/src/dawn/tests/white_box/D3D12ResidencyTests.cpp
+++ b/src/dawn/tests/white_box/D3D12ResidencyTests.cpp
@@ -115,9 +115,6 @@ class D3D12DescriptorResidencyTests : public D3D12ResidencyTestBase {};
 
 // Check that resources existing on suballocated heaps are made resident and evicted correctly.
 TEST_P(D3D12ResourceResidencyTests, OvercommitSmallResources) {
-    // TODO(http://crbug.com/dawn/416): Tests fails on Intel HD 630 bot.
-    DAWN_SUPPRESS_TEST_IF(IsIntel() && IsBackendValidationEnabled());
-
     // Create suballocated buffers to fill half the budget.
     std::vector<wgpu::Buffer> bufferSet1 = AllocateBuffers(
         kSuballocatedResourceSize, ((kRestrictedBudgetSize / 2) / kSuballocatedResourceSize),