Merge remote-tracking branch 'origin/master'

Cysharp · Apr 19, 2021 · 11760ec · 11760ec
2 parents 55dd1e3 + 48a6d75
commit 11760ec
Show file tree

Hide file tree

Showing 12 changed files with 650 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ async void Example(int x, int y, int z)
     // create Utf8 StringBuilder that build Utf8 directly to avoid encoding
     using var sb2 = ZString.CreateUtf8StringBuilder();
 
-    sb2.Concat("foo:", x, ", bar:", y);
+    sb2.AppendFormat("foo:{0} bar:{1}", x, y);
 
     // directly write to steam or dest to avoid allocation
     await sb2.WriteToAsync(stream);

diff --git a/sandbox/PerfBenchmark/Benchmarks/AppendPerformance.cs b/sandbox/PerfBenchmark/Benchmarks/AppendPerformance.cs
@@ -0,0 +1,122 @@
+using BenchmarkDotNet.Attributes;
+using Cysharp.Text;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace PerfBenchmark.Benchmarks
+{
+    [Config(typeof(BenchmarkConfig))]
+    public class AppendPerformance
+    {
+        List<string> strings;
+        const int COUNT = 1000;
+
+        public AppendPerformance()
+        {
+            strings = new List<string>();
+            for (int i = 0; i < 100; i++)
+            {
+                strings.Add("123456789");
+            }
+        }
+
+        [Benchmark]
+        public void ZStringUtf16()
+        {
+            for (int i = 0; i < COUNT; i++)
+            {
+                using (var sb = ZString.CreateStringBuilder())
+                {
+                    for (int j = 0; j < strings.Count; j++)
+                    {
+                        sb.Append(strings[j]);
+                    }
+
+                    _ = sb.ToString();
+                }
+            }
+        }
+
+        //[Benchmark]
+        //public void ZStringUtf16SpanBased()
+        //{
+        //    for (int i = 0; i < COUNT; i++)
+        //    {
+        //        using (var sb = ZString.CreateStringBuilder())
+        //        {
+        //            for (int j = 0; j < strings.Count; j++)
+        //            {
+        //                sb.AppendSlow(strings[j]);
+        //            }
+
+        //            _ = sb.ToString();
+        //        }
+        //    }
+        //}
+
+        [Benchmark(Baseline = true)]
+        public void StringBuilder()
+        {
+            for (int i = 0; i < COUNT; i++)
+            {
+                System.Text.StringBuilder sb = new System.Text.StringBuilder();
+                for (int j = 0; j < strings.Count; j++)
+                {
+                    sb.Append(strings[j]);
+                }
+
+                _ = sb.ToString();
+            }
+        }
+    }
+
+
+    [Config(typeof(BenchmarkConfig))]
+    public class Utf8AppendPerformance
+    {
+        List<string> strings;
+        const int COUNT = 1000;
+
+        public Utf8AppendPerformance()
+        {
+            strings = new List<string>();
+            for (int i = 0; i < 100; i++)
+            {
+                strings.Add("123456789");
+            }
+        }
+
+        [Benchmark]
+        public void ZStringUtf8()
+        {
+            for (int i = 0; i < COUNT; i++)
+            {
+                using (var sb = ZString.CreateUtf8StringBuilder())
+                {
+                    for (int j = 0; j < strings.Count; j++)
+                    {
+                        sb.Append(strings[j]);
+                    }
+
+                    _ = sb.AsSpan().ToArray();
+                }
+            }
+        }
+
+        [Benchmark(Baseline = true)]
+        public void StringBuilder()
+        {
+            for (int i = 0; i < COUNT; i++)
+            {
+                System.Text.StringBuilder sb = new System.Text.StringBuilder();
+                for (int j = 0; j < strings.Count; j++)
+                {
+                    sb.Append(strings[j]);
+                }
+
+                _ = sb.ToString();
+            }
+        }
+    }
+}
diff --git a/sandbox/PerfBenchmark/Benchmarks/StringBuilderAppendJoin.cs b/sandbox/PerfBenchmark/Benchmarks/StringBuilderAppendJoin.cs
@@ -17,8 +17,10 @@ public StringBuilderAppendJoin()
             fValues = new[] { 0f, float.MaxValue, float.MinValue };
             mValues = new[] { 0m, decimal.MaxValue, decimal.MinValue };
 
+#if NETCOREAPP || NETSTANDARD2_1
             if (StringBuilder() != ZStringBuilder())
                 throw new Exception();
+#endif
         }
 
 

diff --git a/sandbox/PerfBenchmark/PerfBenchmark.csproj b/sandbox/PerfBenchmark/PerfBenchmark.csproj
@@ -1,17 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFrameworks>net5.0</TargetFrameworks>
+        <LangVersion>8.0</LangVersion>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="StringFormatter" Version="1.0.0.13" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+        <PackageReference Include="StringFormatter" Version="1.0.0.13" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\ZString\ZString.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\ZString\ZString.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/sandbox/PerfBenchmark/Program.cs b/sandbox/PerfBenchmark/Program.cs
@@ -1,6 +1,7 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Environments;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Running;
@@ -17,7 +18,10 @@ internal class BenchmarkConfig : ManualConfig
         public BenchmarkConfig()
         {
             AddDiagnoser(MemoryDiagnoser.Default);
-            AddJob(Job.ShortRun.WithWarmupCount(1).WithIterationCount(1));
+            AddJob(Job.ShortRun.WithWarmupCount(1).WithIterationCount(1).WithRuntime(CoreRuntime.Core50));
+
+            // Add Targetframeworks net47 to csproj(removed for CI)
+            //AddJob(Job.ShortRun.WithWarmupCount(1).WithIterationCount(1).WithRuntime(ClrRuntime.Net47));
         }
     }