Merge pull request #3044 from SixLabors/js/resize-perf

Minor optimizations to Resize.

src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeKernelMap.cs

@@ -102,6 +102,12 @@ internal partial class ResizeKernelMap : IDisposable
     [MethodImpl(InliningOptions.ShortMethod)]
     internal ref ResizeKernel GetKernel(nuint destIdx) => ref this.kernels[(int)destIdx];
 
+    /// <summary>
+    /// Returns a read-only span of <see cref="ResizeKernel"/> over the underlying kernel data.
+    /// </summary>
+    [MethodImpl(InliningOptions.ShortMethod)]
+    internal ReadOnlySpan<ResizeKernel> GetKernelSpan() => this.kernels;
+
     /// <summary>
     /// Computes the weights to apply at each pixel when resizing.
     /// </summary>

src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeWorker.cs

@@ -110,34 +110,62 @@ internal sealed class ResizeWorker<TPixel> : IDisposable
     {
         Span<Vector4> tempColSpan = this.tempColumnBuffer.GetSpan();
 
-        // When creating transposedFirstPassBuffer, we made sure it's contiguous:
+        // When creating transposedFirstPassBuffer, we made sure it's contiguous.
         Span<Vector4> transposedFirstPassBufferSpan = this.transposedFirstPassBuffer.DangerousGetSingleSpan();
 
         int left = this.targetWorkingRect.Left;
-        int right = this.targetWorkingRect.Right;
         int width = this.targetWorkingRect.Width;
+        nuint widthCount = (uint)width;
+
+        // Normalize destination-space Y to kernel indices using uint arithmetic.
+        // This relies on the contract that processing addresses are normalized (cropping/padding handled by targetOrigin).
+        int targetOriginY = this.targetOrigin.Y;
+
+        // Hoist invariant calculations outside the loop.
+        int currentWindowMax = this.currentWindow.Max;
+        int currentWindowMin = this.currentWindow.Min;
+        nuint workerHeight = (uint)this.workerHeight;
+        nuint workerHeight2 = workerHeight * 2;
+
+        // Ref-walk the kernel table to avoid bounds checks in the tight loop.
+        ReadOnlySpan<ResizeKernel> vKernels = this.verticalKernelMap.GetKernelSpan();
+        ref ResizeKernel vKernelBase = ref MemoryMarshal.GetReference(vKernels);
+
+        ref Vector4 tempRowBase = ref MemoryMarshal.GetReference(tempColSpan);
+
         for (int y = rowInterval.Min; y < rowInterval.Max; y++)
         {
-            // Ensure offsets are normalized for cropping and padding.
-            ResizeKernel kernel = this.verticalKernelMap.GetKernel((uint)(y - this.targetOrigin.Y));
+            // Normalize destination-space Y to an unsigned kernel index.
+            uint vIdx = (uint)(y - targetOriginY);
+            ref ResizeKernel kernel = ref Unsafe.Add(ref vKernelBase, (nint)vIdx);
 
-            while (kernel.StartIndex + kernel.Length > this.currentWindow.Max)
+            // Slide the working window when the kernel would read beyond the current cached region.
+            int kernelEnd = kernel.StartIndex + kernel.Length;
+            while (kernelEnd > currentWindowMax)
             {
                 this.Slide();
+                currentWindowMax = this.currentWindow.Max;
+                currentWindowMin = this.currentWindow.Min;
             }
 
-            ref Vector4 tempRowBase = ref MemoryMarshal.GetReference(tempColSpan);
+            int top = kernel.StartIndex - currentWindowMin;
+            ref Vector4 colRef0 = ref transposedFirstPassBufferSpan[top];
 
-            int top = kernel.StartIndex - this.currentWindow.Min;
+            // Unroll by 2 and advance column refs via arithmetic to reduce inner-loop overhead.
+            nuint i = 0;
+            for (; i + 1 < widthCount; i += 2)
+            {
+                ref Vector4 colRef1 = ref Unsafe.Add(ref colRef0, workerHeight);
 
-            ref Vector4 fpBase = ref transposedFirstPassBufferSpan[top];
+                Unsafe.Add(ref tempRowBase, i) = kernel.ConvolveCore(ref colRef0);
+                Unsafe.Add(ref tempRowBase, i + 1) = kernel.ConvolveCore(ref colRef1);
 
-            for (nuint x = 0; x < (uint)(right - left); x++)
-            {
-                ref Vector4 firstPassColumnBase = ref Unsafe.Add(ref fpBase, x * (uint)this.workerHeight);
+                colRef0 = ref Unsafe.Add(ref colRef0, workerHeight2);
+            }
 
-                // Destination color components
-                Unsafe.Add(ref tempRowBase, x) = kernel.ConvolveCore(ref firstPassColumnBase);
+            if (i < widthCount)
+            {
+                Unsafe.Add(ref tempRowBase, i) = kernel.ConvolveCore(ref colRef0);
             }
 
             Span<TPixel> targetRowSpan = destination.DangerousGetRowSpan(y).Slice(left, width);
@@ -171,7 +199,19 @@ internal sealed class ResizeWorker<TPixel> : IDisposable
 
         nuint left = (uint)this.targetWorkingRect.Left;
         nuint right = (uint)this.targetWorkingRect.Right;
+        nuint widthCount = right - left;
+
+        // Normalize destination-space X to kernel indices using uint arithmetic.
+        // This relies on the contract that processing addresses are normalized (cropping/padding handled by targetOrigin).
         nuint targetOriginX = (uint)this.targetOrigin.X;
+
+        nuint workerHeight = (uint)this.workerHeight;
+        int currentWindowMin = this.currentWindow.Min;
+
+        // Ref-walk the kernel table to avoid bounds checks in the tight loop.
+        ReadOnlySpan<ResizeKernel> hKernels = this.horizontalKernelMap.GetKernelSpan();
+        ref ResizeKernel hKernelBase = ref MemoryMarshal.GetReference(hKernels);
+
         for (int y = calculationInterval.Min; y < calculationInterval.Max; y++)
         {
             Span<TPixel> sourceRow = this.source.DangerousGetRowSpan(y);
@@ -182,17 +222,30 @@ internal sealed class ResizeWorker<TPixel> : IDisposable
                 tempRowSpan,
                 this.conversionModifiers);
 
-            // optimization for:
-            // Span<Vector4> firstPassSpan = transposedFirstPassBufferSpan.Slice(y - this.currentWindow.Min);
-            ref Vector4 firstPassBaseRef = ref transposedFirstPassBufferSpan[y - this.currentWindow.Min];
+            ref Vector4 firstPassBaseRef = ref transposedFirstPassBufferSpan[y - currentWindowMin];
+
+            // Unroll by 2 to reduce loop and kernel lookup overhead.
+            nuint x = left;
+            nuint z = 0;
+
+            for (; z + 1 < widthCount; x += 2, z += 2)
+            {
+                nuint hIdx0 = (uint)(x - targetOriginX);
+                nuint hIdx1 = (uint)((x + 1) - targetOriginX);
+
+                ref ResizeKernel kernel0 = ref Unsafe.Add(ref hKernelBase, (nint)hIdx0);
+                ref ResizeKernel kernel1 = ref Unsafe.Add(ref hKernelBase, (nint)hIdx1);
+
+                Unsafe.Add(ref firstPassBaseRef, z * workerHeight) = kernel0.Convolve(tempRowSpan);
+                Unsafe.Add(ref firstPassBaseRef, (z + 1) * workerHeight) = kernel1.Convolve(tempRowSpan);
+            }
 
-            for (nuint x = left, z = 0; x < right; x++, z++)
+            if (z < widthCount)
             {
-                ResizeKernel kernel = this.horizontalKernelMap.GetKernel(x - targetOriginX);
+                nuint hIdx = (uint)(x - targetOriginX);
+                ref ResizeKernel kernel = ref Unsafe.Add(ref hKernelBase, (nint)hIdx);
 
-                // optimization for:
-                // firstPassSpan[x * this.workerHeight] = kernel.Convolve(tempRowSpan);
-                Unsafe.Add(ref firstPassBaseRef, z * (uint)this.workerHeight) = kernel.Convolve(tempRowSpan);
+                Unsafe.Add(ref firstPassBaseRef, z * workerHeight) = kernel.Convolve(tempRowSpan);
             }
         }
     }

tests/ImageSharp.Benchmarks/Config.cs

@@ -10,6 +10,7 @@ using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Environments;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Reports;
+using BenchmarkDotNet.Toolchains.InProcess.Emit;
 
 namespace SixLabors.ImageSharp.Benchmarks;
 
@@ -45,6 +46,15 @@ public partial class Config : ManualConfig
                            .WithArguments([new MsBuildArgument("/p:DebugType=portable")]));
     }
 
+    public class StandardInProcess : Config
+    {
+        public StandardInProcess() => this.AddJob(
+            Job.Default
+                .WithRuntime(CoreRuntime.Core80)
+                .WithToolchain(InProcessEmitToolchain.Instance)
+                .WithArguments([new MsBuildArgument("/p:DebugType=portable")]));
+    }
+
 #if OS_WINDOWS
     private bool IsElevated => new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);
 #endif

tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

@@ -57,8 +57,9 @@
 
   <ItemGroup>
     <PackageReference Include="Magick.NET-Q16-AnyCPU" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" Condition="'$(IsWindows)'=='true'" />
+    <PackageReference Include="Microsoft.VisualStudio.DiagnosticsHub.BenchmarkDotNetDiagnosers" Version="18.3.36812.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.8" Condition="'$(IsWindows)'=='true'" />
     <PackageReference Include="Colourful" />
     <PackageReference Include="NetVips" />
     <PackageReference Include="NetVips.Native" />

tests/ImageSharp.Benchmarks/Processing/Resize.cs

@@ -12,7 +12,7 @@ using SDImage = System.Drawing.Image;
 
 namespace SixLabors.ImageSharp.Benchmarks;
 
-[Config(typeof(Config.Standard))]
+[Config(typeof(Config.StandardInProcess))]
 public abstract class Resize<TPixel>
     where TPixel : unmanaged, IPixel<TPixel>
 {