diff --git a/src/benchmarks/micro/Program.cs b/src/benchmarks/micro/Program.cs index a1291b51f68..92ec7d3e44e 100644 --- a/src/benchmarks/micro/Program.cs +++ b/src/benchmarks/micro/Program.cs @@ -21,7 +21,6 @@ static int Main(string[] args) int? partitionIndex; List exclusionFilterValue; List categoryExclusionFilterValue; - Dictionary parameterFilterValue; bool getDiffableDisasm; bool resumeRun; @@ -32,7 +31,6 @@ static int Main(string[] args) argsList = CommandLineOptions.ParseAndRemoveIntParameter(argsList, "--partition-index", out partitionIndex); argsList = CommandLineOptions.ParseAndRemoveStringsParameter(argsList, "--exclusion-filter", out exclusionFilterValue); argsList = CommandLineOptions.ParseAndRemoveStringsParameter(argsList, "--category-exclusion-filter", out categoryExclusionFilterValue); - argsList = CommandLineOptions.ParseAndRemovePairsParameter(argsList, "--parameter-filter", out parameterFilterValue); CommandLineOptions.ParseAndRemoveBooleanParameter(argsList, "--disasm-diff", out getDiffableDisasm); CommandLineOptions.ParseAndRemoveBooleanParameter(argsList, "--resume", out resumeRun); @@ -54,7 +52,6 @@ static int Main(string[] args) partitionIndex: partitionIndex, exclusionFilterValue: exclusionFilterValue, categoryExclusionFilterValue: categoryExclusionFilterValue, - parameterFilterValue: parameterFilterValue, getDiffableDisasm: getDiffableDisasm, resumeRun: resumeRun) .AddValidator(new NoWasmValidator(Categories.NoWASM))) diff --git a/src/harness/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj b/src/harness/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj index 0f939e27c79..66a73ae365a 100644 --- a/src/harness/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj +++ b/src/harness/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj @@ -7,8 +7,8 @@ <_BenchmarkDotNetSourcesN>$([MSBuild]::NormalizeDirectory('$(BenchmarkDotNetSources)')) - - + + diff --git a/src/harness/BenchmarkDotNet.Extensions/CommandLineOptions.cs b/src/harness/BenchmarkDotNet.Extensions/CommandLineOptions.cs index fba1c3479b2..3c8b343fc57 100644 --- a/src/harness/BenchmarkDotNet.Extensions/CommandLineOptions.cs +++ b/src/harness/BenchmarkDotNet.Extensions/CommandLineOptions.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Numerics; namespace BenchmarkDotNet.Extensions { @@ -54,29 +53,6 @@ public static List ParseAndRemoveStringsParameter(List argsList, return argsList; } - public static List ParseAndRemovePairsParameter(List argsList, string parameter, out Dictionary pairValues) - { - int parameterIndex = argsList.IndexOf(parameter); - pairValues = new Dictionary(); - - if (parameterIndex + 1 < argsList.Count) - { - while (parameterIndex + 1 < argsList.Count && !argsList[parameterIndex + 1].StartsWith("-")) - { - string[] pair = argsList[parameterIndex + 1].Split(":".ToCharArray(), 2); - pairValues.Add(pair[0], pair[1]); - argsList.RemoveAt(parameterIndex + 1); - } - } - //We only want to remove the --exclusion-filter if it exists - if (parameterIndex != -1) - { - argsList.RemoveAt(parameterIndex); - } - - return argsList; - } - public static void ParseAndRemoveBooleanParameter(List argsList, string parameter, out bool parameterValue) { int parameterIndex = argsList.IndexOf(parameter); diff --git a/src/harness/BenchmarkDotNet.Extensions/DiffableDisassemblyExporter.cs b/src/harness/BenchmarkDotNet.Extensions/DiffableDisassemblyExporter.cs index d45977ed5bf..44f81dd29e9 100644 --- a/src/harness/BenchmarkDotNet.Extensions/DiffableDisassemblyExporter.cs +++ b/src/harness/BenchmarkDotNet.Extensions/DiffableDisassemblyExporter.cs @@ -37,7 +37,7 @@ internal static string BuildDisassemblyString(DisassemblyResult disassemblyResul { checked { - totalSizeInBytes += (uint)asm.Instruction.Length; + totalSizeInBytes += (uint)asm.InstructionLength; } sb.AppendLine($" {element.TextRepresentation()}"); diff --git a/src/harness/BenchmarkDotNet.Extensions/ParameterFilter.cs b/src/harness/BenchmarkDotNet.Extensions/ParameterFilter.cs deleted file mode 100644 index 6491dc015a2..00000000000 --- a/src/harness/BenchmarkDotNet.Extensions/ParameterFilter.cs +++ /dev/null @@ -1,33 +0,0 @@ -using BenchmarkDotNet.Filters; -using BenchmarkDotNet.Parameters; -using BenchmarkDotNet.Running; -using System.Collections.Generic; -using System.Linq; - -public class ParameterFilter : IFilter -{ - private readonly Dictionary _parameterValues; - - public ParameterFilter(Dictionary parameterValues) - { - _parameterValues = parameterValues; - } - - public bool Predicate(BenchmarkCase benchmarkCase) - { - Dictionary items = benchmarkCase.Parameters.Items.ToDictionary(instance => instance.Name, instance => instance.Value); - - if (_parameterValues == null) - return true; - - foreach (string key in _parameterValues.Keys) - { - if (!items.Keys.Contains(key)) - return false; - if (!items[key].ToString().Equals(_parameterValues[key])) - return false; - } - - return true; - } -} diff --git a/src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs b/src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs index dba54a2a0a5..fd512ae2d57 100644 --- a/src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs +++ b/src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs @@ -27,7 +27,6 @@ public static IConfig Create( int? partitionIndex = null, List exclusionFilterValue = null, List categoryExclusionFilterValue = null, - Dictionary parameterFilterValue = null, Job job = null, bool getDiffableDisasm = false, bool resumeRun = false) @@ -61,7 +60,6 @@ public static IConfig Create( .AddFilter(new PartitionFilter(partitionCount, partitionIndex)) .AddFilter(new ExclusionFilter(exclusionFilterValue)) .AddFilter(new CategoryExclusionFilter(categoryExclusionFilterValue)) - .AddFilter(new ParameterFilter(parameterFilterValue)) .AddExporter(JsonExporter.Full) // make sure we export to Json .AddColumn(StatisticColumn.Median, StatisticColumn.Min, StatisticColumn.Max) .AddValidator(TooManyTestCasesValidator.FailOnError) @@ -85,7 +83,7 @@ public static IConfig Create( private static DisassemblyDiagnoser CreateDisassembler() => new DisassemblyDiagnoser(new DisassemblyDiagnoserConfig( maxDepth: 1, // TODO: is depth == 1 enough? - formatter: null, // TODO: enable diffable format + syntax: DisassemblySyntax.Masm, // TODO: enable diffable format printSource: false, // we are not interested in getting C# printInstructionAddresses: false, // would make the diffing hard, however could be useful to determine alignment exportGithubMarkdown: false,