Skip to content

Bumped BDN version #2639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 11, 2022
Merged

Bumped BDN version #2639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afa9195
Bumped BDN version.
Oct 7, 2022
8fc1f03
fix the build
adamsitnik Oct 6, 2022
7d8ca0d
Revert "Add Parameter Filter (#2314)"
Oct 11, 2022
c3178ce
Keep updated .gitignore.
Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/benchmarks/micro/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);

Expand All @@ -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)))
Expand Down
4 changes: 2 additions & 2 deletions src/harness/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
24 changes: 0 additions & 24 deletions src/harness/BenchmarkDotNet.Extensions/CommandLineOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Numerics;

namespace BenchmarkDotNet.Extensions
{
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/harness/BenchmarkDotNet.Extensions/DiffableDisassemblyExporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal static string BuildDisassemblyString(DisassemblyResult disassemblyResul
{
checked
{
totalSizeInBytes += (uint)asm.Instruction.Length;
totalSizeInBytes += (uint)asm.InstructionLength;
}

sb.AppendLine($" {element.TextRepresentation()}");
Expand Down
33 changes: 0 additions & 33 deletions src/harness/BenchmarkDotNet.Extensions/ParameterFilter.cs
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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,
Expand Down