Remove xunit-performance dependency in tests (dotnet#60711)

* Remove dependence on obsolete xunit-performance

We use BenchmarkDotNet in the dotnet/performance repo for
benchmarking now. These copies of the benchmarks are for
correctness testing, and for ease of debugging.

* Make benchmarks look more like the dotnet/performance versions

Author: BruceForstall

eng/Versions.props

@@ -143,7 +143,6 @@
     <CommandLineParserVersion>2.2.0</CommandLineParserVersion>
     <NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
     <NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
-    <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
     <MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
     <MicrosoftDiagnosticsNETCoreClientVersion>0.2.61701</MicrosoftDiagnosticsNETCoreClientVersion>
     <DNNEVersion>1.0.26</DNNEVersion>

src/tests/Common/external/external.csproj

@@ -54,10 +54,6 @@
     <PackageToInclude Include="xunit.extensibility.core"/>
     <PackageToInclude Include="xunit.extensibility.execution"/>
     <PackageToInclude Include="xunit.runner.utility"/>
-    <PackageToInclude Include="xunit.performance.api"/>
-    <PackageToInclude Include="xunit.performance.core"/>
-    <PackageToInclude Include="xunit.performance.execution"/>
-    <PackageToInclude Include="xunit.performance.metrics"/>
     <PackageToInclude Include="Microsoft.Diagnostics.Tracing.TraceEvent"/>
     <PackageToInclude Include="Newtonsoft.Json"/>
     <PackageToInclude Include="Newtonsoft.Json.Bson"/>
@@ -70,10 +66,6 @@
 
     <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="1.1.1" />
     <PackageReference Include="CommandLineParser" Version="2.1.1-beta" />
-    <PackageReference Include="xunit.performance.api" Version="$(XunitPerformanceApiPackageVersion)" />
-    <PackageReference Include="xunit.performance.core" Version="$(XunitPerformanceApiPackageVersion)" />
-    <PackageReference Include="xunit.performance.execution" Version="$(XunitPerformanceApiPackageVersion)" />
-    <PackageReference Include="xunit.performance.metrics" Version="$(XunitPerformanceApiPackageVersion)" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(TraceEventVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />

src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs

@@ -14,10 +14,6 @@ contributed by Marek Safar
 */
 
 using System;
-using Microsoft.Xunit.Performance;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureGCCounts]
 
 namespace BenchmarksGame
 {
@@ -37,12 +33,6 @@ public static int Main(String[] args)
             return check - expected + 100;
         }
 
-        [Benchmark(InnerIterationCount = 7)]
-        public static void RunBench()
-        {
-            Benchmark.Iterate(() => Bench(16, false));
-        }
-
         static int Bench(int n, bool verbose)
         {
             int maxDepth = Math.Max(minDepth + 2, n);

src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs

@@ -18,14 +18,10 @@ minor improvements by Alex Yakunin
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Microsoft.Xunit.Performance;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureGCCounts]
 
 namespace BenchmarksGame
 {
-    public sealed class BinaryTrees_5
+    public class BinaryTrees_5
     {
         public const int MinDepth = 4;
 
@@ -40,12 +36,6 @@ public static int Main(string[] args)
             return check - expected + 100;
         }
 
-        [Benchmark(InnerIterationCount = 7)]
-        public static void RunBench()
-        {
-            Benchmark.Iterate(() => Bench(16, false));
-        }
-
         static int Bench(int n, bool verbose)
         {
             var maxDepth = n < (MinDepth + 2) ? MinDepth + 2 : n;

src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs

@@ -13,16 +13,12 @@
 */
 
 using System;
-using Microsoft.Xunit.Performance;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
 
 namespace BenchmarksGame
 {
     public class FannkuchRedux_2
     {
-        public static int[] fannkuch(int n)
+        public int[] fannkuch(int n)
         {
             int[] p = new int[n], q = new int[n], s = new int[n];
             int sign = 1, maxflips = 0, sum = 0, m = n - 1;
@@ -78,24 +74,14 @@ public static int[] fannkuch(int n)
         static int Main(string[] args)
         {
             int n = (args.Length > 0) ? Int32.Parse(args[0]) : 7;
-            var pf = fannkuch(n);
+            var fr2 = new FannkuchRedux_2();
+            var pf = fr2.fannkuch(n);
             Console.Write("{0}\nPfannkuchen({1}) = {2}\n", pf[0], n, pf[1]);
 
             int expected = 228;
 
             // Return 100 on success, anything else on failure.
             return pf[0] - expected + 100;
         }
-
-        [Benchmark(InnerIterationCount = 7)]
-        [InlineData(10, 73196)]
-        public static void RunBench(int n, int expectedSum)
-        {
-            Benchmark.Iterate(() =>
-            {
-                var pf = fannkuch(n);
-                Assert.Equal(expectedSum, pf[0]);
-            });
-        }
     }
 }

src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs

@@ -17,14 +17,10 @@ parallel and small optimisations by Anthony Lloyd
 using System;
 using System.Threading;
 using System.Runtime.CompilerServices;
-using Microsoft.Xunit.Performance;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
 
 namespace BenchmarksGame
 {
-    public static class FannkuchRedux_5
+    public class FannkuchRedux_5
     {
         static int[] fact, chkSums, maxFlips;
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -113,17 +109,6 @@ public static int Main(string[] args)
             return sum - expected + 100;
         }
 
-        [Benchmark(InnerIterationCount = 20)]
-        [InlineData(10, 38)]
-        public static void RunBench(int n, int expectedSum)
-        {
-            Benchmark.Iterate(() =>
-            {
-                int sum = Bench(n, false);
-                Assert.Equal(expectedSum, sum);
-            });
-        }
-
         static int Bench(int n, bool verbose)
         {
             fact = new int[n + 1];

src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs

@@ -23,9 +23,6 @@ modified by Josh Goldfoot (fasta-repeat buffering)
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Xunit.Performance;
-
-[assembly: OptimizeForBenchmarks]
 
 namespace BenchmarksGame
 {
@@ -46,12 +43,6 @@ public static int Main(string[] args)
             return 100;
         }
 
-        [Benchmark(InnerIterationCount = 4000)]
-        public static void RunBench()
-        {
-            Benchmark.Iterate(() => Bench(5000, false));
-        }
-
         static void Bench(int n, bool verbose)
         {
             MakeCumulative(IUB);
@@ -65,8 +56,6 @@ static void Bench(int n, bool verbose)
             }
         }
 
-
-
         public static IEnumerable<R> TransformQueue<T, R>(BlockingCollection<T> queue,
             Func<T, R> transform, int threadCount)
         {

src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs

@@ -16,9 +16,6 @@ optimizations by Alp Toker <alp@atoker.com>
 using System;
 using System.IO;
 using System.Text;
-using Microsoft.Xunit.Performance;
-
-[assembly: OptimizeForBenchmarks]
 
 namespace BenchmarksGame
 {
@@ -32,12 +29,6 @@ static int Main(string[] args)
             return 100;
         }
 
-        [Benchmark(InnerIterationCount = 2500)]
-        public static void RunBench()
-        {
-            Benchmark.Iterate(() => Bench(5000, false));
-        }
-
         static void Bench(int n, bool verbose)
         {
             MakeCumulative(HomoSapiens);

src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs

@@ -16,15 +16,9 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Text;
-using Microsoft.Xunit.Performance;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureGCCounts]
 
 namespace BenchmarksGame
 {
-
     public struct ByteString : IEquatable<ByteString>
     {
         public byte[] Array;
@@ -102,22 +96,6 @@ public static int Main(string[] args)
             return 100;
         }
 
-        [Benchmark(InnerIterationCount = 3)]
-        public static void RunBench()
-        {
-            var helpers = new TestHarnessHelpers(bigInput: true);
-            bool ok = true;
-
-            Benchmark.Iterate(() =>
-            {
-                using (var inputStream = helpers.GetInputStream())
-                {
-                    ok &= Bench(inputStream, helpers, false);
-                }
-            });
-            Assert.True(ok);
-        }
-
         static bool Bench(Stream inputStream, TestHarnessHelpers helpers, bool verbose)
         {
             string line;

src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs

@@ -20,16 +20,11 @@ submitted by Josh Goldfoot
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Runtime.CompilerServices;
-using Microsoft.Xunit.Performance;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureGCCounts]
 
 namespace BenchmarksGame
 {
     class Wrapper { public int v = 1; }
-    public static class KNucleotide_9
+    public class KNucleotide_9
     {
         const int BLOCK_SIZE = 1024 * 1024 * 8;
         static List<byte[]> threeBlocks = new List<byte[]>();
@@ -265,19 +260,6 @@ public static int Main(string[] args)
             return (ok ? 100 : -1);
         }
 
-        [Benchmark(InnerIterationCount = 10)]
-        public static void RunBench()
-        {
-            var helpers = new TestHarnessHelpers(bigInput: true);
-            bool ok = true;
-
-            Benchmark.Iterate(() =>
-            {
-                ok &= Bench(helpers, false);
-            });
-            Assert.True(ok);
-        }
-
         static bool Bench(TestHarnessHelpers helpers, bool verbose)
         {
             // Reset static state