Skip to content

Commit ad4b3e9

Browse files
stefannikoleistefannikolei
committed
Update ISA Groups
dotnet/runtime#121685 (comment)
1 parent 54d2dc2 commit ad4b3e9

19 files changed

Lines changed: 80 additions & 130 deletions

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ static void RunTest(string serialized)
292292
FeatureTestRunner.RunWithHwIntrinsicsFeature(
293293
RunTest,
294294
count,
295-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
295+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE42);
296296
}
297297

298298
[Theory]
@@ -352,7 +352,7 @@ static void RunTest(string serialized)
352352
FeatureTestRunner.RunWithHwIntrinsicsFeature(
353353
RunTest,
354354
count,
355-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
355+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
356356
}
357357

358358
[Theory]
@@ -394,7 +394,7 @@ static void RunTest(string serialized)
394394
FeatureTestRunner.RunWithHwIntrinsicsFeature(
395395
RunTest,
396396
count,
397-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
397+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
398398
}
399399

400400
[Theory]
@@ -436,7 +436,7 @@ static void RunTest(string serialized)
436436
FeatureTestRunner.RunWithHwIntrinsicsFeature(
437437
RunTest,
438438
count,
439-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
439+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
440440
}
441441

442442
[Theory]
@@ -478,7 +478,7 @@ static void RunTest(string serialized)
478478
FeatureTestRunner.RunWithHwIntrinsicsFeature(
479479
RunTest,
480480
count,
481-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
481+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE42);
482482
}
483483

484484
private static void TestShuffleFloat4Channel(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static void RunTest(string serialized) => TestImpl_BulkConvertByteToNormalizedFl
133133
FeatureTestRunner.RunWithHwIntrinsicsFeature(
134134
RunTest,
135135
count,
136-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE41);
136+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
137137
}
138138

139139
[Theory]
@@ -171,7 +171,7 @@ static void RunTest(string serialized) => TestImpl_BulkConvertNormalizedFloatToB
171171
FeatureTestRunner.RunWithHwIntrinsicsFeature(
172172
RunTest,
173173
count,
174-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512BW | HwIntrinsics.DisableAVX2);
174+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2);
175175
}
176176

177177
[Theory]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static void RunTest(string srcSeedSerialized, string qtSeedSerialized)
267267
RunTest,
268268
srcSeed,
269269
qtSeed,
270-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
270+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE42);
271271
}
272272

273273
[Fact]
@@ -462,7 +462,7 @@ static void RunTest()
462462
// 3. DisableAvx2 - call fallback code of float implementation
463463
FeatureTestRunner.RunWithHwIntrinsicsFeature(
464464
RunTest,
465-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
465+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE42);
466466
}
467467

468468
[Theory]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static void RunTest(string serialized)
152152
FeatureTestRunner.RunWithHwIntrinsicsFeature(
153153
RunTest,
154154
seed,
155-
HwIntrinsics.AllowAll | HwIntrinsics.DisableFMA | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
155+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
156156
}
157157

158158
[Theory]
@@ -360,7 +360,7 @@ static void RunTest(string serialized)
360360
FeatureTestRunner.RunWithHwIntrinsicsFeature(
361361
RunTest,
362362
seed,
363-
HwIntrinsics.AllowAll | HwIntrinsics.DisableFMA | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
363+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
364364
}
365365
}
366366
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class JpegColorConverterTests
1919

2020
private const int TestBufferLength = 40;
2121

22-
private const HwIntrinsics IntrinsicsConfig = HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2;
22+
private const HwIntrinsics IntrinsicsConfig = HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2;
2323

2424
private static readonly ApproximateColorProfileComparer ColorSpaceComparer = new(epsilon: Precision);
2525

@@ -73,7 +73,7 @@ public void GetConverterReturnsCorrectConverterWithRgbColorSpace()
7373
{
7474
FeatureTestRunner.RunWithHwIntrinsicsFeature(
7575
RunTest,
76-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
76+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
7777

7878
static void RunTest(string arg)
7979
{
@@ -106,7 +106,7 @@ public void GetConverterReturnsCorrectConverterWithGrayScaleColorSpace()
106106
{
107107
FeatureTestRunner.RunWithHwIntrinsicsFeature(
108108
RunTest,
109-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
109+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
110110

111111
static void RunTest(string arg)
112112
{
@@ -139,7 +139,7 @@ public void GetConverterReturnsCorrectConverterWithCmykColorSpace()
139139
{
140140
FeatureTestRunner.RunWithHwIntrinsicsFeature(
141141
RunTest,
142-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
142+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
143143

144144
static void RunTest(string arg)
145145
{
@@ -172,7 +172,7 @@ public void GetConverterReturnsCorrectConverterWithYCbCrColorSpace()
172172
{
173173
FeatureTestRunner.RunWithHwIntrinsicsFeature(
174174
RunTest,
175-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
175+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
176176

177177
static void RunTest(string arg)
178178
{
@@ -205,7 +205,7 @@ public void GetConverterReturnsCorrectConverterWithYcckColorSpace()
205205
{
206206
FeatureTestRunner.RunWithHwIntrinsicsFeature(
207207
RunTest,
208-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
208+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
209209

210210
static void RunTest(string arg)
211211
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private static void RunPaethFilterTest()
171171
public void PaethFilter_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.AllowAll);
172172

173173
[Fact]
174-
public void PaethFilter_WithoutSsse3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableSSSE3);
174+
public void PaethFilter_WithoutSsse3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableSSE42);
175175

176176
[Fact]
177177
public void PaethFilter_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableHWIntrinsic);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void RunTest()
5151

5252
FeatureTestRunner.RunWithHwIntrinsicsFeature(
5353
RunTest,
54-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSSE3);
54+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
5555
}
5656

5757
[Fact]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ static void RunTest(string serialized)
618618

619619
FeatureTestRunner.RunWithHwIntrinsicsFeature(
620620
RunTest,
621-
HwIntrinsics.DisableSSSE3,
621+
HwIntrinsics.DisableSSE42,
622622
provider);
623623
}
624624

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private static void RunCollectColorRedTransformsTest()
7171
public void CollectColorBlueTransforms_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.AllowAll);
7272

7373
[Fact]
74-
public void CollectColorBlueTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableSSE41);
74+
public void CollectColorBlueTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableSSE42);
7575

7676
[Fact]
7777
public void CollectColorBlueTransforms_WithoutVector256_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableAVX2);
@@ -80,7 +80,7 @@ private static void RunCollectColorRedTransformsTest()
8080
public void CollectColorRedTransforms_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.AllowAll);
8181

8282
[Fact]
83-
public void CollectColorRedTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableSSE41);
83+
public void CollectColorRedTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableSSE42);
8484

8585
[Fact]
8686
public void CollectColorRedTransforms_WithoutVector256_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableAVX2);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -304,19 +304,19 @@ public void BundleColorMap_WithXbitsNoneZero_Works()
304304
public void Predictor11_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.AllowAll);
305305

306306
[Fact]
307-
public void Predictor11_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.DisableSSE2);
307+
public void Predictor11_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.DisableSSE42);
308308

309309
[Fact]
310310
public void Predictor12_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.AllowAll);
311311

312312
[Fact]
313-
public void Predictor12_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.DisableSSE2);
313+
public void Predictor12_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.DisableSSE42);
314314

315315
[Fact]
316316
public void Predictor13_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.AllowAll);
317317

318318
[Fact]
319-
public void Predictor13_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.DisableSSE2);
319+
public void Predictor13_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.DisableSSE42);
320320

321321
[Fact]
322322
public void SubtractGreen_Works() => RunSubtractGreenTest();
@@ -331,7 +331,7 @@ public void BundleColorMap_WithXbitsNoneZero_Works()
331331
public void SubtractGreen_Scalar_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableHWIntrinsic);
332332

333333
[Fact]
334-
public void SubtractGreen_WithoutAvxOrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSSE3);
334+
public void SubtractGreen_WithoutAvxOrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
335335

336336
[Fact]
337337
public void AddGreenToBlueAndRed_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.AllowAll);
@@ -340,13 +340,13 @@ public void BundleColorMap_WithXbitsNoneZero_Works()
340340
public void AddGreenToBlueAndRed_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2);
341341

342342
[Fact]
343-
public void AddGreenToBlueAndRed_WithoutAVX2OrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableSSSE3);
343+
public void AddGreenToBlueAndRed_WithoutAVX2OrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
344344

345345
[Fact]
346346
public void TransformColor_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.AllowAll);
347347

348348
[Fact]
349-
public void TransformColor_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableSSE2);
349+
public void TransformColor_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableSSE42);
350350

351351
[Fact]
352352
public void TransformColor_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableAVX2);
@@ -355,7 +355,7 @@ public void BundleColorMap_WithXbitsNoneZero_Works()
355355
public void TransformColorInverse_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.AllowAll);
356356

357357
[Fact]
358-
public void TransformColorInverse_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableSSE2);
358+
public void TransformColorInverse_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableSSE42);
359359

360360
[Fact]
361361
public void TransformColorInverse_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableAVX2);

0 commit comments

Comments
 (0)