Skip to content

Commit 7d8ca0d

Browse files
author
Nathan Ricci
committed
Revert "Add Parameter Filter (dotnet#2314)"
This reverts commit 92aba53.
1 parent 8fc1f03 commit 7d8ca0d

File tree

5 files changed

+0
-63
lines changed

5 files changed

+0
-63
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ bld/
5555

5656
# Visual Studio 2017 auto generated files
5757
Generated\ Files/
58-
**/*Properties/launchSettings.json
5958

6059
# scenario intermediate directories
6160
src/scenarios/*/pub

src/benchmarks/micro/Program.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ static int Main(string[] args)
2121
int? partitionIndex;
2222
List<string> exclusionFilterValue;
2323
List<string> categoryExclusionFilterValue;
24-
Dictionary<string, string> parameterFilterValue;
2524
bool getDiffableDisasm;
2625
bool resumeRun;
2726

@@ -32,7 +31,6 @@ static int Main(string[] args)
3231
argsList = CommandLineOptions.ParseAndRemoveIntParameter(argsList, "--partition-index", out partitionIndex);
3332
argsList = CommandLineOptions.ParseAndRemoveStringsParameter(argsList, "--exclusion-filter", out exclusionFilterValue);
3433
argsList = CommandLineOptions.ParseAndRemoveStringsParameter(argsList, "--category-exclusion-filter", out categoryExclusionFilterValue);
35-
argsList = CommandLineOptions.ParseAndRemovePairsParameter(argsList, "--parameter-filter", out parameterFilterValue);
3634
CommandLineOptions.ParseAndRemoveBooleanParameter(argsList, "--disasm-diff", out getDiffableDisasm);
3735
CommandLineOptions.ParseAndRemoveBooleanParameter(argsList, "--resume", out resumeRun);
3836

@@ -54,7 +52,6 @@ static int Main(string[] args)
5452
partitionIndex: partitionIndex,
5553
exclusionFilterValue: exclusionFilterValue,
5654
categoryExclusionFilterValue: categoryExclusionFilterValue,
57-
parameterFilterValue: parameterFilterValue,
5855
getDiffableDisasm: getDiffableDisasm,
5956
resumeRun: resumeRun)
6057
.AddValidator(new NoWasmValidator(Categories.NoWASM)))

src/harness/BenchmarkDotNet.Extensions/CommandLineOptions.cs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Numerics;
43

54
namespace BenchmarkDotNet.Extensions
65
{
@@ -54,29 +53,6 @@ public static List<string> ParseAndRemoveStringsParameter(List<string> argsList,
5453
return argsList;
5554
}
5655

57-
public static List<string> ParseAndRemovePairsParameter(List<string> argsList, string parameter, out Dictionary<string, string> pairValues)
58-
{
59-
int parameterIndex = argsList.IndexOf(parameter);
60-
pairValues = new Dictionary<string, string>();
61-
62-
if (parameterIndex + 1 < argsList.Count)
63-
{
64-
while (parameterIndex + 1 < argsList.Count && !argsList[parameterIndex + 1].StartsWith("-"))
65-
{
66-
string[] pair = argsList[parameterIndex + 1].Split(":".ToCharArray(), 2);
67-
pairValues.Add(pair[0], pair[1]);
68-
argsList.RemoveAt(parameterIndex + 1);
69-
}
70-
}
71-
//We only want to remove the --exclusion-filter if it exists
72-
if (parameterIndex != -1)
73-
{
74-
argsList.RemoveAt(parameterIndex);
75-
}
76-
77-
return argsList;
78-
}
79-
8056
public static void ParseAndRemoveBooleanParameter(List<string> argsList, string parameter, out bool parameterValue)
8157
{
8258
int parameterIndex = argsList.IndexOf(parameter);

src/harness/BenchmarkDotNet.Extensions/ParameterFilter.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public static IConfig Create(
2727
int? partitionIndex = null,
2828
List<string> exclusionFilterValue = null,
2929
List<string> categoryExclusionFilterValue = null,
30-
Dictionary<string, string> parameterFilterValue = null,
3130
Job job = null,
3231
bool getDiffableDisasm = false,
3332
bool resumeRun = false)
@@ -61,7 +60,6 @@ public static IConfig Create(
6160
.AddFilter(new PartitionFilter(partitionCount, partitionIndex))
6261
.AddFilter(new ExclusionFilter(exclusionFilterValue))
6362
.AddFilter(new CategoryExclusionFilter(categoryExclusionFilterValue))
64-
.AddFilter(new ParameterFilter(parameterFilterValue))
6563
.AddExporter(JsonExporter.Full) // make sure we export to Json
6664
.AddColumn(StatisticColumn.Median, StatisticColumn.Min, StatisticColumn.Max)
6765
.AddValidator(TooManyTestCasesValidator.FailOnError)

0 commit comments

Comments
 (0)