From e569e7c7709c1e5b9b375e477f5d89925d138b89 Mon Sep 17 00:00:00 2001 From: Brennan Date: Thu, 16 Apr 2020 22:37:56 -0700 Subject: [PATCH] Update BenchmarkDotNet for 5.0 (#20889) --- eng/Versions.props | 2 +- .../BenchmarkRunner/DefaultCoreConfig.cs | 26 +++++++++---------- .../BenchmarkRunner/DefaultCoreDebugConfig.cs | 8 +++--- .../DefaultCorePerfLabConfig.cs | 22 ++++++++-------- .../DefaultCoreProfileConfig.cs | 16 ++++++------ .../DefaultCoreValidationConfig.cs | 4 +-- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b67d60ea57..6effc7443b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,7 +207,7 @@ 3.1.3-servicing.20163.14 0.9.9 - 0.12.0 + 0.12.1 4.2.1 2.3.0 4.2.1 diff --git a/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs b/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs index e5b0c9b43b..5ebd48d01e 100644 --- a/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs +++ b/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs @@ -18,29 +18,29 @@ namespace BenchmarkDotNet.Attributes { public DefaultCoreConfig() { - Add(ConsoleLogger.Default); - Add(MarkdownExporter.GitHub); + AddLogger(ConsoleLogger.Default); + AddExporter(MarkdownExporter.GitHub); - Add(MemoryDiagnoser.Default); - Add(StatisticColumn.OperationsPerSecond); - Add(DefaultColumnProviders.Instance); + AddDiagnoser(MemoryDiagnoser.Default); + AddColumn(StatisticColumn.OperationsPerSecond); + AddColumnProvider(DefaultColumnProviders.Instance); - Add(JitOptimizationsValidator.FailOnError); + AddValidator(JitOptimizationsValidator.FailOnError); - Add(Job.Default + AddJob(Job.Default #if NETCOREAPP2_1 - .With(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21)) + .WithToolchain(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21)) #elif NETCOREAPP3_0 - .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0"))) + .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0"))) #elif NETCOREAPP3_1 - .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1"))) + .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1"))) #elif NETCOREAPP5_0 - .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp5.0", null, ".NET Core 5.0"))) + .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp5.0", null, ".NET Core 5.0"))) #else #error Target frameworks need to be updated. #endif - .With(new GcMode { Server = true }) - .With(RunStrategy.Throughput)); + .WithGcMode(new GcMode { Server = true }) + .WithStrategy(RunStrategy.Throughput)); } } } diff --git a/src/Shared/BenchmarkRunner/DefaultCoreDebugConfig.cs b/src/Shared/BenchmarkRunner/DefaultCoreDebugConfig.cs index f51bed2db9..14200ca85d 100644 --- a/src/Shared/BenchmarkRunner/DefaultCoreDebugConfig.cs +++ b/src/Shared/BenchmarkRunner/DefaultCoreDebugConfig.cs @@ -13,11 +13,11 @@ namespace BenchmarkDotNet.Attributes { public DefaultCoreDebugConfig() { - Add(ConsoleLogger.Default); - Add(JitOptimizationsValidator.DontFailOnError); + AddLogger(ConsoleLogger.Default); + AddValidator(JitOptimizationsValidator.DontFailOnError); - Add(Job.InProcess - .With(RunStrategy.Throughput)); + AddJob(Job.InProcess + .WithStrategy(RunStrategy.Throughput)); } } } diff --git a/src/Shared/BenchmarkRunner/DefaultCorePerfLabConfig.cs b/src/Shared/BenchmarkRunner/DefaultCorePerfLabConfig.cs index 5c6ba7ac3b..685953d273 100644 --- a/src/Shared/BenchmarkRunner/DefaultCorePerfLabConfig.cs +++ b/src/Shared/BenchmarkRunner/DefaultCorePerfLabConfig.cs @@ -17,23 +17,23 @@ namespace BenchmarkDotNet.Attributes { public DefaultCorePerfLabConfig() { - Add(ConsoleLogger.Default); + AddLogger(ConsoleLogger.Default); - Add(MemoryDiagnoser.Default); - Add(StatisticColumn.OperationsPerSecond); - Add(new ParamsSummaryColumn()); - Add(DefaultColumnProviders.Statistics, DefaultColumnProviders.Metrics, DefaultColumnProviders.Descriptor); + AddDiagnoser(MemoryDiagnoser.Default); + AddColumn(StatisticColumn.OperationsPerSecond); + AddColumn(new ParamsSummaryColumn()); + AddColumnProvider(DefaultColumnProviders.Statistics, DefaultColumnProviders.Metrics, DefaultColumnProviders.Descriptor); - Add(JitOptimizationsValidator.FailOnError); + AddValidator(JitOptimizationsValidator.FailOnError); - Add(Job.InProcess - .With(RunStrategy.Throughput)); + AddJob(Job.InProcess + .WithStrategy(RunStrategy.Throughput)); - Add(MarkdownExporter.GitHub); + AddExporter(MarkdownExporter.GitHub); - Add(new CsvExporter( + AddExporter(new CsvExporter( CsvSeparator.Comma, - new Reports.SummaryStyle(printUnitsInHeader: true, printUnitsInContent: false, timeUnit: Horology.TimeUnit.Microsecond, sizeUnit: SizeUnit.KB))); + new Reports.SummaryStyle(cultureInfo: null, printUnitsInHeader: true, printUnitsInContent: false, timeUnit: Perfolizer.Horology.TimeUnit.Microsecond, sizeUnit: SizeUnit.KB))); } } } diff --git a/src/Shared/BenchmarkRunner/DefaultCoreProfileConfig.cs b/src/Shared/BenchmarkRunner/DefaultCoreProfileConfig.cs index 1b59cb89c5..18d58dc1b0 100644 --- a/src/Shared/BenchmarkRunner/DefaultCoreProfileConfig.cs +++ b/src/Shared/BenchmarkRunner/DefaultCoreProfileConfig.cs @@ -16,17 +16,17 @@ namespace BenchmarkDotNet.Attributes { public DefaultCoreProfileConfig() { - Add(ConsoleLogger.Default); - Add(MarkdownExporter.GitHub); + AddLogger(ConsoleLogger.Default); + AddExporter(MarkdownExporter.GitHub); - Add(MemoryDiagnoser.Default); - Add(StatisticColumn.OperationsPerSecond); - Add(DefaultColumnProviders.Instance); + AddDiagnoser(MemoryDiagnoser.Default); + AddColumn(StatisticColumn.OperationsPerSecond); + AddColumnProvider(DefaultColumnProviders.Instance); - Add(JitOptimizationsValidator.FailOnError); + AddValidator(JitOptimizationsValidator.FailOnError); - Add(Job.InProcess - .With(RunStrategy.Throughput)); + AddJob(Job.InProcess + .WithStrategy(RunStrategy.Throughput)); } } } diff --git a/src/Shared/BenchmarkRunner/DefaultCoreValidationConfig.cs b/src/Shared/BenchmarkRunner/DefaultCoreValidationConfig.cs index 3faf5ac1cb..ea79b42d9a 100644 --- a/src/Shared/BenchmarkRunner/DefaultCoreValidationConfig.cs +++ b/src/Shared/BenchmarkRunner/DefaultCoreValidationConfig.cs @@ -12,9 +12,9 @@ namespace BenchmarkDotNet.Attributes { public DefaultCoreValidationConfig() { - Add(ConsoleLogger.Default); + AddLogger(ConsoleLogger.Default); - Add(Job.Dry.With(InProcessNoEmitToolchain.Instance)); + AddJob(Job.Dry.WithToolchain(InProcessNoEmitToolchain.Instance)); } } }