wip2

Author: antonfirsov

tests/ImageSharp.Drawing.Benchmarks/Drawing/FillTiger.cs

@@ -5,7 +5,6 @@
 using System.Drawing.Drawing2D;
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.Drawing.Processing.Backends;
 using SixLabors.ImageSharp.Drawing.Tests;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
@@ -35,8 +34,6 @@ public class FillTiger
     private Image<Rgba32> image;
     private List<(IPath Path, Processing.SolidBrush Fill, SolidPen Stroke)> isElements;
 
-    private WebGPURenderTarget<Rgba32> webGpuTarget;
-
     [Params(1000, 100)]
     public int Dimensions { get; set; }
 
@@ -64,8 +61,6 @@ public void Setup()
 
         this.image = new Image<Rgba32>(width, height);
         this.isElements = SvgBenchmarkHelper.BuildImageSharpElements(elements, scale);
-
-        this.webGpuTarget = new WebGPURenderTarget<Rgba32>(width, height);
     }
 
     [IterationSetup]
@@ -98,8 +93,6 @@ public void Cleanup()
         this.sdBitmap.Dispose();
 
         this.image.Dispose();
-
-        this.webGpuTarget.Dispose();
     }
 
     [Benchmark(Baseline = true)]
@@ -139,83 +132,19 @@ public void SystemDrawing()
 
     [Benchmark]
     public void ImageSharp()
-        => this.image.Mutate(c => c.ProcessWithCanvas(canvas =>
-        {
-            foreach ((IPath path, Processing.SolidBrush fill, SolidPen stroke) in this.isElements)
-            {
-                if (fill is not null)
-                {
-                    canvas.Fill(fill, path);
-                }
-
-                if (stroke is not null)
-                {
-                    canvas.Draw(stroke, path);
-                }
-            }
-        }));
-
-    [Benchmark]
-    public void ImageSharp_SingleThreaded()
-    {
-        Configuration configuration = this.image.Configuration.Clone();
-        configuration.MaxDegreeOfParallelism = 1;
-        this.image.Mutate(configuration, c => c.ProcessWithCanvas(canvas =>
+        => this.image.Mutate(c =>
         {
             foreach ((IPath path, Processing.SolidBrush fill, SolidPen stroke) in this.isElements)
             {
                 if (fill is not null)
                 {
-                    canvas.Fill(fill, path);
+                    c.Fill(fill, path);
                 }
 
                 if (stroke is not null)
                 {
-                    canvas.Draw(stroke, path);
+                    c.Draw(stroke, path);
                 }
             }
-        }));
-    }
-
-    [Benchmark]
-    public void ImageSharpWebGPU()
-    {
-        using DrawingCanvas<Rgba32> canvas = this.webGpuTarget.CreateCanvas();
-        foreach ((IPath path, Processing.SolidBrush fill, SolidPen stroke) in this.isElements)
-        {
-            if (fill is not null)
-            {
-                canvas.Fill(fill, path);
-            }
-
-            if (stroke is not null)
-            {
-                canvas.Draw(stroke, path);
-            }
-        }
-
-        canvas.Flush();
-    }
-
-    public static void VerifyOutput()
-    {
-        FillTiger bench = new();
-        bench.Setup();
-
-        bench.SkiaSharp();
-        bench.SystemDrawing();
-        bench.ImageSharp();
-        bench.ImageSharpWebGPU();
-
-        //SvgBenchmarkHelper.VerifyOutput(
-        //    "tiger",
-        //    Width,
-        //    Height,
-        //    bench.skSurface,
-        //    bench.sdBitmap,
-        //    bench.image,
-        //    bench.webGpuTarget.TextureHandle);
-
-        bench.Cleanup();
-    }
+        });
 }

tests/ImageSharp.Drawing.Benchmarks/ImageSharp.Drawing.Benchmarks.csproj

@@ -20,7 +20,7 @@
       </PropertyGroup>
     </Otherwise>
   </Choose>
-  
+
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
     <PackageReference Include="System.Drawing.Common" />
@@ -45,6 +45,9 @@
     <Compile Include="..\ImageSharp.Drawing.Tests\TestUtilities\TestEnvironment.cs">
       <Link>TestEnvironment.cs</Link>
     </Compile>
+    <Compile Include="..\ImageSharp.Drawing.Tests\TestUtilities\SvgBenchmarkHelper.cs">
+      <Link>SvgBenchmarkHelper.cs</Link>
+    </Compile>
   </ItemGroup>
 
 </Project>

tests/ImageSharp.Drawing.Tests/Drawing/SvgTests.cs

@@ -0,0 +1,36 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using SixLabors.ImageSharp.Drawing.Processing;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+
+namespace SixLabors.ImageSharp.Drawing.Tests.Drawing;
+
+public class SvgTests
+{
+    [Theory]
+    [WithBlankImage(200, 200, PixelTypes.Rgba32, 1f)]
+    public void Tiger<TPixel>(TestImageProvider<TPixel> provider, float scale)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+        List<(IPath Path, SolidBrush Fill, SolidPen Stroke)> elements = SvgBenchmarkHelper.BuildImageSharpElements(
+            SvgBenchmarkHelper.ParseSvg(TestFile.GetInputFileFullPath(TestImages.Svg.GhostscriptTiger)), scale);
+        Image<TPixel> image = provider.GetImage();
+        image.Mutate(c =>
+        {
+            foreach ((IPath path, SolidBrush fill, SolidPen stroke) in elements)
+            {
+                if (fill is not null)
+                {
+                    c.Fill(fill, path);
+                }
+
+                if (stroke is not null)
+                {
+                    c.Draw(stroke, path);
+                }
+            }
+        });
+    }
+}

tests/ImageSharp.Drawing.Tests/TestImages.cs

@@ -394,4 +394,10 @@ public static class GeoJson
     {
         public const string States = "GeoJson/States.json";
     }
+
+    public static class Svg
+    {
+        public const string GhostscriptTiger = "Svg/Ghostscript_Tiger.svg";
+        public const string Paris30k = "Svg/paris-30k.svg";
+    }
 }