Update benchmarks and simplify color numeric bulk colormatrix

JimBobSquarePants · JimBobSquarePants · commit 32d08ba566a9 · 2023-02-27T10:08:10.000+10:00
diff --git a/src/ImageSharp/Common/Helpers/ColorNumerics.cs b/src/ImageSharp/Common/Helpers/ColorNumerics.cs
@@ -3,7 +3,6 @@
 
 using System.Numerics;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp;
 
@@ -17,7 +16,7 @@ internal static class ColorNumerics
     /// Vector for converting pixel to gray value as specified by
     /// ITU-R Recommendation BT.709.
     /// </summary>
-    private static readonly Vector4 Bt709 = new Vector4(.2126f, .7152f, .0722f, 0.0f);
+    private static readonly Vector4 Bt709 = new(.2126f, .7152f, .0722f, 0.0f);
 
     /// <summary>
     /// Convert a pixel value to grayscale using ITU-R Recommendation BT.709.
@@ -167,11 +166,9 @@ public static void Transform(ref Vector4 vector, ref ColorMatrix matrix)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void Transform(Span<Vector4> vectors, ref ColorMatrix matrix)
     {
-        ref Vector4 baseRef = ref MemoryMarshal.GetReference(vectors);
-
         for (int i = 0; i < vectors.Length; i++)
         {
-            ref Vector4 v = ref Unsafe.Add(ref baseRef, i);
+            ref Vector4 v = ref vectors[i];
             Transform(ref v, ref matrix);
         }
     }
diff --git a/tests/ImageSharp.Benchmarks/Bulk/ColorMatrixTransforms.cs b/tests/ImageSharp.Benchmarks/Bulk/ColorMatrixTransforms.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Numerics;
+using BenchmarkDotNet.Attributes;
+using SixLabors.ImageSharp.Processing;
+
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
+
+public class ColorMatrixTransforms
+{
+    private static readonly Vector4[] Vectors = Vector4Factory.CreateVectors();
+
+    [Benchmark(Baseline = true)]
+    public void Transform()
+    {
+        ColorMatrix matrix = KnownFilterMatrices.CreateHueFilter(45F);
+        for (int i = 0; i < Vectors.Length; i++)
+        {
+            ref Vector4 input = ref Vectors[i];
+            ColorNumerics.Transform(ref input, ref matrix);
+        }
+    }
+
+    [Benchmark]
+    public void Transform_Span()
+    {
+        ColorMatrix matrix = KnownFilterMatrices.CreateHueFilter(45F);
+        ColorNumerics.Transform(Vectors.AsSpan(), ref matrix);
+    }
+}
diff --git a/tests/ImageSharp.Benchmarks/Bulk/FromRgba32Bytes.cs b/tests/ImageSharp.Benchmarks/Bulk/FromRgba32Bytes.cs
@@ -8,7 +8,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 public abstract class FromRgba32Bytes<TPixel>
     where TPixel : unmanaged, IPixel<TPixel>
@@ -64,7 +64,7 @@ public void CommonBulk()
     [Benchmark]
     public void OptimizedBulk()
     {
-       PixelOperations<TPixel>.Instance.FromRgba32Bytes(this.configuration, this.source.GetSpan(), this.destination.GetSpan(), this.Count);
+        PixelOperations<TPixel>.Instance.FromRgba32Bytes(this.configuration, this.source.GetSpan(), this.destination.GetSpan(), this.Count);
     }
 }
 
diff --git a/tests/ImageSharp.Benchmarks/Bulk/FromVector4.cs b/tests/ImageSharp.Benchmarks/Bulk/FromVector4.cs
@@ -12,7 +12,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.ShortCore31))]
 public abstract class FromVector4<TPixel>
diff --git a/tests/ImageSharp.Benchmarks/Bulk/FromVector4_Rgb24.cs b/tests/ImageSharp.Benchmarks/Bulk/FromVector4_Rgb24.cs
@@ -4,7 +4,7 @@
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.ShortMultiFramework))]
 public class FromVector4_Rgb24 : FromVector4<Rgb24>
diff --git a/tests/ImageSharp.Benchmarks/Bulk/Pad3Shuffle4Channel.cs b/tests/ImageSharp.Benchmarks/Bulk/Pad3Shuffle4Channel.cs
@@ -3,7 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.HwIntrinsics_SSE_AVX))]
 public class Pad3Shuffle4Channel
diff --git a/tests/ImageSharp.Benchmarks/Bulk/PremultiplyVector4.cs b/tests/ImageSharp.Benchmarks/Bulk/PremultiplyVector4.cs
@@ -6,11 +6,11 @@
 using System.Runtime.InteropServices;
 using BenchmarkDotNet.Attributes;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 public class PremultiplyVector4
 {
-    private static readonly Vector4[] Vectors = CreateVectors();
+    private static readonly Vector4[] Vectors = Vector4Factory.CreateVectors();
 
     [Benchmark(Baseline = true)]
     public void PremultiplyBaseline()
@@ -46,29 +46,4 @@ private static void Premultiply(ref Vector4 source)
         source *= w;
         source.W = w;
     }
-
-    private static Vector4[] CreateVectors()
-    {
-        Random rnd = new(42);
-        return GenerateRandomVectorArray(rnd, 2048, 0, 1);
-    }
-
-    private static Vector4[] GenerateRandomVectorArray(Random rnd, int length, float minVal, float maxVal)
-    {
-        Vector4[] values = new Vector4[length];
-
-        for (int i = 0; i < length; i++)
-        {
-            ref Vector4 v = ref values[i];
-            v.X = GetRandomFloat(rnd, minVal, maxVal);
-            v.Y = GetRandomFloat(rnd, minVal, maxVal);
-            v.Z = GetRandomFloat(rnd, minVal, maxVal);
-            v.W = GetRandomFloat(rnd, minVal, maxVal);
-        }
-
-        return values;
-    }
-
-    private static float GetRandomFloat(Random rnd, float minVal, float maxVal)
-        => ((float)rnd.NextDouble() * (maxVal - minVal)) + minVal;
 }
diff --git a/tests/ImageSharp.Benchmarks/Bulk/Rgb24Bytes.cs b/tests/ImageSharp.Benchmarks/Bulk/Rgb24Bytes.cs
@@ -7,7 +7,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 public abstract class Rgb24Bytes<TPixel>
     where TPixel : unmanaged, IPixel<TPixel>
diff --git a/tests/ImageSharp.Benchmarks/Bulk/Shuffle3Channel.cs b/tests/ImageSharp.Benchmarks/Bulk/Shuffle3Channel.cs
@@ -3,7 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.HwIntrinsics_SSE_AVX))]
 public class Shuffle3Channel
diff --git a/tests/ImageSharp.Benchmarks/Bulk/Shuffle4Slice3Channel.cs b/tests/ImageSharp.Benchmarks/Bulk/Shuffle4Slice3Channel.cs
@@ -3,7 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.HwIntrinsics_SSE_AVX))]
 public class Shuffle4Slice3Channel
diff --git a/tests/ImageSharp.Benchmarks/Bulk/ShuffleByte4Channel.cs b/tests/ImageSharp.Benchmarks/Bulk/ShuffleByte4Channel.cs
@@ -3,7 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.HwIntrinsics_SSE_AVX))]
 public class ShuffleByte4Channel
diff --git a/tests/ImageSharp.Benchmarks/Bulk/ShuffleFloat4Channel.cs b/tests/ImageSharp.Benchmarks/Bulk/ShuffleFloat4Channel.cs
@@ -4,7 +4,7 @@
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Tests;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.HwIntrinsics_SSE_AVX))]
 public class ShuffleFloat4Channel
diff --git a/tests/ImageSharp.Benchmarks/Bulk/ToRgba32Bytes.cs b/tests/ImageSharp.Benchmarks/Bulk/ToRgba32Bytes.cs
@@ -8,7 +8,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 public abstract class ToRgba32Bytes<TPixel>
     where TPixel : unmanaged, IPixel<TPixel>
diff --git a/tests/ImageSharp.Benchmarks/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Bulk/ToVector4.cs
@@ -9,7 +9,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 public abstract class ToVector4<TPixel>
     where TPixel : unmanaged, IPixel<TPixel>
diff --git a/tests/ImageSharp.Benchmarks/Bulk/ToVector4_Bgra32.cs b/tests/ImageSharp.Benchmarks/Bulk/ToVector4_Bgra32.cs
@@ -6,7 +6,7 @@
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.ShortMultiFramework))]
 public class ToVector4_Bgra32 : ToVector4<Bgra32>
diff --git a/tests/ImageSharp.Benchmarks/Bulk/ToVector4_Rgb24.cs b/tests/ImageSharp.Benchmarks/Bulk/ToVector4_Rgb24.cs
@@ -6,7 +6,7 @@
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.ShortMultiFramework))]
 public class ToVector4_Rgb24 : ToVector4<Rgb24>
diff --git a/tests/ImageSharp.Benchmarks/Bulk/ToVector4_Rgba32.cs b/tests/ImageSharp.Benchmarks/Bulk/ToVector4_Rgba32.cs
@@ -9,7 +9,7 @@
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 [Config(typeof(Config.ShortCore31))]
 public class ToVector4_Rgba32 : ToVector4<Rgba32>
diff --git a/tests/ImageSharp.Benchmarks/Bulk/UnPremultiplyVector4.cs b/tests/ImageSharp.Benchmarks/Bulk/UnPremultiplyVector4.cs
@@ -6,11 +6,11 @@
 using System.Runtime.InteropServices;
 using BenchmarkDotNet.Attributes;
 
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
 
 public class UnPremultiplyVector4
 {
-    private static readonly Vector4[] Vectors = CreateVectors();
+    private static readonly Vector4[] Vectors = Vector4Factory.CreateVectors();
 
     [Benchmark(Baseline = true)]
     public void UnPremultiplyBaseline()
@@ -47,29 +47,4 @@ private static void UnPremultiply(ref Vector4 source)
         source /= w;
         source.W = w;
     }
-
-    private static Vector4[] CreateVectors()
-    {
-        Random rnd = new(42);
-        return GenerateRandomVectorArray(rnd, 2048, 0, 1);
-    }
-
-    private static Vector4[] GenerateRandomVectorArray(Random rnd, int length, float minVal, float maxVal)
-    {
-        Vector4[] values = new Vector4[length];
-
-        for (int i = 0; i < length; i++)
-        {
-            ref Vector4 v = ref values[i];
-            v.X = GetRandomFloat(rnd, minVal, maxVal);
-            v.Y = GetRandomFloat(rnd, minVal, maxVal);
-            v.Z = GetRandomFloat(rnd, minVal, maxVal);
-            v.W = GetRandomFloat(rnd, minVal, maxVal);
-        }
-
-        return values;
-    }
-
-    private static float GetRandomFloat(Random rnd, float minVal, float maxVal)
-        => ((float)rnd.NextDouble() * (maxVal - minVal)) + minVal;
 }
diff --git a/tests/ImageSharp.Benchmarks/Bulk/Vector4Factory.cs b/tests/ImageSharp.Benchmarks/Bulk/Vector4Factory.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Numerics;
+
+namespace SixLabors.ImageSharp.Benchmarks.Bulk;
+
+internal static class Vector4Factory
+{
+    public static Vector4[] CreateVectors(int length = 2048, int min = 0, int max = 1)
+    {
+        Random rnd = new(42);
+        return GenerateRandomVectorArray(rnd, length, min, max);
+    }
+
+    private static Vector4[] GenerateRandomVectorArray(Random rnd, int length, float minVal, float maxVal)
+    {
+        Vector4[] values = new Vector4[length];
+
+        for (int i = 0; i < length; i++)
+        {
+            ref Vector4 v = ref values[i];
+            v.X = GetRandomFloat(rnd, minVal, maxVal);
+            v.Y = GetRandomFloat(rnd, minVal, maxVal);
+            v.Z = GetRandomFloat(rnd, minVal, maxVal);
+            v.W = GetRandomFloat(rnd, minVal, maxVal);
+        }
+
+        return values;
+    }
+
+    private static float GetRandomFloat(Random rnd, float minVal, float maxVal)
+        => (float)rnd.NextDouble() * (maxVal - minVal) + minVal;
+}
diff --git a/tests/ImageSharp.Benchmarks/General/GetSetPixel.cs b/tests/ImageSharp.Benchmarks/General/GetSetPixel.cs
@@ -12,15 +12,15 @@ public class GetSetPixel
     [Benchmark(Baseline = true, Description = "System.Drawing GetSet pixel")]
     public System.Drawing.Color GetSetSystemDrawing()
     {
-        using var source = new Bitmap(400, 400);
+        using Bitmap source = new(400, 400);
         source.SetPixel(200, 200, System.Drawing.Color.White);
         return source.GetPixel(200, 200);
     }
 
     [Benchmark(Description = "ImageSharp GetSet pixel")]
     public Rgba32 GetSetImageSharp()
     {
-        using var image = new Image<Rgba32>(400, 400);
+        using Image<Rgba32> image = new(400, 400);
         image[200, 200] = Color.White;
         return image[200, 200];
     }
diff --git a/tests/ImageSharp.Benchmarks/General/Vectorization/ColorNumerics.cs b/tests/ImageSharp.Benchmarks/General/Vectorization/ColorNumerics.cs
diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
@@ -11,7 +11,13 @@
     <IsTestProject>false</IsTestProject>
     <Configurations>Debug;Release</Configurations>
     <!-- Uncomment this to run benchmarks depending on Colorful or Pfim (colorspaces and TGA): -->
-    <!--<SignAssembly>false</SignAssembly>-->
+    <!--<SignAssembly>false</SignAssembly>-->    
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--BenchmarkDotNet cannot run static benchmarks-->
+    <!--Mark members as static-->
+    <NoWarn>CA1822</NoWarn>
   </PropertyGroup>
 
   <Choose>
@@ -53,7 +59,7 @@
     <Compile Remove="Codecs\Jpeg\BlockOperations\**" />
     <Compile Remove="Codecs\Jpeg\YCbCrColorConversion.cs" />
     <Compile Remove="Codecs\Jpeg\DecodeJpegParseStreamOnly.cs" />
-    <Compile Remove="Color\Bulk\**" />
+    <Compile Remove="Bulk\**" />
     <Compile Remove="Color\RgbToYCbCr.cs" />
     <Compile Remove="Color\YCbCrToRgb.cs" />
     <Compile Remove="General\Vectorization\**" />
diff --git a/tests/ImageSharp.Benchmarks/Processing/BokehBlur.cs b/tests/ImageSharp.Benchmarks/Processing/BokehBlur.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`using System.Numerics;`
`5`	`5`	`using System.Runtime.CompilerServices;`
`6`		`-using System.Runtime.InteropServices;`
`7`	`6`
`8`	`7`	`namespace SixLabors.ImageSharp;`
`9`	`8`
`@@ -17,7 +16,7 @@ internal static class ColorNumerics`
`17`	`16`	`/// Vector for converting pixel to gray value as specified by`
`18`	`17`	`/// ITU-R Recommendation BT.709.`
`19`	`18`	`/// </summary>`
`20`		`- private static readonly Vector4 Bt709 = new Vector4(.2126f, .7152f, .0722f, 0.0f);`
	`19`	`+ private static readonly Vector4 Bt709 = new(.2126f, .7152f, .0722f, 0.0f);`
`21`	`20`
`22`	`21`	`/// <summary>`
`23`	`22`	`/// Convert a pixel value to grayscale using ITU-R Recommendation BT.709.`
`@@ -167,11 +166,9 @@ public static void Transform(ref Vector4 vector, ref ColorMatrix matrix)`
`167`	`166`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`168`	`167`	`public static void Transform(Span<Vector4> vectors, ref ColorMatrix matrix)`
`169`	`168`	`{`
`170`		`- ref Vector4 baseRef = ref MemoryMarshal.GetReference(vectors);`
`171`		`-`
`172`	`169`	`for (int i = 0; i < vectors.Length; i++)`
`173`	`170`	`{`
`174`		`- ref Vector4 v = ref Unsafe.Add(ref baseRef, i);`
	`171`	`+ ref Vector4 v = ref vectors[i];`
`175`	`172`	`Transform(ref v, ref matrix);`
`176`	`173`	`}`
`177`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using SixLabors.ImageSharp.PixelFormats;`
`9`	`9`
`10`	`10`	`// ReSharper disable InconsistentNaming`
`11`		`-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk;`
	`11`	`+namespace SixLabors.ImageSharp.Benchmarks.Bulk;`
`12`	`12`
`13`	`13`	`public abstract class FromRgba32Bytes<TPixel>`
`14`	`14`	`where TPixel : unmanaged, IPixel<TPixel>`
`@@ -64,7 +64,7 @@ public void CommonBulk()`
`64`	`64`	`[Benchmark]`
`65`	`65`	`public void OptimizedBulk()`
`66`	`66`	`{`
`67`		`- PixelOperations<TPixel>.Instance.FromRgba32Bytes(this.configuration, this.source.GetSpan(), this.destination.GetSpan(), this.Count);`
	`67`	`+ PixelOperations<TPixel>.Instance.FromRgba32Bytes(this.configuration, this.source.GetSpan(), this.destination.GetSpan(), this.Count);`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`