Skip to content
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.

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

Allow users to hide Gen X columns #1764

Merged
merged 5 commits into from Aug 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/BenchmarkDotNet/Attributes/MemoryDiagnoserAttribute.cs
Expand Up @@ -9,9 +9,10 @@ public class MemoryDiagnoserAttribute : Attribute, IConfigSource
{
public IConfig Config { get; }

public MemoryDiagnoserAttribute()
/// <param name="displayGenColumns">Display Garbage Collections per Generation columns (Gen 0, Gen 1, Gen 2). True by default.</param>
public MemoryDiagnoserAttribute(bool displayGenColumns = true)
{
Config = ManualConfig.CreateEmpty().AddDiagnoser(MemoryDiagnoser.Default);
Config = ManualConfig.CreateEmpty().AddDiagnoser(new MemoryDiagnoser(new MemoryDiagnoserConfig(displayGenColumns)));
}
}
}
2 changes: 1 addition & 1 deletion src/BenchmarkDotNet/Columns/MetricColumn.cs
Expand Up @@ -16,7 +16,7 @@ public class MetricColumn : IColumn
public string Legend => descriptor.Legend;
public bool AlwaysShow => true;
public ColumnCategory Category => ColumnCategory.Metric;
public int PriorityInCategory => 0;
public int PriorityInCategory => descriptor.PriorityInCategory;
public bool IsNumeric => true;
public UnitType UnitType => descriptor.UnitType;

Expand Down
2 changes: 1 addition & 1 deletion src/BenchmarkDotNet/Configs/ImmutableConfig.cs
Expand Up @@ -92,7 +92,7 @@ public sealed class ImmutableConfig : IConfig
public IAnalyser GetCompositeAnalyser() => new CompositeAnalyser(analysers);
public IDiagnoser GetCompositeDiagnoser() => new CompositeDiagnoser(diagnosers);

public bool HasMemoryDiagnoser() => diagnosers.Contains(MemoryDiagnoser.Default);
public bool HasMemoryDiagnoser() => diagnosers.OfType<MemoryDiagnoser>().Any();

public bool HasThreadingDiagnoser() => diagnosers.Contains(ThreadingDiagnoser.Default);

Expand Down
Expand Up @@ -12,6 +12,7 @@ internal class AllocatedNativeMemoryDescriptor : IMetricDescriptor
public UnitType UnitType => UnitType.Size;
public string Unit => SizeUnit.B.Name;
public bool TheGreaterTheBetter => false;
public int PriorityInCategory => 0;
}

internal class NativeMemoryLeakDescriptor : IMetricDescriptor
Expand All @@ -23,5 +24,6 @@ internal class NativeMemoryLeakDescriptor : IMetricDescriptor
public UnitType UnitType => UnitType.Size;
public string Unit => SizeUnit.B.Name;
public bool TheGreaterTheBetter => false;
public int PriorityInCategory => 0;
}
}
19 changes: 14 additions & 5 deletions src/BenchmarkDotNet/Diagnosers/MemoryDiagnoser.cs
Expand Up @@ -15,9 +15,11 @@ public class MemoryDiagnoser : IDiagnoser
{
private const string DiagnoserId = nameof(MemoryDiagnoser);

public static readonly MemoryDiagnoser Default = new MemoryDiagnoser();
public static readonly MemoryDiagnoser Default = new MemoryDiagnoser(new MemoryDiagnoserConfig(displayGenColumns: true));

private MemoryDiagnoser() { } // we want to have only a single instance of MemoryDiagnoser
public MemoryDiagnoser(MemoryDiagnoserConfig config) => Config = config;

public MemoryDiagnoserConfig Config { get; }

public RunMode GetRunMode(BenchmarkCase benchmarkCase) => RunMode.NoOverhead;

Expand All @@ -33,9 +35,13 @@ public class MemoryDiagnoser : IDiagnoser

public IEnumerable<Metric> ProcessResults(DiagnoserResults diagnoserResults)
{
yield return new Metric(GarbageCollectionsMetricDescriptor.Gen0, diagnoserResults.GcStats.Gen0Collections / (double)diagnoserResults.GcStats.TotalOperations * 1000);
yield return new Metric(GarbageCollectionsMetricDescriptor.Gen1, diagnoserResults.GcStats.Gen1Collections / (double)diagnoserResults.GcStats.TotalOperations * 1000);
yield return new Metric(GarbageCollectionsMetricDescriptor.Gen2, diagnoserResults.GcStats.Gen2Collections / (double)diagnoserResults.GcStats.TotalOperations * 1000);
if (diagnoserResults.GcStats.Gen0Collections > 0 && Config.DisplayGenColumns)
yield return new Metric(GarbageCollectionsMetricDescriptor.Gen0, diagnoserResults.GcStats.Gen0Collections / (double)diagnoserResults.GcStats.TotalOperations * 1000);
if (diagnoserResults.GcStats.Gen1Collections > 0 && Config.DisplayGenColumns)
yield return new Metric(GarbageCollectionsMetricDescriptor.Gen1, diagnoserResults.GcStats.Gen1Collections / (double)diagnoserResults.GcStats.TotalOperations * 1000);
if (diagnoserResults.GcStats.Gen2Collections > 0 && Config.DisplayGenColumns)
yield return new Metric(GarbageCollectionsMetricDescriptor.Gen2, diagnoserResults.GcStats.Gen2Collections / (double)diagnoserResults.GcStats.TotalOperations * 1000);

yield return new Metric(AllocatedMemoryMetricDescriptor.Instance, diagnoserResults.GcStats.GetBytesAllocatedPerOperation(diagnoserResults.BenchmarkCase));
}

Expand All @@ -50,6 +56,7 @@ private class AllocatedMemoryMetricDescriptor : IMetricDescriptor
public UnitType UnitType => UnitType.Size;
public string Unit => SizeUnit.B.Name;
public bool TheGreaterTheBetter => false;
public int PriorityInCategory => GC.MaxGeneration + 1;
}

private class GarbageCollectionsMetricDescriptor : IMetricDescriptor
Expand All @@ -63,6 +70,7 @@ private GarbageCollectionsMetricDescriptor(int generationId)
Id = $"Gen{generationId}Collects";
DisplayName = $"Gen {generationId}";
Legend = $"GC Generation {generationId} collects per 1000 operations";
PriorityInCategory = generationId;
}

public string Id { get; }
Expand All @@ -72,6 +80,7 @@ private GarbageCollectionsMetricDescriptor(int generationId)
public UnitType UnitType => UnitType.Dimensionless;
public string Unit => "Count";
public bool TheGreaterTheBetter => false;
public int PriorityInCategory { get; }
}
}
}
16 changes: 16 additions & 0 deletions src/BenchmarkDotNet/Diagnosers/MemoryDiagnoserConfig.cs
@@ -0,0 +1,16 @@
using JetBrains.Annotations;

namespace BenchmarkDotNet.Diagnosers
{
public class MemoryDiagnoserConfig
{
/// <param name="displayGenColumns">Display Garbage Collections per Generation columns (Gen 0, Gen 1, Gen 2). True by default.</param>
[PublicAPI]
public MemoryDiagnoserConfig(bool displayGenColumns = true)
{
DisplayGenColumns = displayGenColumns;
}

public bool DisplayGenColumns { get; }
}
}
1 change: 1 addition & 0 deletions src/BenchmarkDotNet/Diagnosers/PmcMetricDescriptor.cs
Expand Up @@ -20,5 +20,6 @@ internal PmcMetricDescriptor(PreciseMachineCounter counter)
public string NumberFormat => "N0";
public UnitType UnitType => UnitType.Dimensionless;
public string Unit => "Count";
public int PriorityInCategory => 0;
}
}
2 changes: 2 additions & 0 deletions src/BenchmarkDotNet/Diagnosers/ThreadingDiagnoser.cs
Expand Up @@ -61,6 +61,7 @@ private class CompletedWorkItemCountMetricDescriptor : IMetricDescriptor
public UnitType UnitType => UnitType.Dimensionless;
public string Unit => "Count";
public bool TheGreaterTheBetter => false;
public int PriorityInCategory => 0;
}

private class LockContentionCountMetricDescriptor : IMetricDescriptor
Expand All @@ -74,6 +75,7 @@ private class LockContentionCountMetricDescriptor : IMetricDescriptor
public UnitType UnitType => UnitType.Dimensionless;
public string Unit => "Count";
public bool TheGreaterTheBetter => false;
public int PriorityInCategory => 0;
}
}
}
1 change: 1 addition & 0 deletions src/BenchmarkDotNet/Disassemblers/DisassemblyDiagnoser.cs
Expand Up @@ -169,6 +169,7 @@ private class NativeCodeSizeMetricDescriptor : IMetricDescriptor
public UnitType UnitType => UnitType.Size;
public string Unit => SizeUnit.B.Name;
public bool TheGreaterTheBetter => false;
public int PriorityInCategory => 0;
}
}
}
2 changes: 2 additions & 0 deletions src/BenchmarkDotNet/Reports/Metric.cs
Expand Up @@ -32,6 +32,8 @@ public interface IMetricDescriptor
[PublicAPI] string Unit { get; }

[PublicAPI] bool TheGreaterTheBetter { get; }

[PublicAPI] int PriorityInCategory { get; }
}

public class MetricDescriptorEqualityComparer : EqualityComparer<IMetricDescriptor>
Expand Down
Expand Up @@ -19,5 +19,6 @@ public FakeMetricDescriptor(string id, string legend, string numberFormat = null
public UnitType UnitType { get; }
public string Unit { get; }
public bool TheGreaterTheBetter { get; }
public int PriorityInCategory => 0;
}
}
1 change: 1 addition & 0 deletions tests/BenchmarkDotNet.Tests/Reports/SummaryTests.cs
Expand Up @@ -92,6 +92,7 @@ private sealed class FakeMetricDescriptor : IMetricDescriptor
public UnitType UnitType { get; }
public string Unit { get; } = nameof(Unit);
public bool TheGreaterTheBetter { get; }
public int PriorityInCategory => 0;
}
}
}