Bumped BDN version (#2639)

Update API for new BDN version and revert "Add Parameter Filter (#2314)"
dotnet · Oct 11, 2022 · 4a35773 · 4a35773
1 parent f863ee8
commit 4a35773
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 66 deletions.
diff --git a/src/benchmarks/micro/Program.cs b/src/benchmarks/micro/Program.cs
@@ -21,7 +21,6 @@ static int Main(string[] args)
             int? partitionIndex;
             List<string> exclusionFilterValue;
             List<string> categoryExclusionFilterValue;
-            Dictionary<string, string> 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
@@ -7,8 +7,8 @@
     <_BenchmarkDotNetSourcesN>$([MSBuild]::NormalizeDirectory('$(BenchmarkDotNetSources)'))</_BenchmarkDotNetSourcesN>
   </PropertyGroup>
   <ItemGroup Condition="'$(BenchmarkDotNetSources)' == ''">
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1.1847" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.1.1847" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2.1940" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.2.1940" />
   </ItemGroup>
   <ItemGroup Condition="'$(BenchmarkDotNetSources)' != ''">
     <ProjectReference Include="$(_BenchmarkDotNetSourcesN)src\BenchmarkDotNet\BenchmarkDotNet.csproj" SetTargetFramework="TargetFramework=netstandard2.0" />

diff --git 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<string> ParseAndRemoveStringsParameter(List<string> argsList,
             return argsList;
         }
 
-        public static List<string> ParseAndRemovePairsParameter(List<string> argsList, string parameter, out Dictionary<string, string> pairValues)
-        {
-            int parameterIndex = argsList.IndexOf(parameter);
-            pairValues = new Dictionary<string, string>();
-
-            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<string> 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
@@ -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
diff --git 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<string> exclusionFilterValue = null,
             List<string> categoryExclusionFilterValue = null,
-            Dictionary<string, string> 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,
-Original file line number
+Diff line change
@@ Expand Up @@
                         {
                             checked
                             {
-                                totalSizeInBytes += (uint)asm.Instruction.Length;
+                                totalSizeInBytes += (uint)asm.InstructionLength;
                             }
                             sb.AppendLine($"       {element.TextRepresentation()}");
@@ Expand Down @@