From a526d84cbbeeddfa6fe949e38c9c9c977c5c3baa Mon Sep 17 00:00:00 2001
From: Brian Popow <popow@gmx.de>
Date: Mon, 13 Feb 2023 19:34:14 +0100
Subject: [PATCH] Skip WithoutAVX2 tests on ARM

---
 .../Formats/WebP/LossyUtilsTests.cs           | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/tests/ImageSharp.Tests/Formats/WebP/LossyUtilsTests.cs b/tests/ImageSharp.Tests/Formats/WebP/LossyUtilsTests.cs
index 04f90b6ee1..73e7044f5b 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/LossyUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/LossyUtilsTests.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Formats.Webp.Lossy;
 using SixLabors.ImageSharp.Tests.TestUtilities;
 
@@ -244,13 +245,19 @@ public class LossyUtilsTests
 
     // This will test the SSE2 version.
     [Fact]
-    public void Vp8Sse16X16_WithoutAVX2_Works() =>
+    public void Vp8Sse16X16_WithoutAVX2_Works()
+    {
+        if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
+        {
+            return;
+        }
+
         FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableAVX2);
+    }
 
     // This will test the fallback scalar version.
     [Fact]
-    public void Vp8Sse16X16_WithoutSSE2_Works() =>
-        FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableArm64AdvSimd);
+    public void Vp8Sse16X16_WithoutHwIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableHWIntrinsic);
 
     // This will test the AVX2 or ARM version.
     [Fact]
@@ -259,13 +266,20 @@ public class LossyUtilsTests
 
     // This will test the SSE2 version.
     [Fact]
-    public void Vp8Sse16X8_WithoutAVX2_Works() =>
+    public void Vp8Sse16X8_WithoutAVX2_Works()
+    {
+        if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
+        {
+            return;
+        }
+
         FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableAVX2);
+    }
 
     // This will test the fallback scalar version.
     [Fact]
     public void Vp8Sse16X8_WithoutHardwareIntrinsics_Works() =>
-        FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableArm64AdvSimd);
+        FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableHWIntrinsic);
 
     // This will test the AVX2 version or ARM version.
     [Fact]
@@ -274,13 +288,20 @@ public class LossyUtilsTests
 
     // This will test the SSE2 version.
     [Fact]
-    public void Vp8Sse4X4_WithoutAVX2_Works() =>
+    public void Vp8Sse4X4_WithoutAVX2_Works()
+    {
+        if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
+        {
+            return;
+        }
+
         FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableAVX2);
+    }
 
     // This will test the fallback scalar version.
     [Fact]
     public void Vp8Sse4X4_WithoutHardwareIntrinsics_Works() =>
-        FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableArm64AdvSimd);
+        FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void Mean16x4_WithHardwareIntrinsics_Works() =>