Skip to content

Commit 7d0bbbd

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #2440 from SixLabors/bp/ResizeKernelTests
Fix thresholds for Resize kernel tests
2 parents 6ab4b10 + 78ef6de commit 7d0bbbd

File tree

6 files changed

+59
-12
lines changed

6 files changed

+59
-12
lines changed

‎tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs

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

4-
using System.Runtime.InteropServices;
4+
using System.Runtime.Intrinsics.X86;
55
using Microsoft.DotNet.RemoteExecutor;
66
using SixLabors.ImageSharp.Formats;
77
using SixLabors.ImageSharp.Formats.Gif;
@@ -51,10 +51,11 @@ public void GifDecoder_Decode_Resize<TPixel>(TestImageProvider<TPixel> provider)
5151

5252
image.DebugSave(provider, testOutputDetails: details, appendPixelTypeToFileName: false);
5353

54-
// Floating point differences result in minor pixel differences.
54+
// Floating point differences in FMA used in the ResizeKernel result in minor pixel differences.
5555
// Output have been manually verified.
56+
// For more details see discussion: https://github.com/SixLabors/ImageSharp/pull/1513#issuecomment-763643594
5657
image.CompareToReferenceOutput(
57-
ImageComparer.TolerantPercentage(TestEnvironment.OSArchitecture == Architecture.Arm64 ? 0.0002F : 0.0001F),
58+
ImageComparer.TolerantPercentage(Fma.IsSupported ? 0.0001F : 0.0002F),
5859
provider,
5960
testOutputDetails: details,
6061
appendPixelTypeToFileName: false);

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

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

4-
using System.Runtime.InteropServices;
4+
using System.Runtime.Intrinsics.X86;
55
using Microsoft.DotNet.RemoteExecutor;
66
using SixLabors.ImageSharp.Formats;
77
using SixLabors.ImageSharp.Formats.Png;
@@ -122,15 +122,52 @@ public void PngDecoder_Decode_Resize<TPixel>(TestImageProvider<TPixel> provider)
122122

123123
image.DebugSave(provider, testOutputDetails: details, appendPixelTypeToFileName: false);
124124

125-
// Floating point differences result in minor pixel differences.
125+
// Floating point differences in FMA used in the ResizeKernel result in minor pixel differences.
126126
// Output have been manually verified.
127+
// For more details see discussion: https://github.com/SixLabors/ImageSharp/pull/1513#issuecomment-763643594
127128
image.CompareToReferenceOutput(
128-
ImageComparer.TolerantPercentage(TestEnvironment.OSArchitecture == Architecture.Arm64 ? 0.0005F : 0.0003F),
129+
ImageComparer.TolerantPercentage(Fma.IsSupported ? 0.0003F : 0.0005F),
129130
provider,
130131
testOutputDetails: details,
131132
appendPixelTypeToFileName: false);
132133
}
133134

135+
[Theory]
136+
[WithFile(TestImages.Png.Splash, PixelTypes.Rgba32)]
137+
public void PngDecoder_Decode_Resize_ScalarResizeKernel(TestImageProvider<Rgba32> provider)
138+
{
139+
HwIntrinsics intrinsicsFilter = HwIntrinsics.DisableHWIntrinsic;
140+
141+
FeatureTestRunner.RunWithHwIntrinsicsFeature(
142+
RunTest,
143+
intrinsicsFilter,
144+
provider,
145+
string.Empty);
146+
147+
static void RunTest(string arg1, string notUsed)
148+
{
149+
TestImageProvider<Rgba32> provider =
150+
FeatureTestRunner.DeserializeForXunit<TestImageProvider<Rgba32>>(arg1);
151+
152+
DecoderOptions options = new()
153+
{
154+
TargetSize = new() { Width = 150, Height = 150 }
155+
};
156+
157+
using Image<Rgba32> image = provider.GetImage(PngDecoder.Instance, options);
158+
159+
FormattableString details = $"{options.TargetSize.Value.Width}_{options.TargetSize.Value.Height}";
160+
161+
image.DebugSave(provider, testOutputDetails: details, appendPixelTypeToFileName: false);
162+
163+
image.CompareToReferenceOutput(
164+
ImageComparer.TolerantPercentage(0.0005F),
165+
provider,
166+
testOutputDetails: details,
167+
appendPixelTypeToFileName: false);
168+
}
169+
}
170+
134171
[Theory]
135172
[WithFile(TestImages.Png.AverageFilter3BytesPerPixel, PixelTypes.Rgba32)]
136173
[WithFile(TestImages.Png.AverageFilter4BytesPerPixel, PixelTypes.Rgba32)]

‎tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Six Labors Split License.
33

44
using System.Runtime.InteropServices;
5+
using System.Runtime.Intrinsics.X86;
56
using Microsoft.DotNet.RemoteExecutor;
67
using SixLabors.ImageSharp.Formats;
78
using SixLabors.ImageSharp.Formats.Tga;
@@ -760,10 +761,11 @@ public void TgaDecoder_Decode_Resize<TPixel>(TestImageProvider<TPixel> provider)
760761

761762
image.DebugSave(provider, testOutputDetails: details, appendPixelTypeToFileName: false);
762763

763-
// Floating point differences result in minor pixel differences.
764+
// Floating point differences in FMA used in the ResizeKernel result in minor pixel differences.
764765
// Output have been manually verified.
766+
// For more details see discussion: https://github.com/SixLabors/ImageSharp/pull/1513#issuecomment-763643594
765767
image.CompareToReferenceOutput(
766-
ImageComparer.TolerantPercentage(TestEnvironment.OSArchitecture == Architecture.Arm64 ? 0.0016F : 0.0001F),
768+
ImageComparer.TolerantPercentage(Fma.IsSupported ? 0.0001F : 0.0016F),
767769
provider,
768770
testOutputDetails: details,
769771
appendPixelTypeToFileName: false);

‎tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
// ReSharper disable InconsistentNaming
55
using System.Runtime.InteropServices;
6+
using System.Runtime.Intrinsics.X86;
67
using SixLabors.ImageSharp.Formats;
78
using SixLabors.ImageSharp.Formats.Tiff;
89
using SixLabors.ImageSharp.Metadata;
@@ -695,10 +696,11 @@ public void TiffDecoder_Decode_Resize<TPixel>(TestImageProvider<TPixel> provider
695696

696697
image.DebugSave(provider, testOutputDetails: details, appendPixelTypeToFileName: false);
697698

698-
// Floating point differences result in minor pixel differences.
699+
// Floating point differences in FMA used in the ResizeKernel result in minor pixel differences.
699700
// Output have been manually verified.
701+
// For more details see discussion: https://github.com/SixLabors/ImageSharp/pull/1513#issuecomment-763643594
700702
image.CompareToReferenceOutput(
701-
TestEnvironment.OSArchitecture == Architecture.Arm64 ? ImageComparer.TolerantPercentage(0.0006F) : ImageComparer.Exact,
703+
Fma.IsSupported ? ImageComparer.Exact : ImageComparer.TolerantPercentage(0.0006F),
702704
provider,
703705
testOutputDetails: details,
704706
appendPixelTypeToFileName: false);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Six Labors Split License.
33

44
using System.Runtime.InteropServices;
5+
using System.Runtime.Intrinsics.X86;
56
using SixLabors.ImageSharp.Formats;
67
using SixLabors.ImageSharp.Formats.Webp;
78
using SixLabors.ImageSharp.PixelFormats;
@@ -367,10 +368,11 @@ public void WebpDecoder_Decode_Resize<TPixel>(TestImageProvider<TPixel> provider
367368

368369
image.DebugSave(provider, testOutputDetails: details, appendPixelTypeToFileName: false);
369370

370-
// Floating point differences result in minor pixel differences.
371+
// Floating point differences in FMA used in the ResizeKernel result in minor pixel differences.
371372
// Output have been manually verified.
373+
// For more details see discussion: https://github.com/SixLabors/ImageSharp/pull/1513#issuecomment-763643594
372374
image.CompareToReferenceOutput(
373-
ImageComparer.TolerantPercentage(TestEnvironment.OSArchitecture == Architecture.Arm64 ? 0.0156F : 0.0007F),
375+
ImageComparer.TolerantPercentage(Fma.IsSupported ? 0.0007F : 0.0156F),
374376
provider,
375377
testOutputDetails: details,
376378
appendPixelTypeToFileName: false);

‎tests/Images/External/ReferenceOutput/PngDecoderTests/PngDecoder_Decode_Resize_ScalarResizeKernel_splash_150_150.png

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)