From 63c3bb99fcc68a3a5d07ddeb572f783ff774fc76 Mon Sep 17 00:00:00 2001 From: Mark Plesko Date: Wed, 26 Apr 2023 11:36:09 -0700 Subject: [PATCH 1/6] Manual removal of C# Main args --- .../binarytrees/binarytrees-2.cs | 12 ++++++-- .../binarytrees/binarytrees-5.cs | 10 +++++-- .../binarytrees/binarytrees-6.cs | 10 +++++-- .../fannkuch-redux/fannkuch-redux-2.cs | 11 +++++-- .../fannkuch-redux/fannkuch-redux-5.cs | 10 +++++-- .../fannkuch-redux/fannkuch-redux-9.cs | 10 +++++-- .../BenchmarksGame/fasta/fasta-1.cs | 10 +++++-- .../BenchmarksGame/fasta/fasta-2.cs | 11 +++++-- .../BenchmarksGame/mandelbrot/mandelbrot-2.cs | 13 +++++--- .../BenchmarksGame/mandelbrot/mandelbrot-7.cs | 10 +++++-- .../BenchmarksGame/n-body/n-body-3.cs | 11 +++++-- .../BenchmarksGame/pidigits/pidigits-3.cs | 13 ++++++-- .../spectralnorm/spectralnorm-1.cs | 11 +++++-- .../spectralnorm/spectralnorm-3.cs | 11 +++++-- .../Benchstones/BenchF/Adams/Adams.cs | 13 +++++--- .../CodeQuality/Bytemark/ByteMark.cs | 7 +++-- .../CodeQuality/Math/Functions/Functions.cs | 9 +++++- .../SIMD/ConsoleMandel/ConsoleMandel.cs | 9 +++++- .../CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs | 12 ++++++-- .../CodeQuality/SciMark/CommandLine.cs | 9 +++++- .../Performance/CodeQuality/Span/Indexer.cs | 8 ++++- .../CodeQuality/V8/Crypto/Crypto.cs | 30 ++++++------------- .../CodeQuality/V8/Richards/Richards.cs | 15 ++++++---- 23 files changed, 190 insertions(+), 75 deletions(-) diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs index 03d84e90847865..02bc5275554308 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs @@ -14,6 +14,7 @@ contributed by Marek Safar */ using System; +using System.Runtime.CompilerServices; namespace BenchmarksGame { @@ -21,10 +22,15 @@ public class BinaryTrees_2 { const int minDepth = 4; - public static int Main(String[] args) + public static int Main() { - int n = 0; - if (args.Length > 0) n = Int32.Parse(args[0]); + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + public static int Test(int? arg) + { + int n = arg ?? 0; int check = Bench(n, true); int expected = 4398; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs index 705dc7d9cad600..d542d3cff3ce70 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs @@ -25,9 +25,15 @@ public class BinaryTrees_5 { public const int MinDepth = 4; - public static int Main(string[] args) + public static int Main() { - var n = args.Length == 0 ? 0 : int.Parse(args[0]); + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + public static int Test(int? arg) + { + var n = arg ?? 0; int check = Bench(n, true); int expected = 4398; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.cs index 95bbeed65fe74d..15a61d1ff34d6f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.cs @@ -33,9 +33,15 @@ public class BinaryTrees_6 // 21 is used in official numbers; about 7.8s const int N = 18; - public static int Main(string[] args) + public static int Main() { - var n = args.Length == 0 ? 0 : int.Parse(args[0]); + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + public static int Test(int? arg) + { + var n = arg ?? 0; int check = Bench(n, true); const int expected = 4398; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs index 829bc21a1f26be..2bee47abd9399f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs @@ -13,6 +13,7 @@ */ using System; +using System.Runtime.CompilerServices; namespace BenchmarksGame { @@ -71,9 +72,15 @@ public int[] fannkuch(int n) } while (true); } - static int Main(string[] args) + public static int Main() { - int n = (args.Length > 0) ? Int32.Parse(args[0]) : 7; + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int n = arg ?? 7; var fr2 = new FannkuchRedux_2(); var pf = fr2.fannkuch(n); Console.Write("{0}\nPfannkuchen({1}) = {2}\n", pf[0], n, pf[1]); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs index a374b15da2f6fd..6de4ce9afdab2a 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs @@ -98,9 +98,15 @@ static void run(int n, int taskId, int taskSize) maxFlips[taskId] = maxflips; } - public static int Main(string[] args) + public static int Main() { - int n = args.Length > 0 ? int.Parse(args[0]) : 7; + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int n = arg ?? 7; int sum = Bench(n, true); int expected = 16; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.cs index 42eca5df7aecfd..146bea12ad7f5a 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.cs @@ -23,9 +23,15 @@ namespace BenchmarksGame //[BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame, Categories.JIT)] public unsafe class FannkuchRedux_9 { - public static int Main(string[] args) + public static int Main() { - int n = args.Length > 0 ? int.Parse(args[0]) : 7; + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int n = arg ?? 7; int sum = Bench(n, true); int expected = 228; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs index c58992a22622a7..eb479c5b4c586c 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs @@ -35,9 +35,15 @@ public class Fasta_1 const int IC = 29573; static int seed = 42; - public static int Main(string[] args) + public static int Main() { - int n = args.Length > 0 ? Int32.Parse(args[0]) : 1000; + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int n = arg ?? 1000; Bench(n, true); return 100; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs index bc20bccc48aace..8bac23168ef8f9 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs @@ -15,15 +15,22 @@ optimizations by Alp Toker using System; using System.IO; +using System.Runtime.CompilerServices; using System.Text; namespace BenchmarksGame { public class Fasta_2 { - static int Main(string[] args) + public static int Main() { - int n = args.Length > 0 ? Int32.Parse(args[0]) : 1000; + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int n = arg ?? 1000; Bench(n, true); return 100; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.cs index 0d8f3f0300739e..3ff0eb8b4e0787 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.cs @@ -14,17 +14,22 @@ using System; using System.IO; +using System.Runtime.CompilerServices; using System.Security.Cryptography; namespace BenchmarksGame { public class Mandelbrot_2 { - public static int Main(String[] args) + public static int Main() { - int width = 80; - if (args.Length > 0) - width = Int32.Parse(args[0]); + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int width = arg ?? 80; int lineLen = (width - 1) / 8 + 1; var bytes = new byte[width * lineLen]; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.cs index 72701b130e1bee..b71c5af05803a3 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.cs @@ -82,9 +82,15 @@ private static unsafe byte GetByte(double* pCrb, double Ciby, int x, int y) return (byte)(res ^ -1); } - public static int Main(string[] args) + public static int Main() { - var size = (args.Length > 0) ? int.Parse(args[0]) : 80; + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int size = arg ?? 80; var lineLength = size >> 3; var data = DoBench(size, lineLength); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.cs index 478c710c3de856..ed70146ccdb713 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.cs @@ -14,14 +14,21 @@ */ using System; +using System.Runtime.CompilerServices; namespace BenchmarksGame { public class NBody_3 { - public static int Main(String[] args) + public static int Main() { - int n = args.Length > 0 ? Int32.Parse(args[0]) : 10000; + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int n = arg ?? 10000; bool success = Bench(n, true); return (success ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs index 0471dc9f7084b5..b42a6ce5c5c047 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs @@ -19,6 +19,7 @@ */ using System; using System.Numerics; +using System.Runtime.CompilerServices; using System.Text; namespace BenchmarksGame @@ -121,9 +122,15 @@ void Run(bool verbose) } } - public static int Main(String[] args) + public static int Main() { - int n = (args.Length > 0 ? Int32.Parse(args[0]) : 10); + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int n = arg ?? 10; string result = Bench(n, true).ToString(); if (result != "3141592653\t:10") { @@ -139,4 +146,4 @@ public static StringBuilder Bench(int n, bool verbose) return m.lastBuf; } } -} \ No newline at end of file +} diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.cs index f3141bec377e81..a0ca7391e341cf 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.cs @@ -19,10 +19,15 @@ namespace BenchmarksGame { public class SpectralNorm_1 { - public static int Main(String[] args) + public static int Main() { - int n = 100; - if (args.Length > 0) n = Int32.Parse(args[0]); + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int n = arg ?? 100; double norm = new SpectralNorm_1().Bench(n); Console.WriteLine("{0:f9}", norm); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.cs index dd9f62339559bf..9528428f24c529 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.cs @@ -22,10 +22,15 @@ namespace BenchmarksGame { public class SpectralNorm_3 { - public static int Main(String[] args) + public static int Main() { - int n = 100; - if (args.Length > 0) n = Int32.Parse(args[0]); + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Test(int? arg) + { + int n = arg ?? 100; double norm = Bench(n); Console.WriteLine("{0:f9}", norm); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs index 1d1673a02281c8..181be92ca84ef7 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs @@ -100,12 +100,17 @@ private static void TestBench() } } - [MethodImpl(MethodImplOptions.NoOptimization)] - public static int Main(string[] argv) + public static int Main() { - if (argv.Length > 0) + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] + private static int Test(int? arg) + { + if (arg.HasValue) { - Iterations = Int32.Parse(argv[0]); + Iterations = (int)arg; } Stopwatch sw = Stopwatch.StartNew(); diff --git a/src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs b/src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs index a0f25ba2d5090e..4974a553129e89 100644 --- a/src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs +++ b/src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs @@ -32,6 +32,7 @@ using System; using System.IO; +using System.Runtime.CompilerServices; internal class global { @@ -260,10 +261,10 @@ public class ByteMark private static double[] s_bindex; private static HarnessTest[] s_tests; - public static int Main(string[] args) + public static int Main() { ByteMark app = new ByteMark(); - int result = app.ExecuteCore(args); + int result = app.ExecuteCore(Array.Empty()); return result; } @@ -1253,4 +1254,4 @@ static void Setup() global.align = 8; global.write_to_file = false; } -} \ No newline at end of file +} diff --git a/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.cs b/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.cs index ff528d6d083753..9b12be274899cc 100644 --- a/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.cs +++ b/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Runtime.CompilerServices; namespace Functions { @@ -56,7 +57,13 @@ public static class Program ["tanhsingle"] = MathTests.TanhSingleTest }; - private static int Main(string[] args) + public static int Main() + { + return Test(Array.Empty()); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static int Test(string[] args) { var isPassing = true; var iterations = defaultIterations; ICollection testsToRun = new HashSet(); diff --git a/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs b/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs index 3fdc7f228ca10f..07e00af3772a76 100644 --- a/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs +++ b/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs @@ -4,6 +4,7 @@ using System; using System.Diagnostics; +using System.Runtime.CompilerServices; namespace SIMD { @@ -62,7 +63,13 @@ private static void PrintUsage() Console.WriteLine("In benchmark mode, a larger set is computed but nothing is dumped."); } - private static int Main(string[] args) + public static int Main() + { + return Test(Array.Empty()); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static int Test(string[] args) { try { diff --git a/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs b/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs index 0b4cdacd2a8fb7..18a1687ddf8fd6 100644 --- a/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs +++ b/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs @@ -95,8 +95,14 @@ static bool Test(int index) // Set of indices to pass to Test(int) static int[] IndicesToTest = new int[] { 1, 3, 11, 19, 27 }; + public static int Main() + { + return TestEntry(null); + } + // Main method entrypoint runs the manual timer loop - public static int Main(string[] args) + [MethodImpl(MethodImplOptions.NoInlining)] + private static int TestEntry(int? arg) { int failures = 0; @@ -108,14 +114,14 @@ public static int Main(string[] args) } int manualLoopCount = 1; - if (args == null || args.Length == 0) + if (arg == null) { Console.WriteLine("Warning: no iteration count specified; defaulting to 1 iteration per case"); Console.WriteLine("To use multiple iterations per case, pass the desired number of iterations as the first command-line argument to this test"); } else { - manualLoopCount = int.Parse(args[0]); + manualLoopCount = (int)arg; } foreach(int index in IndicesToTest) diff --git a/src/tests/JIT/Performance/CodeQuality/SciMark/CommandLine.cs b/src/tests/JIT/Performance/CodeQuality/SciMark/CommandLine.cs index 180e0d8d713948..661d800d643088 100644 --- a/src/tests/JIT/Performance/CodeQuality/SciMark/CommandLine.cs +++ b/src/tests/JIT/Performance/CodeQuality/SciMark/CommandLine.cs @@ -13,6 +13,7 @@ using System; +using System.Runtime.CompilerServices; namespace SciMark2 { @@ -25,11 +26,17 @@ namespace SciMark2 public class CommandLine { + public static int Main() + { + return Test(Array.Empty()); + } + /// /// Benchmark 5 kernels with individual Mflops. /// "results[0]" has the average Mflop rate. /// - public static int Main(System.String[] args) + [MethodImpl(MethodImplOptions.NoInlining)] + public static int Test(System.String[] args) { #if DEBUG double min_time = Constants.RESOLUTION_TINY; diff --git a/src/tests/JIT/Performance/CodeQuality/Span/Indexer.cs b/src/tests/JIT/Performance/CodeQuality/Span/Indexer.cs index 90374a4997107b..00f4e0f8481496 100644 --- a/src/tests/JIT/Performance/CodeQuality/Span/Indexer.cs +++ b/src/tests/JIT/Performance/CodeQuality/Span/Indexer.cs @@ -927,7 +927,13 @@ public static void Usage() Console.WriteLine(); } - public static int Main(string[] args) + public static int Main() + { + return Test(Array.Empty()); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + public static int Test(string[] args) { if (args.Length > 0) { diff --git a/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs b/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs index 40db8c9d51be9d..f2615767739c7e 100644 --- a/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs +++ b/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs @@ -40,6 +40,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.Runtime.CompilerServices; namespace V8.Crypto { @@ -47,29 +48,16 @@ public class Support { private const string INPUT = "The quick brown fox jumped over the extremely lazy frogs!"; - public static int Main(String[] args) + public static int Main() { - int n = 1; - - if (args.Length > 0) - { - n = Int32.Parse(args[0]); - } - - bool verbose = false; + return Test(null, false); + } - if (args.Length > 1) - { - switch (args[1]) - { - case "verbose": - verbose = true; - break; - default: - Console.WriteLine("Bad arg: '{0}'.\n", args[1]); - return -1; - } - } + // Main method entrypoint runs the manual timer loop + [MethodImpl(MethodImplOptions.NoInlining)] + private static int Test(int? iters, bool verbose) + { + int n = iters ?? 1; Measure(n, verbose); diff --git a/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.cs b/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.cs index 0ea8a5561db9fb..199442caf1e521 100644 --- a/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.cs +++ b/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.cs @@ -10,6 +10,7 @@ #define INTF_FOR_TASK using System; +using System.Runtime.CompilerServices; namespace V8.Richards { @@ -98,13 +99,15 @@ public static bool runRichards() public const int DATA_SIZE = 4; - public static int Main(String[] args) + public static int Main() { - int n = 1; - if (args.Length > 0) - { - n = Int32.Parse(args[0]); - } + return Test(null); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + private static int Test(int? arg) + { + int n = arg ?? 1; bool result = Measure(n); return (result ? 100 : -1); } From 049d11c164edecc2952e46f9f67a8f23aeec4663 Mon Sep 17 00:00:00 2001 From: Mark Plesko Date: Fri, 28 Apr 2023 14:52:54 -0700 Subject: [PATCH 2/6] [ILTransform -prociso] Set RequiresProcessIsolation when needed by other properties --- .../CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj | 2 ++ .../CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj | 2 ++ .../CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.csproj | 2 ++ src/tests/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj | 2 ++ src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj | 2 ++ 5 files changed, 10 insertions(+) diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj index b7e5156840f2f5..01009cd7b68d7c 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj @@ -1,5 +1,7 @@ + + true Exe true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj index b7e5156840f2f5..01009cd7b68d7c 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj @@ -1,5 +1,7 @@ + + true Exe true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.csproj index b7e5156840f2f5..01009cd7b68d7c 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.csproj @@ -1,5 +1,7 @@ + + true Exe true diff --git a/src/tests/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj b/src/tests/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj index 1c1e8d3aa5a34e..54077dd3acb10c 100644 --- a/src/tests/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj @@ -1,5 +1,7 @@ + + true Exe true $(NoWarn);xUnit1013 diff --git a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj index 1c6bb21e903346..3972acd76af786 100644 --- a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj @@ -1,5 +1,7 @@ + + true Exe true $(NoWarn);xUnit1013 From f59bb15fbd86c33833f8d55aaf6bdb92149a3d6a Mon Sep 17 00:00:00 2001 From: Mark Plesko Date: Fri, 28 Apr 2023 19:11:14 -0700 Subject: [PATCH 3/6] [ILTransform -public] Make test entrypoints accessible --- .../CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs | 2 +- .../BenchmarksGame/reverse-complement/reverse-complement-1.cs | 2 +- .../BenchmarksGame/reverse-complement/reverse-complement-6.cs | 2 +- .../CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs | 4 ++-- src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs index 25b5aece71b1c3..62caa7b9c91bcc 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs @@ -22,7 +22,7 @@ namespace BenchmarksGame { public class RegexRedux_1 { - static int Main() + public static int Main() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs index c9b745040bbf94..89ba9586a7bb22 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs @@ -44,7 +44,7 @@ struct Index const byte Gt = (byte)'>'; const byte Lf = (byte)'\n'; - static int Main() + public static int Main() { var helpers = new TestHarnessHelpers(bigInput: false); var outBytes = new byte[helpers.FileLength]; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs index 26a44e86e1ae27..3da29c0315f87a 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs @@ -227,7 +227,7 @@ static void Writer() } } - static int Main() + public static int Main() { var helpers = new TestHarnessHelpers(bigInput: false); var outBytes = new byte[helpers.FileLength]; diff --git a/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs b/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs index aa49e6afeb52a8..adfe31c10dc1aa 100644 --- a/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs +++ b/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs @@ -10,7 +10,7 @@ using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -class Program +public class Program { #if DEBUG @@ -48,7 +48,7 @@ public Program() _freeBuffers = new ObjectPool(() => new int[_width * 3 * _height]); // Each pixel has 3 fields (RGB) } - static unsafe int Main() + public static unsafe int Main() { if (Avx2.IsSupported) { diff --git a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs index bedc2f6ee1a899..b4b0f62781bf96 100644 --- a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs +++ b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs @@ -98,7 +98,7 @@ public static void GetStatementsBetweenMarkers(SyntaxTree tree, out StatementSyn public static bool DataflowBench() { var text = @" -class C { +public class C { public void F(int x) { int a; From bfec17cedaff6268936bf922fafa4ad3513ba9e8 Mon Sep 17 00:00:00 2001 From: Mark Plesko Date: Fri, 28 Apr 2023 20:00:04 -0700 Subject: [PATCH 4/6] [ILTransform -ilfact] Main->TestEntryPoint, [Fact], remove OutputType=Exe --- .../CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs | 4 +++- .../BenchmarksGame/binarytrees/binarytrees-2.csproj | 1 - .../CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs | 4 +++- .../BenchmarksGame/binarytrees/binarytrees-5.csproj | 1 - .../CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.cs | 4 +++- .../BenchmarksGame/binarytrees/binarytrees-6.csproj | 1 - .../BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs | 4 +++- .../BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj | 3 --- .../BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs | 4 +++- .../BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj | 3 --- .../BenchmarksGame/fannkuch-redux/fannkuch-redux-9.cs | 4 +++- .../BenchmarksGame/fannkuch-redux/fannkuch-redux-9.csproj | 3 --- .../Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs | 4 +++- .../CodeQuality/BenchmarksGame/fasta/fasta-1.csproj | 3 --- .../Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs | 4 +++- .../CodeQuality/BenchmarksGame/fasta/fasta-2.csproj | 3 --- .../CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs | 4 +++- .../BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj | 3 --- .../CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs | 4 +++- .../BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj | 3 --- .../CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.cs | 4 +++- .../CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj | 3 --- .../CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.cs | 4 +++- .../CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj | 1 - .../Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.cs | 4 +++- .../CodeQuality/BenchmarksGame/n-body/n-body-3.csproj | 3 --- .../CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs | 4 +++- .../CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj | 3 --- .../CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs | 4 +++- .../BenchmarksGame/regex-redux/regex-redux-1.csproj | 3 --- .../CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs | 4 +++- .../BenchmarksGame/regex-redux/regex-redux-5.csproj | 3 --- .../BenchmarksGame/reverse-complement/reverse-complement-1.cs | 4 +++- .../reverse-complement/reverse-complement-1.csproj | 3 --- .../BenchmarksGame/reverse-complement/reverse-complement-6.cs | 4 +++- .../reverse-complement/reverse-complement-6.csproj | 3 --- .../CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.cs | 4 +++- .../BenchmarksGame/spectralnorm/spectralnorm-1.csproj | 3 --- .../CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.cs | 4 +++- .../BenchmarksGame/spectralnorm/spectralnorm-3.csproj | 3 --- .../Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/Adams/Adams.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/Bisect/Bisect.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj | 3 --- .../Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/DMath/DMath.csproj | 3 --- .../JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.cs | 4 +++- .../Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/InProd/InProd.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/InProd/InProd.csproj | 3 --- .../Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/LLoops/LLoops.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj | 3 --- .../Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj | 3 --- .../Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/Regula/Regula.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/Regula/Regula.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/Romber/Romber.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/Romber/Romber.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/Secant/Secant.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/Secant/Secant.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj | 3 --- .../Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj | 3 --- .../Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/Trap/Trap.csproj | 3 --- .../CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.cs | 4 +++- .../CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/8Queens/8Queens.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/AddArray/AddArray.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/Array1/Array1.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/Array1/Array1.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/Array2/Array2.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/Array2/Array2.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/BenchE/BenchE.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.cs | 4 +++- .../Benchstones/BenchI/BubbleSort/BubbleSort.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.cs | 4 +++- .../Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/CSieve/CSieve.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj | 3 --- .../JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.cs | 4 +++- .../Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/IniArray/IniArray.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.cs | 4 +++- .../Benchstones/BenchI/LogicArray/LogicArray.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.cs | 4 +++- .../Benchstones/BenchI/NDhrystone/NDhrystone.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/Permutate/Permutate.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj | 3 --- .../JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.cs | 4 +++- .../Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.cs | 4 +++- .../Benchstones/BenchI/TreeInsert/TreeInsert.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.cs | 4 +++- .../CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj | 3 --- .../CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.cs | 4 +++- .../Benchstones/BenchI/XposMatrix/XposMatrix.csproj | 3 --- .../CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.cs | 4 +++- .../CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.csproj | 3 --- .../CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.cs | 4 +++- .../CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.csproj | 3 --- .../CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.cs | 4 +++- .../CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.csproj | 3 --- .../CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.cs | 4 +++- .../CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.csproj | 3 --- .../CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.cs | 4 +++- .../CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.csproj | 3 --- .../Benchstones/MDBenchI/MDAddArray2/MDAddArray2.cs | 4 +++- .../Benchstones/MDBenchI/MDAddArray2/MDAddArray2.csproj | 3 --- .../CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.cs | 4 +++- .../CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.csproj | 3 --- .../Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.cs | 4 +++- .../Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.csproj | 3 --- .../Benchstones/MDBenchI/MDLogicArray/MDLogicArray.cs | 4 +++- .../Benchstones/MDBenchI/MDLogicArray/MDLogicArray.csproj | 3 --- .../CodeQuality/Benchstones/MDBenchI/MDMidpoint/MDMidpoint.cs | 4 +++- .../Benchstones/MDBenchI/MDMidpoint/MDMidpoint.csproj | 3 --- .../Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.cs | 4 +++- .../Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.csproj | 3 --- .../Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.cs | 4 +++- .../Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.csproj | 3 --- .../CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.cs | 4 +++- .../CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.csproj | 3 --- .../Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.cs | 4 +++- .../Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.csproj | 3 --- .../CodeQuality/BilinearInterpol/BilinearInterpol.cs | 4 +++- .../CodeQuality/BilinearInterpol/BilinearInterpol.csproj | 3 --- src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.cs | 4 +++- src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.csproj | 3 --- src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs | 4 +++- .../JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj | 1 - .../Devirtualization/DefaultEqualityComparerPerf.cs | 4 +++- .../Devirtualization/DefaultEqualityComparerPerf.csproj | 3 --- .../JIT/Performance/CodeQuality/FractalPerf/FractalPerf.cs | 4 +++- .../Performance/CodeQuality/FractalPerf/FractalPerf.csproj | 3 --- .../HWIntrinsic/X86/PacketTracer/PacketTracer.csproj | 1 - .../CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs | 4 +++- .../JIT/Performance/CodeQuality/Inlining/InlineGCStruct.cs | 4 +++- .../Performance/CodeQuality/Inlining/InlineGCStruct.csproj | 3 --- .../JIT/Performance/CodeQuality/Inlining/NoThrowInline.cs | 4 +++- .../JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj | 3 --- src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.cs | 4 +++- .../JIT/Performance/CodeQuality/Layout/SearchLoops.csproj | 1 - src/tests/JIT/Performance/CodeQuality/Linq/Linq.cs | 4 +++- src/tests/JIT/Performance/CodeQuality/Linq/Linq.csproj | 3 --- .../JIT/Performance/CodeQuality/Math/Functions/Functions.cs | 4 +++- .../Performance/CodeQuality/Math/Functions/Functions.csproj | 3 --- src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs | 4 +++- src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj | 1 - .../CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs | 4 +++- .../CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj | 1 - .../Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj | 3 --- .../Performance/CodeQuality/SIMD/RayTracer/RayTracerBench.cs | 4 +++- .../JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs | 4 +++- .../Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj | 3 --- src/tests/JIT/Performance/CodeQuality/SciMark/CommandLine.cs | 4 +++- src/tests/JIT/Performance/CodeQuality/SciMark/SciMark.csproj | 1 - .../JIT/Performance/CodeQuality/Serialization/Deserialize.cs | 4 +++- .../Performance/CodeQuality/Serialization/Deserialize.csproj | 3 --- .../JIT/Performance/CodeQuality/Serialization/Serialize.cs | 4 +++- .../Performance/CodeQuality/Serialization/Serialize.csproj | 3 --- src/tests/JIT/Performance/CodeQuality/Span/Indexer.cs | 4 +++- src/tests/JIT/Performance/CodeQuality/Span/Indexer.csproj | 1 - src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs | 4 +++- src/tests/JIT/Performance/CodeQuality/Span/SpanBench.csproj | 3 --- src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs | 4 +++- src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj | 1 - src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.cs | 4 +++- .../JIT/Performance/CodeQuality/V8/Richards/Richards.csproj | 3 --- 200 files changed, 300 insertions(+), 376 deletions(-) diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs index 02bc5275554308..000aae05c15d18 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.cs @@ -15,6 +15,7 @@ contributed by Marek Safar using System; using System.Runtime.CompilerServices; +using Xunit; namespace BenchmarksGame { @@ -22,7 +23,8 @@ public class BinaryTrees_2 { const int minDepth = 4; - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj index 01009cd7b68d7c..45d7afc389a5ba 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-2.csproj @@ -2,7 +2,6 @@ true - Exe true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs index d542d3cff3ce70..6fdd8788673f82 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.cs @@ -18,6 +18,7 @@ minor improvements by Alex Yakunin using System; using System.Runtime.CompilerServices; using System.Threading.Tasks; +using Xunit; namespace BenchmarksGame { @@ -25,7 +26,8 @@ public class BinaryTrees_5 { public const int MinDepth = 4; - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj index 01009cd7b68d7c..45d7afc389a5ba 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-5.csproj @@ -2,7 +2,6 @@ true - Exe true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.cs index 15a61d1ff34d6f..d3cae670d067a8 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.cs @@ -15,6 +15,7 @@ using System; using System.Runtime.CompilerServices; using System.Threading.Tasks; +using Xunit; //using BenchmarkDotNet.Attributes; //using MicroBenchmarks; @@ -33,7 +34,8 @@ public class BinaryTrees_6 // 21 is used in official numbers; about 7.8s const int N = 18; - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.csproj index 01009cd7b68d7c..45d7afc389a5ba 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees-6.csproj @@ -2,7 +2,6 @@ true - Exe true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs index 2bee47abd9399f..85490ab9dfcc92 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.cs @@ -14,6 +14,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace BenchmarksGame { @@ -72,7 +73,8 @@ public int[] fannkuch(int n) } while (true); } - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-2.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs index 6de4ce9afdab2a..f102e0f88a0e9f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.cs @@ -17,6 +17,7 @@ parallel and small optimisations by Anthony Lloyd using System; using System.Threading; using System.Runtime.CompilerServices; +using Xunit; namespace BenchmarksGame { @@ -98,7 +99,8 @@ static void run(int n, int taskId, int taskSize) maxFlips[taskId] = maxflips; } - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.cs index 146bea12ad7f5a..862dec2ae5a724 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.cs @@ -15,6 +15,7 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Threading; +using Xunit; //using BenchmarkDotNet.Attributes; //using MicroBenchmarks; @@ -23,7 +24,8 @@ namespace BenchmarksGame //[BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame, Categories.JIT)] public unsafe class FannkuchRedux_9 { - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.csproj index e737c062dc7ed3..f90b4b60255e7a 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-9.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs index eb479c5b4c586c..8460bdabc43491 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.cs @@ -23,6 +23,7 @@ modified by Josh Goldfoot (fasta-repeat buffering) using System.Text; using System.Threading; using System.Threading.Tasks; +using Xunit; namespace BenchmarksGame { @@ -35,7 +36,8 @@ public class Fasta_1 const int IC = 29573; static int seed = 42; - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-1.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs index 8bac23168ef8f9..61b378089f85b7 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.cs @@ -17,12 +17,14 @@ optimizations by Alp Toker using System.IO; using System.Runtime.CompilerServices; using System.Text; +using Xunit; namespace BenchmarksGame { public class Fasta_2 { - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta-2.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs index 03b5016ef75b06..bafaa5e022825b 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs @@ -16,6 +16,7 @@ using System.IO; using System.Collections.Generic; using System.Text; +using Xunit; namespace BenchmarksGame { @@ -81,7 +82,8 @@ public static byte[] GetBytes(this List input) public class KNucleotide_1 { - public static int Main() + [Fact] + public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj index a45b4f4708d788..68b970715c92f8 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs index 21ecbbef20d064..89659ef89ee962 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs @@ -20,6 +20,7 @@ submitted by Josh Goldfoot using System.Collections.Generic; using System.Threading.Tasks; using System.Runtime.CompilerServices; +using Xunit; namespace BenchmarksGame { @@ -252,7 +253,8 @@ static string writeCount(Dictionary dictionary, string fragment, return string.Concat(n.ToString(), "\t", fragment); } - public static int Main() + [Fact] + public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); bool ok = Bench(helpers, true); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj index a45b4f4708d788..68b970715c92f8 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.cs index 3ff0eb8b4e0787..f6bca280458722 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.cs @@ -16,12 +16,14 @@ using System.IO; using System.Runtime.CompilerServices; using System.Security.Cryptography; +using Xunit; namespace BenchmarksGame { public class Mandelbrot_2 { - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-2.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.cs index b71c5af05803a3..ebb72acb2c37b2 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.cs @@ -21,6 +21,7 @@ optimized to use Vector by Tanner Gooding using System.Runtime.CompilerServices; using System.Security.Cryptography; using System.Threading.Tasks; +using Xunit; namespace BenchmarksGame { @@ -82,7 +83,8 @@ private static unsafe byte GetByte(double* pCrb, double Ciby, int x, int y) return (byte)(res ^ -1); } - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj index fca3c2bccf7903..5d0ad468e4d3d1 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/mandelbrot/mandelbrot-7.csproj @@ -1,6 +1,5 @@ - Exe true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.cs index ed70146ccdb713..7c54f16e123896 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.cs @@ -15,12 +15,14 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace BenchmarksGame { public class NBody_3 { - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/n-body/n-body-3.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs index b42a6ce5c5c047..3d4fbb5ca3c4f2 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs @@ -21,6 +21,7 @@ using System.Numerics; using System.Runtime.CompilerServices; using System.Text; +using Xunit; namespace BenchmarksGame { @@ -122,7 +123,8 @@ void Run(bool verbose) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs index 62caa7b9c91bcc..b367b74c5494c3 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs @@ -17,12 +17,14 @@ using System; using System.IO; using System.Text.RegularExpressions; +using Xunit; namespace BenchmarksGame { public class RegexRedux_1 { - public static int Main() + [Fact] + public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.csproj index 421f8d3cc194d0..4ccc562873a0b9 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs index 05c53e130603cf..7fd68c8c21b518 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs @@ -17,6 +17,7 @@ order variants by execution time by Anthony Lloyd using System.IO; using System.Threading.Tasks; using System.Text.RegularExpressions; +using Xunit; namespace BenchmarksGame { @@ -36,7 +37,8 @@ static string regexCount(string s, string r) return r + " " + c; } - public static int Main() + [Fact] + public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj index 421f8d3cc194d0..4ccc562873a0b9 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs index 89ba9586a7bb22..a071691b550e12 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs @@ -16,6 +16,7 @@ contributed by Robert F. Tobler to process large blocks of byte arrays using System.IO; using System.Collections.Generic; using System.Security.Cryptography; +using Xunit; namespace BenchmarksGame { @@ -44,7 +45,8 @@ struct Index const byte Gt = (byte)'>'; const byte Lf = (byte)'\n'; - public static int Main() + [Fact] + public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); var outBytes = new byte[helpers.FileLength]; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj index a092e77a603d0a..86e0871a617e5e 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs index 3da29c0315f87a..9d5964c7e2fda1 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs @@ -19,6 +19,7 @@ Modified to reduce memory use by Anthony Lloyd using System.Collections.Concurrent; using System.Security.Cryptography; using System.Threading; +using Xunit; namespace BenchmarksGame { @@ -227,7 +228,8 @@ static void Writer() } } - public static int Main() + [Fact] + public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); var outBytes = new byte[helpers.FileLength]; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj index a092e77a603d0a..86e0871a617e5e 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.cs index a0ca7391e341cf..181d2f86e14afe 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.cs @@ -14,12 +14,14 @@ contributed by Isaac Gouy using System; using System.Runtime.CompilerServices; +using Xunit; namespace BenchmarksGame { public class SpectralNorm_1 { - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-1.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.cs index 9528428f24c529..ea7010dd51f25b 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.cs @@ -17,12 +17,14 @@ contributed by Isaac Gouy using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; +using Xunit; namespace BenchmarksGame { public class SpectralNorm_3 { - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm-3.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs index 181be92ca84ef7..0277043f778331 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs @@ -7,6 +7,7 @@ using System; using System.Runtime.CompilerServices; using System.Diagnostics; +using Xunit; namespace Benchstone.BenchF { @@ -100,7 +101,8 @@ private static void TestBench() } } - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.cs index f2743733e647df..a3b0c4b2fcf878 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -37,7 +38,8 @@ private static bool Bench() return true; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.cs index 1844616e25300c..581fb31aedd3a0 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -36,7 +37,8 @@ private static bool Bench() return true; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.cs index 841bf9f46e2ca0..a9739dbc4cbc1e 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -128,7 +129,8 @@ private static void Inner(ref double a, ref double b, ref double xtol, out int i } } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.cs index de0e3a66b71079..2b1af3dfae8297 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -79,7 +80,8 @@ private static bool Bench(int loop) return true; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(Iterations); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.cs index 3cf59a620ba533..1b3c2ed2dcbf96 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.cs @@ -6,6 +6,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -119,7 +120,8 @@ private static void FastFourierT(double[] fr, double[] fi, int n) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.cs index 8e18e6be93f769..83f3097c8468b2 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -104,7 +105,8 @@ private static void Inner(double[][] rma, double[][] rmb, double[][] rmr) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.cs index 279799188e812a..b5c13fbad43263 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -107,7 +108,8 @@ private static void Inner(double[][] t, out double det, ref int n) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.cs index 2ac114b8e23bd5..4f3a92bff0dd23 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.cs @@ -53,6 +53,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF @@ -614,7 +615,8 @@ private void Init() } } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = (new LLoops()).Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.cs index a221b4035606d1..e29b55a91e27e6 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -104,7 +105,8 @@ private static double H(double t, double x, double y, double z) return (x * y - (8.0 * z) / 3.0); } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.cs index 69a9e03f1f4d99..820954c018a874 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -465,7 +466,8 @@ private static void CompM(float[] a, float[] b, ref int n) return; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.cs index 7b5d764e77c1f5..a16bfd0fbf13f7 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.cs @@ -6,6 +6,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -105,7 +106,8 @@ private static double GY(double x, double y) return (-(x)); } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.cs index 4b857367b0eee7..038863d9d3b2bb 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -96,7 +97,8 @@ private static void Inner(ref double x0, double xtol, double ftol, int ntol, out iflag = 2; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.cs index 6b79b78c6524d1..cf4669227a43cb 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -158,7 +159,8 @@ private static void Inner(ref double a, ref double b, double xtol, double ftol, } } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.cs index ab6ce595018437..4396f69b4a19b7 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -139,7 +140,8 @@ private static double F(double x) return (System.Math.Exp((-(x)) * (x))); } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.cs index e7362dbeca027e..c0673937c2ad75 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -107,7 +108,8 @@ private static void Inner(ref double x0, ref double x1, double xtol, double ftol } } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.cs index df7b9be18fd370..87d398276033c7 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -63,7 +64,8 @@ private static double F(double x) return (System.Math.Exp((-(x)) * 2)); } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.cs index 166166ef6a74e3..e61f204d1a5b4e 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -73,7 +74,8 @@ private static void Inner(double[][] a, double[][] c, int n) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.cs index 574ba99ebef769..46f521639db8bc 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -66,7 +67,8 @@ private static double FPrime(double x) return ((-2) * (x) * (F(x))); } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.cs index bcfd2ad9276f34..2c717567828ee1 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchF { @@ -212,7 +213,8 @@ private static void P0(double[] e1) e1[s_l] = e1[s_j]; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.cs index 1163ee7b5a9fe9..2bfdec588e1bc5 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -78,7 +79,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.cs index f4e966e598da4f..8bb862a5c90ecd 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -45,7 +46,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.cs index f0030db98ab6e9..9f40034709369d 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -65,7 +66,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.cs index b917c7d722cd63..42bb7aec0049cf 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -103,7 +104,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.cs index 1a138e4fdf173b..2d37fa37cbecef 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.cs @@ -11,6 +11,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -127,7 +128,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.cs index 65e490c35444de..9674ed66a13978 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -75,7 +76,8 @@ static bool Bench(int loop) { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = Bench(Iterations); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.cs index 520820b9b5e892..aac34f521bbb67 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -87,7 +88,8 @@ private static bool Bench() return (s_position == 91); } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = Bench(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.cs index 77a535741954b4..4af30b82d72642 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -65,7 +66,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.cs index c5a03ed944e182..af2fcba45a49fc 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -68,7 +69,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.cs index e1f9b9886f8d48..31f00c986da29f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -60,7 +61,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.cs index 544300c4b2f5a0..5b80dadce280c9 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -41,7 +42,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.cs index 68318519e2b636..ca4ca02735177e 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -99,7 +100,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.cs index 15a9790437b096..f62ed3d22dfac8 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -40,7 +41,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.cs index bc2f826187c93e..87d8e3c14848ba 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -75,7 +76,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.cs index 3f6bf76980d45e..e2a901634c215d 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -84,7 +85,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.cs index 9f0eca263362ca..8fbada7ffff468 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -120,7 +121,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.cs index 088efab8464e06..60f5551eb25194 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.cs @@ -9,6 +9,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -266,7 +267,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.cs index aaa55ed44dd860..f586300517767e 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -91,7 +92,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.cs index b8719562a1916e..2b9f0570e36a22 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -63,7 +64,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.cs index 70ab51829a1d90..ab43c56910378d 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -368,7 +369,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.cs index bc465bdaa6a127..1756db272efefd 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -94,7 +95,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.cs index 26edc32e3903be..cbf2ce7632fea1 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -110,7 +111,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.cs index 35ccb5134f30ab..fa18e1948e33bc 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -129,7 +130,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.cs index 3dffd4bdc059e4..bf5752c4b4faf8 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.BenchI { @@ -67,7 +68,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.cs index 388ffbd2c73494..3cc66e62215a31 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchF { @@ -100,7 +101,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInProd/MDInProd.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.cs index 3af86d8255e9ef..071a69765b1fbc 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchF { @@ -103,7 +104,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDInvMt/MDInvMt.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.cs index fbc58447f66fd9..0f3c34ccec0137 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.cs @@ -53,6 +53,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchF { @@ -599,7 +600,8 @@ private bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { var lloops = new MDLLoops(); bool result = lloops.TestBase(); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDLLoops/MDLLoops.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.cs index 6db12f16d4ef06..48007ddfa4cddb 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchF { @@ -135,7 +136,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDRomber/MDRomber.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.cs index e8ce71690d64e2..87cf8f0b6dbd1d 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchF { @@ -69,7 +70,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchF/MDSqMtx/MDSqMtx.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDAddArray2/MDAddArray2.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDAddArray2/MDAddArray2.cs index faa9285375cbb4..a78089300fe203 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDAddArray2/MDAddArray2.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDAddArray2/MDAddArray2.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchI { @@ -93,7 +94,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDAddArray2/MDAddArray2.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDAddArray2/MDAddArray2.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDAddArray2/MDAddArray2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDAddArray2/MDAddArray2.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.cs index b61bc86fc5ae22..2d891682b53be5 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchI { @@ -67,7 +68,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDArray2/MDArray2.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.cs index c26db421224efe..412e04d6f845cb 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchI { @@ -71,7 +72,8 @@ public static bool Test2() { return Bench(Iterations, s, d); } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = Test() && Test2(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDGeneralArray/MDGeneralArray.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDLogicArray/MDLogicArray.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDLogicArray/MDLogicArray.cs index 5de11b01f805e9..d11225e8a5aa42 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDLogicArray/MDLogicArray.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDLogicArray/MDLogicArray.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchI { @@ -67,7 +68,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDLogicArray/MDLogicArray.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDLogicArray/MDLogicArray.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDLogicArray/MDLogicArray.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDLogicArray/MDLogicArray.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMidpoint/MDMidpoint.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMidpoint/MDMidpoint.cs index a111b09aadbc3f..b70ded7d4c2907 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMidpoint/MDMidpoint.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMidpoint/MDMidpoint.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchI { @@ -76,7 +77,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMidpoint/MDMidpoint.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMidpoint/MDMidpoint.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMidpoint/MDMidpoint.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMidpoint/MDMidpoint.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.cs index 8d172c8057ad29..dedaf70055804f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchI { @@ -112,7 +113,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDMulMatrix/MDMulMatrix.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.cs index f2ee8a54966293..8f709275349d21 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.cs @@ -9,6 +9,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchI { @@ -258,7 +259,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDNDhrystone/MDNDhrystone.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.cs index 231e6fea41ab2c..7cfe1fa201f660 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchI { @@ -357,7 +358,8 @@ private static bool TestBase() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDPuzzle/MDPuzzle.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.cs b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.cs index c29ba001634d89..9576a79099b04e 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.cs +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Benchstone.MDBenchI { @@ -59,7 +60,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.csproj b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Benchstones/MDBenchI/MDXposMatrix/MDXposMatrix.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.cs b/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.cs index 99ec698208931c..d04b511d331b57 100644 --- a/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.cs +++ b/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.cs @@ -12,6 +12,7 @@ using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; using System.Diagnostics; +using Xunit; public class BilinearTest { @@ -337,7 +338,8 @@ public void RunTests() } } } - public static int Main() + [Fact] + public static int TestEntryPoint() { BilinearTest test = new BilinearTest(); test.RunTests(); diff --git a/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.csproj b/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.csproj index e737c062dc7ed3..f90b4b60255e7a 100644 --- a/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.csproj +++ b/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.cs b/src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.cs index bd4583037632e4..08c4874ef6dd45 100644 --- a/src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.cs +++ b/src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Numerics; using System.Runtime.CompilerServices; +using Xunit; public class Burgers { @@ -162,7 +163,8 @@ private static double[] GetCalculated3(int nt, int nx, double dx, double dt, dou return un; } - public static int Main() + [Fact] + public static int TestEntryPoint() { if (!Vector.IsHardwareAccelerated) { diff --git a/src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.csproj b/src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Burgers/Burgers.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs b/src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs index 4974a553129e89..1e981ac82235c8 100644 --- a/src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs +++ b/src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs @@ -33,6 +33,7 @@ using System; using System.IO; using System.Runtime.CompilerServices; +using Xunit; internal class global { @@ -261,7 +262,8 @@ public class ByteMark private static double[] s_bindex; private static HarnessTest[] s_tests; - public static int Main() + [Fact] + public static int TestEntryPoint() { ByteMark app = new ByteMark(); int result = app.ExecuteCore(Array.Empty()); diff --git a/src/tests/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj b/src/tests/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj index 54077dd3acb10c..03274a86e59cc7 100644 --- a/src/tests/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj @@ -2,7 +2,6 @@ true - Exe true $(NoWarn);xUnit1013 diff --git a/src/tests/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.cs b/src/tests/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.cs index 46337e86c7fcbe..91870e75b6e6a8 100644 --- a/src/tests/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.cs +++ b/src/tests/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Runtime.CompilerServices; +using Xunit; // Performance tests for optimizations related to EqualityComparer.Default @@ -109,7 +110,8 @@ public enum E BLUE = 2 } - public static int Main() + [Fact] + public static int TestEntryPoint() { var valueTupleFixture = new EqualityComparerFixture>(); var v0 = new ValueTuple(3, E.RED, 11); diff --git a/src/tests/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj b/src/tests/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj index 8597b7297413dc..058d09a360f662 100644 --- a/src/tests/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Devirtualization/DefaultEqualityComparerPerf.csproj @@ -1,7 +1,4 @@ - - Exe - diff --git a/src/tests/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.cs b/src/tests/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.cs index 283f42ddf59002..faa10d9d7e5707 100644 --- a/src/tests/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.cs +++ b/src/tests/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.cs @@ -4,6 +4,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace FractalPerf { @@ -148,7 +149,8 @@ static bool TestBase() { return result; } - public static int Main() { + [Fact] + public static int TestEntryPoint() { bool result = TestBase(); return (result ? 100 : -1); } diff --git a/src/tests/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj b/src/tests/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj +++ b/src/tests/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/PacketTracer.csproj b/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/PacketTracer.csproj index 6f3a8ae8b31863..acdb1df7c4c8ad 100644 --- a/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/PacketTracer.csproj +++ b/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/PacketTracer.csproj @@ -1,6 +1,5 @@ - Exe true diff --git a/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs b/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs index adfe31c10dc1aa..8130587cd3c051 100644 --- a/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs +++ b/src/tests/JIT/Performance/CodeQuality/HWIntrinsic/X86/PacketTracer/Program.cs @@ -9,6 +9,7 @@ using System.Collections.Concurrent; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; +using Xunit; public class Program { @@ -48,7 +49,8 @@ public Program() _freeBuffers = new ObjectPool(() => new int[_width * 3 * _height]); // Each pixel has 3 fields (RGB) } - public static unsafe int Main() + [Fact] + public static unsafe int TestEntryPoint() { if (Avx2.IsSupported) { diff --git a/src/tests/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.cs b/src/tests/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.cs index 86f7a4ca83593a..661c85e8a1c581 100644 --- a/src/tests/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.cs +++ b/src/tests/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.cs @@ -15,6 +15,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Inlining { @@ -92,7 +93,8 @@ public static bool WithFormatBase() return (result == 22); } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool withFormat = WithFormatBase(); bool withoutFormat = WithoutFormatBase(); diff --git a/src/tests/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj b/src/tests/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj index d2e324a1ba9969..cb679a2909bf96 100644 --- a/src/tests/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj @@ -1,7 +1,4 @@ - - Exe - diff --git a/src/tests/JIT/Performance/CodeQuality/Inlining/NoThrowInline.cs b/src/tests/JIT/Performance/CodeQuality/Inlining/NoThrowInline.cs index 49f783918ea8e0..97f76a84bb8b35 100644 --- a/src/tests/JIT/Performance/CodeQuality/Inlining/NoThrowInline.cs +++ b/src/tests/JIT/Performance/CodeQuality/Inlining/NoThrowInline.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Inlining { @@ -49,7 +50,8 @@ static int Bench(string a, string b, string c, string d) return a.Length + b.Length + c.Length + d.Length; } - public static int Main() + [Fact] + public static int TestEntryPoint() { return (Bench("a", "bc", "def", "ghij") == 10) ? 100 : -1; } diff --git a/src/tests/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj b/src/tests/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj index c56a3ec24bcace..cc196b4308841b 100644 --- a/src/tests/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj @@ -1,7 +1,4 @@ - - Exe - diff --git a/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.cs b/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.cs index e9652ad8f1714d..80d7262bf2fa54 100644 --- a/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.cs +++ b/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Xunit; // Test code taken directly from https://github.com/dotnet/runtime/issues/7474 // Laying the loop's early return path in-line can cost 30% on this micro-benchmark. @@ -10,7 +11,8 @@ namespace Layout { public unsafe class SearchLoops { - public static int Main() + [Fact] + public static int TestEntryPoint() { // Make sure equal strings compare as such if (!LoopReturn("hello", "hello") || !LoopGoto("goodbye", "goodbye")) diff --git a/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj b/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj index f6ca1af64cd2fe..d923501cfa944a 100644 --- a/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.csproj @@ -1,6 +1,5 @@ - Exe true diff --git a/src/tests/JIT/Performance/CodeQuality/Linq/Linq.cs b/src/tests/JIT/Performance/CodeQuality/Linq/Linq.cs index 1b3181267ad462..cc4fe3dbed4706 100644 --- a/src/tests/JIT/Performance/CodeQuality/Linq/Linq.cs +++ b/src/tests/JIT/Performance/CodeQuality/Linq/Linq.cs @@ -5,6 +5,7 @@ using System.Runtime.CompilerServices; using System.Collections.Generic; using System.Linq; +using Xunit; public class Product { @@ -401,7 +402,8 @@ private bool Order00Manual() } #endregion - public static int Main() + [Fact] + public static int TestEntryPoint() { var tests = new LinqBenchmarks(); bool result = tests.Bench(); diff --git a/src/tests/JIT/Performance/CodeQuality/Linq/Linq.csproj b/src/tests/JIT/Performance/CodeQuality/Linq/Linq.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Linq/Linq.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Linq/Linq.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.cs b/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.cs index 9b12be274899cc..7b0fba5fc151ed 100644 --- a/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.cs +++ b/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.CompilerServices; +using Xunit; namespace Functions { @@ -57,7 +58,8 @@ public static class Program ["tanhsingle"] = MathTests.TanhSingleTest }; - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(Array.Empty()); } diff --git a/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj b/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj index fd450ee1c83efc..944f5f49f25864 100644 --- a/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj @@ -1,7 +1,4 @@ - - Exe - diff --git a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs index b4b0f62781bf96..f434f831175031 100644 --- a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs +++ b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.cs @@ -9,6 +9,7 @@ using System.IO; using System.Linq; using System.Runtime.CompilerServices; +using Xunit; public static class CscBench { @@ -142,7 +143,8 @@ static bool Bench() return result; } - public static int Main() + [Fact] + public static int TestEntryPoint() { bool result = true; if (!FindMscorlib()) diff --git a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj index 3972acd76af786..37d4ba53a4c2be 100644 --- a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj @@ -2,7 +2,6 @@ true - Exe true $(NoWarn);xUnit1013 true diff --git a/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs b/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs index 07e00af3772a76..c26093ecfb245b 100644 --- a/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs +++ b/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs @@ -5,6 +5,7 @@ using System; using System.Diagnostics; using System.Runtime.CompilerServices; +using Xunit; namespace SIMD { @@ -63,7 +64,8 @@ private static void PrintUsage() Console.WriteLine("In benchmark mode, a larger set is computed but nothing is dumped."); } - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(Array.Empty()); } diff --git a/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj b/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj index 58ba15909f1e62..e4c5725ddabbd6 100644 --- a/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj +++ b/src/tests/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj @@ -1,6 +1,5 @@ - Exe $(NoWarn);xUnit1013 diff --git a/src/tests/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj b/src/tests/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj index 627bcf0d00b3ce..08a1a693e0b97c 100644 --- a/src/tests/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj +++ b/src/tests/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracerBench.cs b/src/tests/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracerBench.cs index 70abf1280362cc..6770750e58b299 100644 --- a/src/tests/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracerBench.cs +++ b/src/tests/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracerBench.cs @@ -10,6 +10,7 @@ using System.Threading; using System.Threading.Tasks; using System.Collections.Concurrent; +using Xunit; namespace SIMD { @@ -113,7 +114,8 @@ public bool Run() return true; } - public static int Main() + [Fact] + public static int TestEntryPoint() { var r = new RayTracerBench(); bool result = r.Run(); diff --git a/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs b/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs index 18a1687ddf8fd6..7faf4f935a60f3 100644 --- a/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs +++ b/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs @@ -4,6 +4,7 @@ using System; using System.Numerics; using System.Runtime.CompilerServices; +using Xunit; public static class SeekUnroll { @@ -95,7 +96,8 @@ static bool Test(int index) // Set of indices to pass to Test(int) static int[] IndicesToTest = new int[] { 1, 3, 11, 19, 27 }; - public static int Main() + [Fact] + public static int TestEntryPoint() { return TestEntry(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj b/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj index 570644f1dbcb7e..197767e2c4e249 100644 --- a/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj +++ b/src/tests/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj @@ -1,7 +1,4 @@ - - Exe - diff --git a/src/tests/JIT/Performance/CodeQuality/SciMark/CommandLine.cs b/src/tests/JIT/Performance/CodeQuality/SciMark/CommandLine.cs index 661d800d643088..927b5f60fd624e 100644 --- a/src/tests/JIT/Performance/CodeQuality/SciMark/CommandLine.cs +++ b/src/tests/JIT/Performance/CodeQuality/SciMark/CommandLine.cs @@ -14,6 +14,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace SciMark2 { @@ -26,7 +27,8 @@ namespace SciMark2 public class CommandLine { - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(Array.Empty()); } diff --git a/src/tests/JIT/Performance/CodeQuality/SciMark/SciMark.csproj b/src/tests/JIT/Performance/CodeQuality/SciMark/SciMark.csproj index f72a6e3eeed551..8ed4b91a216779 100644 --- a/src/tests/JIT/Performance/CodeQuality/SciMark/SciMark.csproj +++ b/src/tests/JIT/Performance/CodeQuality/SciMark/SciMark.csproj @@ -1,6 +1,5 @@ - Exe $(NoWarn);xUnit1013 diff --git a/src/tests/JIT/Performance/CodeQuality/Serialization/Deserialize.cs b/src/tests/JIT/Performance/CodeQuality/Serialization/Deserialize.cs index 8372b338482bbd..13952a7cc206ff 100644 --- a/src/tests/JIT/Performance/CodeQuality/Serialization/Deserialize.cs +++ b/src/tests/JIT/Performance/CodeQuality/Serialization/Deserialize.cs @@ -9,6 +9,7 @@ using System.Runtime.Serialization.Json; using System.Text; using Newtonsoft.Json.Bson; +using Xunit; namespace Serialization { @@ -149,7 +150,8 @@ private void DeserializeJsonNetBenchInner() } } - public static int Main() { + [Fact] + public static int TestEntryPoint() { var tests = new JsonBenchmarks(); bool result = tests.Deserialize(); return result ? 100 : -1; diff --git a/src/tests/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj b/src/tests/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj index 66d65f63df31d7..2ed8d4213a77a6 100644 --- a/src/tests/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Serialization/Serialize.cs b/src/tests/JIT/Performance/CodeQuality/Serialization/Serialize.cs index d61f413cdd9bde..dc769bae9429d6 100644 --- a/src/tests/JIT/Performance/CodeQuality/Serialization/Serialize.cs +++ b/src/tests/JIT/Performance/CodeQuality/Serialization/Serialize.cs @@ -8,6 +8,7 @@ using System.Runtime.Serialization; using System.Runtime.Serialization.Json; using Newtonsoft.Json.Bson; +using Xunit; namespace Serialization { @@ -137,7 +138,8 @@ private void SerializeJsonNetBenchInner(object o) } } - public static int Main() { + [Fact] + public static int TestEntryPoint() { var tests = new JsonBenchmarks(); bool result = tests.Serialize(); return result ? 100 : -1; diff --git a/src/tests/JIT/Performance/CodeQuality/Serialization/Serialize.csproj b/src/tests/JIT/Performance/CodeQuality/Serialization/Serialize.csproj index 839bbc8d2d1a64..11d74d4fe5456a 100644 --- a/src/tests/JIT/Performance/CodeQuality/Serialization/Serialize.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Serialization/Serialize.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/Span/Indexer.cs b/src/tests/JIT/Performance/CodeQuality/Span/Indexer.cs index 00f4e0f8481496..0c5e2f19a629fc 100644 --- a/src/tests/JIT/Performance/CodeQuality/Span/Indexer.cs +++ b/src/tests/JIT/Performance/CodeQuality/Span/Indexer.cs @@ -7,6 +7,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Xunit; namespace Span { @@ -927,7 +928,8 @@ public static void Usage() Console.WriteLine(); } - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(Array.Empty()); } diff --git a/src/tests/JIT/Performance/CodeQuality/Span/Indexer.csproj b/src/tests/JIT/Performance/CodeQuality/Span/Indexer.csproj index fdcf488d446345..2afb15098093b6 100644 --- a/src/tests/JIT/Performance/CodeQuality/Span/Indexer.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Span/Indexer.csproj @@ -1,7 +1,6 @@ - Exe $(NoWarn);xUnit1013 diff --git a/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs b/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs index 1f0a477e34f610..8bf1c68ffc68dc 100644 --- a/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs +++ b/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs @@ -7,6 +7,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; +using Xunit; namespace Span { @@ -1074,7 +1075,8 @@ static void TestSpanAsSpanStringChar(string s, int iterationCount, bool untrue) #endregion // TestSpanAPIs - public static int Main() + [Fact] + public static int TestEntryPoint() { // Now simulate xunit-perf's benchmark discovery so we know what tests to invoke TypeInfo t = typeof(SpanBench).GetTypeInfo(); diff --git a/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.csproj b/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.csproj index 15733c0f256201..9d006932db94a1 100644 --- a/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.csproj @@ -1,8 +1,5 @@ - - Exe - pdbonly true diff --git a/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs b/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs index f2615767739c7e..567d75d6833111 100644 --- a/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs +++ b/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs @@ -41,6 +41,7 @@ using System.Collections.Generic; using System.Globalization; using System.Runtime.CompilerServices; +using Xunit; namespace V8.Crypto { @@ -48,7 +49,8 @@ public class Support { private const string INPUT = "The quick brown fox jumped over the extremely lazy frogs!"; - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null, false); } diff --git a/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj b/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj index 447625eec06790..2e3a8f0fe0add0 100644 --- a/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj +++ b/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj @@ -1,6 +1,5 @@ - Exe $(NoWarn);xUnit1013 diff --git a/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.cs b/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.cs index 199442caf1e521..2a97fb31d6f4fb 100644 --- a/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.cs +++ b/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.cs @@ -11,6 +11,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace V8.Richards { @@ -99,7 +100,8 @@ public static bool runRichards() public const int DATA_SIZE = 4; - public static int Main() + [Fact] + public static int TestEntryPoint() { return Test(null); } diff --git a/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj b/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj index 0a051a8d688d86..c70b4831be6e4f 100644 --- a/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj +++ b/src/tests/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj @@ -1,7 +1,4 @@ - - Exe - pdbonly true From 29075c3e7c8913b3c1ac8f944ff1b5327b2f5e2f Mon Sep 17 00:00:00 2001 From: Mark Plesko Date: Sat, 29 Apr 2023 12:10:19 -0700 Subject: [PATCH 5/6] Manual fixes for xUnit1013 - internal methods, disable for region --- .../CodeQuality/BilinearInterpol/BilinearInterpol.cs | 4 ++-- src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.cs b/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.cs index d04b511d331b57..248adb877dd226 100644 --- a/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.cs +++ b/src/tests/JIT/Performance/CodeQuality/BilinearInterpol/BilinearInterpol.cs @@ -38,7 +38,7 @@ public class BilinearTest //ref values double[] A, B, input, output; - public void Setup() + internal void Setup() { A = new double[lengthA]; B = new double[lengthB]; @@ -289,7 +289,7 @@ public static bool CheckResult(double[] output, double[] vectorOutput) return true; } - public void RunTests() + internal void RunTests() { Setup(); diff --git a/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs b/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs index 8bf1c68ffc68dc..2db0a1a2e854c6 100644 --- a/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs +++ b/src/tests/JIT/Performance/CodeQuality/Span/SpanBench.cs @@ -9,6 +9,8 @@ using System.Text; using Xunit; +#pragma warning disable xUnit1013 + namespace Span { [AttributeUsage(AttributeTargets.Method, Inherited = false)] @@ -1111,3 +1113,5 @@ public static int TestEntryPoint() } } } + +#pragma warning restore xUnit1013 From 2a1157ad2bb3458da273d6f75f8611ca6db47eb2 Mon Sep 17 00:00:00 2001 From: Mark Plesko Date: Fri, 5 May 2023 15:45:17 -0700 Subject: [PATCH 6/6] Add merged group --- src/tests/JIT/Performance/Directory.Build.props | 10 ++++++++++ src/tests/JIT/Performance/JIT.performance.csproj | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 src/tests/JIT/Performance/Directory.Build.props create mode 100644 src/tests/JIT/Performance/JIT.performance.csproj diff --git a/src/tests/JIT/Performance/Directory.Build.props b/src/tests/JIT/Performance/Directory.Build.props new file mode 100644 index 00000000000000..689ebf8db31e1a --- /dev/null +++ b/src/tests/JIT/Performance/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + true + false + + diff --git a/src/tests/JIT/Performance/JIT.performance.csproj b/src/tests/JIT/Performance/JIT.performance.csproj new file mode 100644 index 00000000000000..f751282d127da4 --- /dev/null +++ b/src/tests/JIT/Performance/JIT.performance.csproj @@ -0,0 +1,7 @@ + + + + + + +