Add support for disabling ARM intrinsics

Author: brianpopow

tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs

@@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities
     /// </summary>
     public static class FeatureTestRunner
     {
-        private static readonly char[] SplitChars = new[] { ',', ' ' };
+        private static readonly char[] SplitChars = { ',', ' ' };
 
         /// <summary>
         /// Allows the deserialization of parameters passed to the feature test.
@@ -349,7 +349,7 @@ public static void RunWithHwIntrinsicsFeature<T>(
 
         internal static Dictionary<HwIntrinsics, string> ToFeatureKeyValueCollection(this HwIntrinsics intrinsics)
         {
-            // Loop through and translate the given values into COMPlus equivaluents
+            // Loop through and translate the given values into COMPlus equivalents.
             var features = new Dictionary<HwIntrinsics, string>();
             foreach (string intrinsic in intrinsics.ToString("G").Split(SplitChars, StringSplitOptions.RemoveEmptyEntries))
             {
@@ -407,6 +407,12 @@ public enum HwIntrinsics
         DisableBMI1 = 1 << 14,
         DisableBMI2 = 1 << 15,
         DisableLZCNT = 1 << 16,
-        AllowAll = 1 << 17
+        DisableArm64AdvSimd = 1 << 17,
+        DisableArm64Crc32 = 1 << 18,
+        DisableArm64Dp = 1 << 19,
+        DisableArm64Aes = 1 << 20,
+        DisableArm64Sha1 = 1 << 21,
+        DisableArm64Sha256 = 1 << 22,
+        AllowAll = 1 << 23
     }
 }

tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs

@@ -7,6 +7,10 @@
 using System.Numerics;
 #if SUPPORTS_RUNTIME_INTRINSICS
 using System.Runtime.Intrinsics.X86;
+using Aes = System.Runtime.Intrinsics.X86.Aes;
+#if NET5_0_OR_GREATER
+using System.Runtime.Intrinsics.Arm;
+#endif
 #endif
 using Xunit;
 using Xunit.Abstractions;
@@ -16,11 +20,11 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.Tests
     public class FeatureTestRunnerTests
     {
         public static TheoryData<HwIntrinsics, string[]> Intrinsics =>
-            new TheoryData<HwIntrinsics, string[]>
+            new()
             {
-                { HwIntrinsics.DisableAES | HwIntrinsics.AllowAll, new string[] { "EnableAES", "AllowAll" } },
-                { HwIntrinsics.DisableSIMD | HwIntrinsics.DisableHWIntrinsic, new string[] { "FeatureSIMD", "EnableHWIntrinsic" } },
-                { HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableAVX, new string[] { "EnableSSE42", "EnableAVX" } }
+                { HwIntrinsics.DisableAES | HwIntrinsics.AllowAll, new[] { "EnableAES", "AllowAll" } },
+                { HwIntrinsics.DisableSIMD | HwIntrinsics.DisableHWIntrinsic, new[] { "FeatureSIMD", "EnableHWIntrinsic" } },
+                { HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableAVX, new[] { "EnableSSE42", "EnableAVX" } }
             };
 
         [Theory]
@@ -56,12 +60,9 @@ public void AllowsAllHwIntrinsicFeatures()
         }
 
         [Fact]
-        public void CanLimitHwIntrinsicSIMDFeatures()
-        {
-            FeatureTestRunner.RunWithHwIntrinsicsFeature(
+        public void CanLimitHwIntrinsicSIMDFeatures() => FeatureTestRunner.RunWithHwIntrinsicsFeature(
                 () => Assert.False(Vector.IsHardwareAccelerated),
                 HwIntrinsics.DisableSIMD);
-        }
 
 #if SUPPORTS_RUNTIME_INTRINSICS
         [Fact]
@@ -121,6 +122,14 @@ static void AssertHwIntrinsicsFeatureDisabled(string intrinsic)
                         Assert.False(Bmi1.IsSupported);
                         Assert.False(Bmi2.IsSupported);
                         Assert.False(Lzcnt.IsSupported);
+#if NET5_0_OR_GREATER
+                        Assert.False(AdvSimd.IsSupported);
+                        Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
+                        Assert.False(Crc32.IsSupported);
+                        Assert.False(Dp.IsSupported);
+                        Assert.False(Sha1.IsSupported);
+                        Assert.False(Sha256.IsSupported);
+#endif
                         break;
                     case HwIntrinsics.DisableSSE:
                         Assert.False(Sse.IsSupported);
@@ -167,6 +176,26 @@ static void AssertHwIntrinsicsFeatureDisabled(string intrinsic)
                     case HwIntrinsics.DisableLZCNT:
                         Assert.False(Lzcnt.IsSupported);
                         break;
+#if NET5_0_OR_GREATER
+                    case HwIntrinsics.DisableArm64AdvSimd:
+                        Assert.False(AdvSimd.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Aes:
+                        Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Crc32:
+                        Assert.False(Crc32.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Dp:
+                        Assert.False(Dp.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Sha1:
+                        Assert.False(Sha1.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Sha256:
+                        Assert.False(Sha256.IsSupported);
+                        break;
+#endif
 #endif
                 }
             }
@@ -226,6 +255,14 @@ static void AssertHwIntrinsicsFeatureDisabled(string serializable, string intrin
                         Assert.False(Bmi1.IsSupported);
                         Assert.False(Bmi2.IsSupported);
                         Assert.False(Lzcnt.IsSupported);
+#if NET5_0_OR_GREATER
+                        Assert.False(AdvSimd.IsSupported);
+                        Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
+                        Assert.False(Crc32.IsSupported);
+                        Assert.False(Dp.IsSupported);
+                        Assert.False(Sha1.IsSupported);
+                        Assert.False(Sha256.IsSupported);
+#endif
                         break;
                     case HwIntrinsics.DisableSSE:
                         Assert.False(Sse.IsSupported);
@@ -272,6 +309,26 @@ static void AssertHwIntrinsicsFeatureDisabled(string serializable, string intrin
                     case HwIntrinsics.DisableLZCNT:
                         Assert.False(Lzcnt.IsSupported);
                         break;
+#if NET5_0_OR_GREATER
+                    case HwIntrinsics.DisableArm64AdvSimd:
+                        Assert.False(AdvSimd.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Aes:
+                        Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Crc32:
+                        Assert.False(Crc32.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Dp:
+                        Assert.False(Dp.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Sha1:
+                        Assert.False(Sha1.IsSupported);
+                        break;
+                    case HwIntrinsics.DisableArm64Sha256:
+                        Assert.False(Sha256.IsSupported);
+                        break;
+#endif
 #endif
                 }
             }