commit 28f908527482922f0b6221f4bd7050dc28297263
author Brian Sheedy <bsheedy@google.com> Tue Apr 16 20:50:44 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 16 20:50:44 2024 +0000
tree 45f5997fdcf6fbd859ca2d46e081b0522a7ca4a9
parent 9dc388f9f08b00b0df857398ce2bfdca9d221d9a

Adjust Linux/Intel perf skip

Moves the recently added skip for dawn_perf_tests on the experimental
Linux/Intel config and adjusts its expression so that it actually
applies properly.

Bug: dawn:2508
Change-Id: I31fca7f3c93279e9e45ecba108d662148468008c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/184241
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>

src/dawn/tests/perf_tests/MatrixVectorMultiplyPerf.cpp

diff --git a/src/dawn/tests/perf_tests/MatrixVectorMultiplyPerf.cpp b/src/dawn/tests/perf_tests/MatrixVectorMultiplyPerf.cpp
index ff4f9e0..f3ffa74 100644
--- a/src/dawn/tests/perf_tests/MatrixVectorMultiplyPerf.cpp
+++ b/src/dawn/tests/perf_tests/MatrixVectorMultiplyPerf.cpp
@@ -122,6 +122,13 @@
 };
 
 void MatrixVectorMultiplyPerf::SetUp() {
+    // TODO(crbug.com/dawn/2508): Fails due to an OS/driver upgrade on Linux/Intel.
+    // Can't specify IsIntel() since this fails with llvmpipe, where IsIntel() is
+    // false. This must also be checked before SetUp() since the crash happens in
+    // SetUp() itself.
+    DAWN_SUPPRESS_TEST_IF(IsLinux() && IsVulkan() && IsMesa("23.2.1") &&
+                          GetParam().mStoreType == StoreType::F32);
+
     DawnPerfTestWithParams<MatrixVectorMultiplyParams>::SetUp();
 
     // Unoptimized variant too slow for bots.
@@ -145,10 +152,6 @@
     // on D3D12 when using subgroups. Suppress while we figure out why FXC is used.
     DAWN_SUPPRESS_TEST_IF(IsD3D12() && GetParam().mSubgroups);
 
-    // TODO(crbug.com/dawn/2508): Fails due to an OS/driver upgrade on Linux/Intel.
-    DAWN_SUPPRESS_TEST_IF(IsLinux() && IsIntel() && IsVulkan() && IsMesa("23.2.1") &&
-                          GetParam().mStoreType == StoreType::F32);
-
     wgpu::BufferDescriptor bufferDesc;
     bufferDesc.usage = wgpu::BufferUsage::Storage;
     bufferDesc.size = BytesPerElement() * GetParam().mRows * GetParam().mCols;