Update ISA Groups

https://github.com/dotnet/runtime/issues/121685#issuecomment-3539194032

tests/ImageSharp.Tests/Common/SimdUtilsTests.Shuffle.cs

@@ -292,7 +292,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE42);
     }
 
     [Theory]
@@ -352,7 +352,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
     }
 
     [Theory]
@@ -394,7 +394,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
     }
 
     [Theory]
@@ -436,7 +436,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
     }
 
     [Theory]
@@ -478,7 +478,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE42);
     }
 
     private static void TestShuffleFloat4Channel(

tests/ImageSharp.Tests/Common/SimdUtilsTests.cs

@@ -133,7 +133,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE41);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
     }
 
     [Theory]
@@ -171,7 +171,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512BW | HwIntrinsics.DisableAVX2);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2);
     }
 
     [Theory]

tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs

@@ -267,7 +267,7 @@ public partial class Block8x8FTests : JpegFixture
             RunTest,
             srcSeed,
             qtSeed,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE42);
     }
 
     [Fact]
@@ -462,7 +462,7 @@ public partial class Block8x8FTests : JpegFixture
         // 3. DisableAvx2 - call fallback code of float implementation
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE42);
     }
 
     [Theory]

tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs

@@ -152,7 +152,7 @@ public static class DCTTests
             FeatureTestRunner.RunWithHwIntrinsicsFeature(
                 RunTest,
                 seed,
-                HwIntrinsics.AllowAll | HwIntrinsics.DisableFMA | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
+                HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
         }
 
         [Theory]
@@ -360,7 +360,7 @@ public static class DCTTests
             FeatureTestRunner.RunWithHwIntrinsicsFeature(
                 RunTest,
                 seed,
-                HwIntrinsics.AllowAll | HwIntrinsics.DisableFMA | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
+                HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
         }
     }
 }

tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs

@@ -19,7 +19,7 @@ public class JpegColorConverterTests
 
     private const int TestBufferLength = 40;
 
-    private const HwIntrinsics IntrinsicsConfig = HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2;
+    private const HwIntrinsics IntrinsicsConfig = HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2;
 
     private static readonly ApproximateColorProfileComparer ColorSpaceComparer = new(epsilon: Precision);
 
@@ -73,7 +73,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {
@@ -106,7 +106,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {
@@ -139,7 +139,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {
@@ -172,7 +172,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {
@@ -205,7 +205,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {

tests/ImageSharp.Tests/Formats/Png/PngDecoderFilterTests.cs

@@ -171,7 +171,7 @@ public class PngDecoderFilterTests
     public void PaethFilter_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void PaethFilter_WithoutSsse3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableSSSE3);
+    public void PaethFilter_WithoutSsse3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void PaethFilter_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableHWIntrinsic);

tests/ImageSharp.Tests/Formats/Png/PngEncoderFilterTests.cs

@@ -51,7 +51,7 @@ public class PngEncoderFilterTests : MeasureFixture
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSSE3);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
     }
 
     [Fact]

tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

@@ -618,7 +618,7 @@ public partial class PngEncoderTests
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.DisableSSSE3,
+            HwIntrinsics.DisableSSE42,
             provider);
     }
 

tests/ImageSharp.Tests/Formats/WebP/ColorSpaceTransformUtilsTests.cs

@@ -71,7 +71,7 @@ public class ColorSpaceTransformUtilsTests
     public void CollectColorBlueTransforms_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void CollectColorBlueTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableSSE41);
+    public void CollectColorBlueTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void CollectColorBlueTransforms_WithoutVector256_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableAVX2);
@@ -80,7 +80,7 @@ public class ColorSpaceTransformUtilsTests
     public void CollectColorRedTransforms_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void CollectColorRedTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableSSE41);
+    public void CollectColorRedTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void CollectColorRedTransforms_WithoutVector256_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableAVX2);

tests/ImageSharp.Tests/Formats/WebP/LosslessUtilsTests.cs

@@ -304,19 +304,19 @@ public class LosslessUtilsTests
     public void Predictor11_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void Predictor11_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.DisableSSE2);
+    public void Predictor11_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void Predictor12_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void Predictor12_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.DisableSSE2);
+    public void Predictor12_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void Predictor13_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void Predictor13_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.DisableSSE2);
+    public void Predictor13_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void SubtractGreen_Works() => RunSubtractGreenTest();
@@ -331,7 +331,7 @@ public class LosslessUtilsTests
     public void SubtractGreen_Scalar_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
-    public void SubtractGreen_WithoutAvxOrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSSE3);
+    public void SubtractGreen_WithoutAvxOrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void AddGreenToBlueAndRed_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.AllowAll);
@@ -340,13 +340,13 @@ public class LosslessUtilsTests
     public void AddGreenToBlueAndRed_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2);
 
     [Fact]
-    public void AddGreenToBlueAndRed_WithoutAVX2OrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableSSSE3);
+    public void AddGreenToBlueAndRed_WithoutAVX2OrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void TransformColor_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void TransformColor_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableSSE2);
+    public void TransformColor_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void TransformColor_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableAVX2);
@@ -355,7 +355,7 @@ public class LosslessUtilsTests
     public void TransformColorInverse_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void TransformColorInverse_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableSSE2);
+    public void TransformColorInverse_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void TransformColorInverse_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableAVX2);

tests/ImageSharp.Tests/Formats/WebP/PredictorEncoderTests.cs

@@ -24,7 +24,7 @@ public class PredictorEncoderTests
 
     [Fact]
     public void ColorSpaceTransform_WithPeakImage_WithoutSSE41_Works()
-        => FeatureTestRunner.RunWithHwIntrinsicsFeature(ColorSpaceTransform_WithPeakImage_ProducesExpectedData, HwIntrinsics.DisableSSE41);
+        => FeatureTestRunner.RunWithHwIntrinsicsFeature(ColorSpaceTransform_WithPeakImage_ProducesExpectedData, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void ColorSpaceTransform_WithBikeImage_WithHardwareIntrinsics_Works()
@@ -32,7 +32,7 @@ public class PredictorEncoderTests
 
     [Fact]
     public void ColorSpaceTransform_WithBikeImage_WithoutSSE41_Works()
-        => FeatureTestRunner.RunWithHwIntrinsicsFeature(ColorSpaceTransform_WithBikeImage_ProducesExpectedData, HwIntrinsics.DisableSSE41);
+        => FeatureTestRunner.RunWithHwIntrinsicsFeature(ColorSpaceTransform_WithBikeImage_ProducesExpectedData, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void ColorSpaceTransform_WithBikeImage_WithoutAvx2_Works()

tests/ImageSharp.Tests/Formats/WebP/QuantEncTests.cs

@@ -45,7 +45,7 @@ public class QuantEncTests
     public void QuantizeBlock_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunQuantizeBlockTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void QuantizeBlock_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunQuantizeBlockTest, HwIntrinsics.DisableSSE2);
+    public void QuantizeBlock_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunQuantizeBlockTest, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void QuantizeBlock_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunQuantizeBlockTest, HwIntrinsics.DisableAVX2);

tests/ImageSharp.Tests/Formats/WebP/Vp8ResidualTests.cs

@@ -252,5 +252,5 @@ public class Vp8ResidualTests
     public void SetCoeffsTest_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSetCoeffsTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void SetCoeffsTest_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSetCoeffsTest, HwIntrinsics.DisableSSE2);
+    public void SetCoeffsTest_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSetCoeffsTest, HwIntrinsics.DisableSSE42);
 }

tests/ImageSharp.Tests/Formats/WebP/WebpCommonUtilsTests.cs

@@ -23,7 +23,7 @@ public class WebpCommonUtilsTests
 
     [Fact]
     public void CheckNonOpaque_WithOpaquePixels_WithoutSse2_Works()
-        => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCheckNoneOpaqueWithOpaquePixelsTest, HwIntrinsics.DisableSSE2);
+        => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCheckNoneOpaqueWithOpaquePixelsTest, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void CheckNonOpaque_WithOpaquePixels_WithoutAvx2_Works()
@@ -35,7 +35,7 @@ public class WebpCommonUtilsTests
 
     [Fact]
     public void CheckNonOpaque_WithNoneOpaquePixels_WithoutSse2_Works()
-        => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCheckNoneOpaqueWithNoneOpaquePixelsTest, HwIntrinsics.DisableSSE2);
+        => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCheckNoneOpaqueWithNoneOpaquePixelsTest, HwIntrinsics.DisableSSE42);
 
     [Fact]
     public void CheckNonOpaque_WithNoneOpaquePixels_WithoutAvx2_Works()

tests/ImageSharp.Tests/Formats/WebP/YuvConversionTests.cs

@@ -32,7 +32,7 @@ public class YuvConversionTests
     public void UpSampleYuvToRgb_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunUpSampleYuvToRgbTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void UpSampleYuvToRgb_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunUpSampleYuvToRgbTest, HwIntrinsics.DisableSSE2);
+    public void UpSampleYuvToRgb_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunUpSampleYuvToRgbTest, HwIntrinsics.DisableSSE42);
 
     [Theory]
     [WithFile(TestImages.Webp.Yuv, PixelTypes.Rgba32)]

tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs

@@ -148,7 +148,7 @@ public class BokehBlurTest
 
     [Theory]
     [WithFileCollection(nameof(TestFiles), nameof(BokehBlurValues), PixelTypes.Rgba32, HwIntrinsics.AllowAll)]
-    [WithFileCollection(nameof(TestFiles), nameof(BokehBlurValues), PixelTypes.Rgba32, HwIntrinsics.DisableSSE41)]
+    [WithFileCollection(nameof(TestFiles), nameof(BokehBlurValues), PixelTypes.Rgba32, HwIntrinsics.DisableSSE42)]
     public void BokehBlurFilterProcessor_Bounded(TestImageProvider<Rgba32> provider, BokehBlurInfo value, HwIntrinsics intrinsicsFilter)
     {
         static void RunTest(string arg1, string arg2)

tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs

@@ -102,6 +102,6 @@ public class ResizeTests : BaseImageOperationsExtensionTest
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableFMA);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2);
     }
 }

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

@@ -436,37 +436,38 @@ public enum HwIntrinsics : long
     // Use flags so we can pass multiple values without using params.
     // Don't base on 0 or use inverse for All as that doesn't translate to string values.
     DisableHWIntrinsic = 1L << 0,
-    DisableSSE = 1L << 1,
-    DisableSSE2 = 1L << 2,
-    DisableAES = 1L << 3,
-    DisablePCLMULQDQ = 1L << 4,
-    DisableSSE3 = 1L << 5,
-    DisableSSSE3 = 1L << 6,
-    DisableSSE41 = 1L << 7,
-    DisableSSE42 = 1L << 8,
-    DisablePOPCNT = 1L << 9,
-    DisableAVX = 1L << 10,
-    DisableFMA = 1L << 11,
-    DisableAVX2 = 1L << 12,
+    DisableSSE42 = 1L << 1,
+    DisableAVX = 1L << 2,
+    DisableAVX2 = 1L << 3,
+    DisableAVX512 = 1L << 4,
+    DisableAVX512v2 = 1L << 5,
+    DisableAVX512v3 = 1L << 6,
+    DisableAVX10v1 = 1L << 7,
+    DisableAVX10v2 = 1L << 8,
+    DisableAPX = 1L << 9,
+    DisableAES = 1L << 10,
+    DisableAVX512VP2INTERSECT = 1L << 11,
+    DisableAVXIFMA = 1L << 12,
     DisableAVXVNNI = 1L << 13,
-    DisableAVX512BW = 1L << 14,
-    DisableAVX512BW_VL = 1L << 15,
-    DisableAVX512CD = 1L << 16,
-    DisableAVX512CD_VL = 1L << 17,
-    DisableAVX512DQ = 1L << 18,
-    DisableAVX512DQ_VL = 1L << 19,
-    DisableAVX512F = 1L << 20,
-    DisableAVX512F_VL = 1L << 21,
-    DisableAVX512VBMI = 1L << 22,
-    DisableAVX512VBMI_VL = 1L << 23,
-    DisableBMI1 = 1L << 24,
-    DisableBMI2 = 1L << 25,
-    DisableLZCNT = 1L << 26,
-    DisableArm64AdvSimd = 1L << 27,
-    DisableArm64Crc32 = 1L << 28,
-    DisableArm64Dp = 1L << 29,
-    DisableArm64Aes = 1L << 30,
-    DisableArm64Sha1 = 1L << 31,
-    DisableArm64Sha256 = 1L << 32,
-    AllowAll = 1L << 33
+    DisableAVXVNNIINT = 1L << 14,
+    DisableGFNI = 1L << 15,
+    DisableSHA = 1L << 16,
+    DisableVAES = 1L << 17,
+    DisableWAITPKG = 1L << 18,
+    DisableX86Serialize = 1 << 19,
+    // Arm64
+    DisableArm64Aes = 1L << 20,
+    DisableArm64Atomics = 1L << 21,
+    DisableArm64Crc32 = 1L << 22,
+    DisableArm64Dczva = 1L << 23,
+    DisableArm64Dp = 1L << 24,
+    DisableArm64Rdm = 1L << 25,
+    DisableArm64Sha1 = 1L << 26,
+    DisableArm64Sha256 = 1L << 27,
+    DisableArm64Sve = 1L << 28,
+    DisableArm64Sve2 = 1L << 29,
+    // RISC-V64
+    DisableRiscV64Zba = 1L << 30,
+    DisableRiscV64Zbb = 1L << 31,
+    AllowAll = 1L << 32,
 }

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

@@ -110,54 +110,29 @@ public class FeatureTestRunnerTests
                     Assert.False(Sha1.IsSupported);
                     Assert.False(Sha256.IsSupported);
                     break;
-                case HwIntrinsics.DisableSSE:
-                    Assert.False(Sse.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE2:
-                    Assert.False(Sse2.IsSupported);
-                    break;
                 case HwIntrinsics.DisableAES:
                     Assert.False(Aes.IsSupported);
-                    break;
-                case HwIntrinsics.DisablePCLMULQDQ:
                     Assert.False(Pclmulqdq.IsSupported);
                     break;
-                case HwIntrinsics.DisableSSE3:
+                case HwIntrinsics.DisableSSE42:
+                    Assert.False(Sse.IsSupported);
+                    Assert.False(Sse2.IsSupported);
                     Assert.False(Sse3.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSSE3:
                     Assert.False(Ssse3.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE41:
                     Assert.False(Sse41.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE42:
                     Assert.False(Sse42.IsSupported);
-                    break;
-                case HwIntrinsics.DisablePOPCNT:
                     Assert.False(Popcnt.IsSupported);
                     break;
                 case HwIntrinsics.DisableAVX:
                     Assert.False(Avx.IsSupported);
                     break;
-                case HwIntrinsics.DisableFMA:
-                    Assert.False(Fma.IsSupported);
-                    break;
                 case HwIntrinsics.DisableAVX2:
                     Assert.False(Avx2.IsSupported);
-                    break;
-                case HwIntrinsics.DisableBMI1:
+                    Assert.False(Fma.IsSupported);
                     Assert.False(Bmi1.IsSupported);
-                    break;
-                case HwIntrinsics.DisableBMI2:
                     Assert.False(Bmi2.IsSupported);
-                    break;
-                case HwIntrinsics.DisableLZCNT:
                     Assert.False(Lzcnt.IsSupported);
                     break;
-                case HwIntrinsics.DisableArm64AdvSimd:
-                    Assert.False(AdvSimd.IsSupported);
-                    break;
                 case HwIntrinsics.DisableArm64Aes:
                     Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
                     break;
@@ -194,7 +169,7 @@ public class FeatureTestRunnerTests
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             AssertHwIntrinsicsFeatureDisabled,
-            HwIntrinsics.DisableSSE,
+            HwIntrinsics.DisableSSE42,
             new FakeSerializable());
     }
 
@@ -231,54 +206,28 @@ public class FeatureTestRunnerTests
                     Assert.False(Sha1.IsSupported);
                     Assert.False(Sha256.IsSupported);
                     break;
-                case HwIntrinsics.DisableSSE:
-                    Assert.False(Sse.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE2:
-                    Assert.False(Sse2.IsSupported);
-                    break;
                 case HwIntrinsics.DisableAES:
                     Assert.False(Aes.IsSupported);
-                    break;
-                case HwIntrinsics.DisablePCLMULQDQ:
                     Assert.False(Pclmulqdq.IsSupported);
                     break;
-                case HwIntrinsics.DisableSSE3:
-                    Assert.False(Sse3.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSSE3:
+                case HwIntrinsics.DisableSSE42:
+                    Assert.False(Sse.IsSupported);
+                    Assert.False(Sse2.IsSupported);
                     Assert.False(Ssse3.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE41:
                     Assert.False(Sse41.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE42:
                     Assert.False(Sse42.IsSupported);
-                    break;
-                case HwIntrinsics.DisablePOPCNT:
                     Assert.False(Popcnt.IsSupported);
                     break;
                 case HwIntrinsics.DisableAVX:
                     Assert.False(Avx.IsSupported);
                     break;
-                case HwIntrinsics.DisableFMA:
-                    Assert.False(Fma.IsSupported);
-                    break;
                 case HwIntrinsics.DisableAVX2:
                     Assert.False(Avx2.IsSupported);
-                    break;
-                case HwIntrinsics.DisableBMI1:
+                    Assert.False(Fma.IsSupported);
                     Assert.False(Bmi1.IsSupported);
-                    break;
-                case HwIntrinsics.DisableBMI2:
                     Assert.False(Bmi2.IsSupported);
-                    break;
-                case HwIntrinsics.DisableLZCNT:
                     Assert.False(Lzcnt.IsSupported);
                     break;
-                case HwIntrinsics.DisableArm64AdvSimd:
-                    Assert.False(AdvSimd.IsSupported);
-                    break;
                 case HwIntrinsics.DisableArm64Aes:
                     Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
                     break;