Skip to content

Commit 7ed4c69

Browse files
committed
Disable ARM for testing scalar version of calculating mode score
1 parent af0b7bf commit 7ed4c69

File tree

1 file changed

+37
-20
lines changed

1 file changed

+37
-20
lines changed

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

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -222,62 +222,79 @@ private static void RunHadamardTransformTest()
222222
public void HadamardTransform_Works() => RunHadamardTransformTest();
223223

224224
[Fact]
225-
public void TransformTwo_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformTwoTest, HwIntrinsics.AllowAll);
225+
public void TransformTwo_WithHardwareIntrinsics_Works() =>
226+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformTwoTest, HwIntrinsics.AllowAll);
226227

227228
[Fact]
228-
public void TransformTwo_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformTwoTest, HwIntrinsics.DisableHWIntrinsic);
229+
public void TransformTwo_WithoutHardwareIntrinsics_Works() =>
230+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformTwoTest, HwIntrinsics.DisableHWIntrinsic);
229231

230232
[Fact]
231-
public void TransformOne_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformOneTest, HwIntrinsics.AllowAll);
233+
public void TransformOne_WithHardwareIntrinsics_Works() =>
234+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformOneTest, HwIntrinsics.AllowAll);
232235

233236
[Fact]
234-
public void TransformOne_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformOneTest, HwIntrinsics.DisableHWIntrinsic);
237+
public void TransformOne_WithoutHardwareIntrinsics_Works() =>
238+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformOneTest, HwIntrinsics.DisableHWIntrinsic);
235239

236-
// This will test the AVX2 version.
240+
// This will test the AVX2 or ARM version.
237241
[Fact]
238-
public void Vp8Sse16X16_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.AllowAll);
242+
public void Vp8Sse16X16_WithHardwareIntrinsics_Works() =>
243+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.AllowAll);
239244

240245
// This will test the SSE2 version.
241246
[Fact]
242-
public void Vp8Sse16X16_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableAVX2);
247+
public void Vp8Sse16X16_WithoutAVX2_Works() =>
248+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableAVX2);
243249

244250
// This will test the fallback scalar version.
245251
[Fact]
246-
public void Vp8Sse16X16_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX);
252+
public void Vp8Sse16X16_WithoutSSE2_Works() =>
253+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableArm64AdvSimd);
247254

248-
// This will test the AVX2 version.
255+
// This will test the AVX2 or ARM version.
249256
[Fact]
250-
public void Vp8Sse16X8_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.AllowAll);
257+
public void Vp8Sse16X8_WithHardwareIntrinsics_Works() =>
258+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.AllowAll);
251259

252260
// This will test the SSE2 version.
253261
[Fact]
254-
public void Vp8Sse16X8_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableAVX2);
262+
public void Vp8Sse16X8_WithoutAVX2_Works() =>
263+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableAVX2);
255264

256265
// This will test the fallback scalar version.
257266
[Fact]
258-
public void Vp8Sse16X8_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX);
267+
public void Vp8Sse16X8_WithoutHardwareIntrinsics_Works() =>
268+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableArm64AdvSimd);
259269

260-
// This will test the AVX2 version.
270+
// This will test the AVX2 version or ARM version.
261271
[Fact]
262-
public void Vp8Sse4X4_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.AllowAll);
272+
public void Vp8Sse4X4_WithHardwareIntrinsics_Works() =>
273+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.AllowAll);
263274

264275
// This will test the SSE2 version.
265276
[Fact]
266-
public void Vp8Sse4X4_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableAVX2);
277+
public void Vp8Sse4X4_WithoutAVX2_Works() =>
278+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableAVX2);
267279

268280
// This will test the fallback scalar version.
269281
[Fact]
270-
public void Vp8Sse4X4_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX);
282+
public void Vp8Sse4X4_WithoutHardwareIntrinsics_Works() =>
283+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableArm64AdvSimd);
271284

272285
[Fact]
273-
public void Mean16x4_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunMean16x4Test, HwIntrinsics.AllowAll);
286+
public void Mean16x4_WithHardwareIntrinsics_Works() =>
287+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunMean16x4Test, HwIntrinsics.AllowAll);
274288

275289
[Fact]
276-
public void Mean16x4_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunMean16x4Test, HwIntrinsics.DisableHWIntrinsic);
290+
public void Mean16x4_WithoutHardwareIntrinsics_Works() =>
291+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunMean16x4Test, HwIntrinsics.DisableHWIntrinsic);
277292

278293
[Fact]
279-
public void HadamardTransform_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunHadamardTransformTest, HwIntrinsics.AllowAll);
294+
public void HadamardTransform_WithHardwareIntrinsics_Works() =>
295+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunHadamardTransformTest, HwIntrinsics.AllowAll);
280296

281297
[Fact]
282-
public void HadamardTransform_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunHadamardTransformTest, HwIntrinsics.DisableHWIntrinsic);
298+
public void HadamardTransform_WithoutHardwareIntrinsics_Works() =>
299+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunHadamardTransformTest, HwIntrinsics.DisableHWIntrinsic);
283300
}

0 commit comments

Comments
 (0)