Suppress crashing perftests on Win Intel Exp Rel

src/tests/perf_tests/DrawCallPerf.cpp

@@ -12,6 +12,8 @@
 #include "test_utils/draw_call_perf_utils.h"
 #include "util/shader_utils.h"
 
+using namespace angle;
+
 namespace
 {
 enum class StateChange
@@ -326,6 +328,8 @@ void DrawCallPerfBenchmark::drawBenchmark()
 
 TEST_P(DrawCallPerfBenchmark, Run)
 {
+    // TODO(crbug.com/997674) crashes on Win10 FYI x64 Exp Release (Intel HD 630)
+    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel());
     run();
 }
 

src/tests/perf_tests/LinkProgramPerfTest.cpp

@@ -204,6 +204,8 @@ LinkProgramParams LinkProgramVulkanParams(TaskOption taskOption, ThreadOption th
 
 TEST_P(LinkProgramBenchmark, Run)
 {
+    // TODO(crbug.com/997674) crashes on Win10 FYI x64 Exp Release (Intel HD 630)
+    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel());
     run();
 }
 

src/tests/perf_tests/MultiviewPerf.cpp

@@ -567,6 +567,8 @@ MultiviewPerfParams SelectViewInVertexShader(const EGLPlatformParameters &eglPar
 
 TEST_P(MultiviewCPUBoundBenchmark, Run)
 {
+    // TODO(crbug.com/997674) crashes on Win10 FYI x64 Exp Release (Intel HD 630)
+    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel());
     run();
 }
 

src/tests/perf_tests/UniformsPerf.cpp

@@ -500,6 +500,8 @@ UniformsParams MatrixUniforms(const EGLPlatformParameters &egl,
 
 TEST_P(UniformsBenchmark, Run)
 {
+    // TODO(crbug.com/997674) crashes on Win10 FYI x64 Exp Release (Intel HD 630)
+    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel());
     run();
 }
 

src/tests/test_utils/ANGLETest.h

@@ -574,14 +574,4 @@ bool IsGLExtensionRequestable(const std::string &extName);
 
 extern angle::PlatformMethods gDefaultPlatformMethods;
 
-#define ANGLE_SKIP_TEST_IF(COND)                                  \
-    do                                                            \
-    {                                                             \
-        if (COND)                                                 \
-        {                                                         \
-            std::cout << "Test skipped: " #COND "." << std::endl; \
-            return;                                               \
-        }                                                         \
-    } while (0)
-
 #endif  // ANGLE_TESTS_ANGLE_TEST_H_

src/tests/test_utils/angle_test_instantiate.h

@@ -139,4 +139,14 @@ extern std::string gSelectedConfig;
 extern bool gSeparateProcessPerConfig;
 }  // namespace angle
 
+#define ANGLE_SKIP_TEST_IF(COND)                                  \
+    do                                                            \
+    {                                                             \
+        if (COND)                                                 \
+        {                                                         \
+            std::cout << "Test skipped: " #COND "." << std::endl; \
+            return;                                               \
+        }                                                         \
+    } while (0)
+
 #endif  // ANGLE_TEST_INSTANTIATE_H_