Skip to content

Commit fc211a7

Browse files
stefannikoleistefannikolei
committed
Update Intrinsic usage
1 parent d03b1d5 commit fc211a7

16 files changed

+43
-48
lines changed

‎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.DisableSSE42);
295+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
355+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
397+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
439+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
481+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
482482
}
483483

484484
private static void TestShuffleFloat4Channel(

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

Lines changed: 1 addition & 1 deletion
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.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42);
136+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
137137
}
138138

139139
[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.DisableSSE42);
270+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
465+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
466466
}
467467

468468
[Theory]

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

Lines changed: 6 additions & 7 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.DisableAVX2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
155+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
156156
}
157157

158158
[Theory]
@@ -352,15 +352,14 @@ static void RunTest(string serialized)
352352
Assert.Equal(expectedDest, actualDest, new ApproximateFloatComparer(1f));
353353
}
354354

355-
// 4 paths:
356-
// 1. AllowAll - call avx/fma implementation
357-
// 2. DisableFMA - call avx without fma implementation
358-
// 3. DisableAvx - call Vector4 implementation
359-
// 4. DisableHWIntrinsic - call scalar fallback implementation
355+
// 3 paths:
356+
// 1. AllowAll - call avx implementation
357+
// 2. DisableAvx - call Vector4 implementation
358+
// 3. DisableHWIntrinsic - call scalar fallback implementation
360359
FeatureTestRunner.RunWithHwIntrinsicsFeature(
361360
RunTest,
362361
seed,
363-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
362+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
364363
}
365364
}
366365
}

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

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

2020
private const int TestBufferLength = 40;
2121

22-
private const HwIntrinsics IntrinsicsConfig = HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2;
23-
2422
private static readonly ApproximateColorProfileComparer ColorSpaceComparer = new(epsilon: Precision);
2523

26-
private static readonly ColorProfileConverter ColorSpaceConverter = new();
27-
2824
public static readonly TheoryData<int> Seeds = new() { 1, 2, 3 };
2925

3026
public JpegColorConverterTests(ITestOutputHelper output)
@@ -73,7 +69,7 @@ public void GetConverterReturnsCorrectConverterWithRgbColorSpace()
7369
{
7470
FeatureTestRunner.RunWithHwIntrinsicsFeature(
7571
RunTest,
76-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
72+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
7773

7874
static void RunTest(string arg)
7975
{
@@ -106,7 +102,7 @@ public void GetConverterReturnsCorrectConverterWithGrayScaleColorSpace()
106102
{
107103
FeatureTestRunner.RunWithHwIntrinsicsFeature(
108104
RunTest,
109-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
105+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic | HwIntrinsics.DisableHWIntrinsic);
110106

111107
static void RunTest(string arg)
112108
{
@@ -139,7 +135,7 @@ public void GetConverterReturnsCorrectConverterWithCmykColorSpace()
139135
{
140136
FeatureTestRunner.RunWithHwIntrinsicsFeature(
141137
RunTest,
142-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
138+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic | HwIntrinsics.DisableHWIntrinsic);
143139

144140
static void RunTest(string arg)
145141
{
@@ -172,7 +168,7 @@ public void GetConverterReturnsCorrectConverterWithYCbCrColorSpace()
172168
{
173169
FeatureTestRunner.RunWithHwIntrinsicsFeature(
174170
RunTest,
175-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableHWIntrinsic);
171+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic | HwIntrinsics.DisableHWIntrinsic);
176172

177173
static void RunTest(string arg)
178174
{

‎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.DisableSSE42);
174+
public void PaethFilter_WithoutSsse3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
54+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42,
621+
HwIntrinsics.DisableHWIntrinsic,
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.DisableSSE42);
74+
public void CollectColorBlueTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
83+
public void CollectColorRedTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
307+
public void Predictor11_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
313+
public void Predictor12_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
319+
public void Predictor13_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
334+
public void SubtractGreen_WithoutAvxOrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
343+
public void AddGreenToBlueAndRed_WithoutAVX2OrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
349+
public void TransformColor_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableHWIntrinsic);
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.DisableSSE42);
358+
public void TransformColorInverse_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableHWIntrinsic);
359359

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

0 commit comments

Comments
 (0)