Skip to content

Commit a526d84

Browse files
committed
Skip WithoutAVX2 tests on ARM
1 parent 2f673b9 commit a526d84

File tree

1 file changed

+28
-7
lines changed

1 file changed

+28
-7
lines changed

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

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) Six Labors.
22
// Licensed under the Six Labors Split License.
33

4+
using System.Runtime.InteropServices;
45
using SixLabors.ImageSharp.Formats.Webp.Lossy;
56
using SixLabors.ImageSharp.Tests.TestUtilities;
67

@@ -244,13 +245,19 @@ public void Vp8Sse16X16_WithHardwareIntrinsics_Works() =>
244245

245246
// This will test the SSE2 version.
246247
[Fact]
247-
public void Vp8Sse16X16_WithoutAVX2_Works() =>
248+
public void Vp8Sse16X16_WithoutAVX2_Works()
249+
{
250+
if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
251+
{
252+
return;
253+
}
254+
248255
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableAVX2);
256+
}
249257

250258
// This will test the fallback scalar version.
251259
[Fact]
252-
public void Vp8Sse16X16_WithoutSSE2_Works() =>
253-
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableArm64AdvSimd);
260+
public void Vp8Sse16X16_WithoutHwIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X16Test, HwIntrinsics.DisableHWIntrinsic);
254261

255262
// This will test the AVX2 or ARM version.
256263
[Fact]
@@ -259,13 +266,20 @@ public void Vp8Sse16X8_WithHardwareIntrinsics_Works() =>
259266

260267
// This will test the SSE2 version.
261268
[Fact]
262-
public void Vp8Sse16X8_WithoutAVX2_Works() =>
269+
public void Vp8Sse16X8_WithoutAVX2_Works()
270+
{
271+
if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
272+
{
273+
return;
274+
}
275+
263276
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableAVX2);
277+
}
264278

265279
// This will test the fallback scalar version.
266280
[Fact]
267281
public void Vp8Sse16X8_WithoutHardwareIntrinsics_Works() =>
268-
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableArm64AdvSimd);
282+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse16X8Test, HwIntrinsics.DisableHWIntrinsic);
269283

270284
// This will test the AVX2 version or ARM version.
271285
[Fact]
@@ -274,13 +288,20 @@ public void Vp8Sse4X4_WithHardwareIntrinsics_Works() =>
274288

275289
// This will test the SSE2 version.
276290
[Fact]
277-
public void Vp8Sse4X4_WithoutAVX2_Works() =>
291+
public void Vp8Sse4X4_WithoutAVX2_Works()
292+
{
293+
if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
294+
{
295+
return;
296+
}
297+
278298
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableAVX2);
299+
}
279300

280301
// This will test the fallback scalar version.
281302
[Fact]
282303
public void Vp8Sse4X4_WithoutHardwareIntrinsics_Works() =>
283-
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableArm64AdvSimd);
304+
FeatureTestRunner.RunWithHwIntrinsicsFeature(RunVp8Sse4X4Test, HwIntrinsics.DisableHWIntrinsic);
284305

285306
[Fact]
286307
public void Mean16x4_WithHardwareIntrinsics_Works() =>

0 commit comments

Comments
 (0)