Skip to content

Commit 5524feb

Browse files
timcasselltimcassell
committed
Merge branch 'master' into async-refactor
# Conflicts: # src/BenchmarkDotNet/Engines/EngineJitStage.cs # src/BenchmarkDotNet/Engines/EngineParameters.cs # src/BenchmarkDotNet/Helpers/AwaitHelper.cs # src/BenchmarkDotNet/Running/BenchmarkCase.cs # src/BenchmarkDotNet/Toolchains/Executor.cs # src/BenchmarkDotNet/Toolchains/InProcess/Emit/Implementation/ConsumableTypeInfo.cs # src/BenchmarkDotNet/Toolchains/InProcess/Emit/Implementation/Emitters/RunnableEmitter.cs # src/BenchmarkDotNet/Toolchains/InProcess/Emit/Implementation/Runnable/RunnableProgram.cs # src/BenchmarkDotNet/Toolchains/InProcess/Emit/Implementation/Runnable/RunnableReflectionHelpers.cs # src/BenchmarkDotNet/Toolchains/InProcess/NoEmit/InProcessNoEmitRunner.cs # tests/BenchmarkDotNet.Tests/Mocks/MockEngine.cs
2 parents 4094e33 + 60d8ec8 commit 5524feb

117 files changed

Lines changed: 2184 additions & 4012 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/BenchmarkDotNet.Annotations/Attributes/ParamsAttribute.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using System;
22

3+
#nullable enable
4+
35
namespace BenchmarkDotNet.Attributes
46
{
57
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
@@ -8,9 +10,9 @@ public class ParamsAttribute : PriorityAttribute
810
public object?[] Values { get; protected set; }
911

1012
// CLS-Compliant Code requires a constructor without an array in the argument list
11-
public ParamsAttribute() => Values = new object[0];
13+
public ParamsAttribute() => Values = [];
1214

1315
public ParamsAttribute(params object?[]? values)
14-
=> Values = values ?? new object?[] { null }; // when users do Params(null) they mean one, null argument
16+
=> Values = values ?? [null]; // when users do Params(null) they mean one, null argument
1517
}
1618
}

‎src/BenchmarkDotNet.TestAdapter/BenchmarkCaseExtensions.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ internal static TestCase ToVsTestCase(this BenchmarkCase benchmarkCase, string a
3535
// See: https://github.com/dotnet/BenchmarkDotNet/issues/2494
3636
var fullyQualifiedName = displayName;
3737

38+
// Use benchmark method FQN on Visual Studio environment to avoid TestExplorer hierarchy split
39+
// when job display name contains '.' which is interpreted as a namespace separator by VS.
40+
// See: https://github.com/dotnet/BenchmarkDotNet/issues/2793
41+
if (Environment.GetEnvironmentVariable("VSAPPIDNAME") != null)
42+
{
43+
var benchmarkMethodName = benchmarkMethod.Name;
44+
fullyQualifiedName = $"{fullClassName}.{benchmarkMethodName}";
45+
}
46+
3847
var vsTestCase = new TestCase(fullyQualifiedName, VsTestAdapter.ExecutorUri, assemblyPath)
3948
{
4049
DisplayName = displayName,

‎src/BenchmarkDotNet.TestAdapter/BenchmarkEnumerator.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,26 @@ public static BenchmarkRunInfo[] GetBenchmarksFromAssemblyPath(string assemblyPa
3838
}
3939
}
4040

41+
if (eventArgs.Name.StartsWith("System.Collections.Immutable, Version="))
42+
{
43+
var baseDir = Path.GetDirectoryName(assemblyPath);
44+
var path = Path.Combine(baseDir, "System.Collections.Immutable.dll");
45+
if (File.Exists(path))
46+
{
47+
return Assembly.LoadFrom(path);
48+
}
49+
}
50+
51+
if (eventArgs.Name.StartsWith("System.Memory, Version="))
52+
{
53+
var baseDir = Path.GetDirectoryName(assemblyPath);
54+
var path = Path.Combine(baseDir, "System.Memory.dll");
55+
if (File.Exists(path))
56+
{
57+
return Assembly.LoadFrom(path);
58+
}
59+
}
60+
4161
// Fallback to default assembly resolver
4262
return null;
4363
};

‎src/BenchmarkDotNet.TestAdapter/Utility/TestCaseFilter.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.IO;
66
using System.Linq;
77
using System.Reflection;
8+
using System.Runtime.ExceptionServices;
89

910
namespace BenchmarkDotNet.TestAdapter;
1011

@@ -138,7 +139,8 @@ private bool GetTestCaseFilterExpressionFromDiscoveryContext(IDiscoveryContext d
138139
return false;
139140
}
140141

141-
throw e.InnerException ?? e;
142+
ExceptionDispatchInfo.Capture(e.InnerException ?? e).Throw();
143+
return default!;// It's required to suppress error CS0161.
142144
}
143145
}
144146
}

‎src/BenchmarkDotNet.TestAdapter/VSTestEventProcessor.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
using System.Text;
1616
using System.Threading;
1717

18+
#nullable enable
19+
1820
namespace BenchmarkDotNet.TestAdapter
1921
{
2022
/// <summary>
@@ -81,7 +83,7 @@ public override void OnBuildComplete(BuildPartition buildPartition, BuildResult
8183

8284
if (buildResult.GenerateException != null)
8385
testResult.ErrorMessage = $"// Generate Exception: {buildResult.GenerateException.Message}";
84-
else if (!buildResult.IsBuildSuccess && buildResult.TryToExplainFailureReason(out string reason))
86+
else if (!buildResult.IsBuildSuccess && buildResult.TryToExplainFailureReason(out string? reason))
8587
testResult.ErrorMessage = $"// Build Error: {reason}";
8688
else if (buildResult.ErrorMessage != null)
8789
testResult.ErrorMessage = $"// Build Error: {buildResult.ErrorMessage}";

‎src/BenchmarkDotNet/Columns/LogicalGroupColumn.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
using BenchmarkDotNet.Running;
33
using JetBrains.Annotations;
44

5+
#nullable enable
6+
57
namespace BenchmarkDotNet.Columns
68
{
79
public class LogicalGroupColumn : IColumn
@@ -11,7 +13,7 @@ public class LogicalGroupColumn : IColumn
1113
public string Id => nameof(LogicalGroupColumn);
1214
public string ColumnName => Column.LogicalGroup;
1315

14-
public string GetValue(Summary summary, BenchmarkCase benchmarkCase) => summary.GetLogicalGroupKey(benchmarkCase);
16+
public string GetValue(Summary summary, BenchmarkCase benchmarkCase) => summary.GetLogicalGroupKey(benchmarkCase) ?? "";
1517
public string GetValue(Summary summary, BenchmarkCase benchmarkCase, SummaryStyle style) => GetValue(summary, benchmarkCase);
1618
public bool IsDefault(Summary summary, BenchmarkCase benchmarkCase) => false;
1719
public bool IsAvailable(Summary summary) => true;

‎src/BenchmarkDotNet/Detectors/Cpu/HardwareIntrinsics.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
using System.Runtime.Intrinsics.Arm;
1010
#endif
1111

12+
#nullable enable
13+
1214
namespace BenchmarkDotNet.Detectors.Cpu
1315
{
1416
// based on https://github.com/dotnet/runtime/tree/v10.0.0-rc.1.25451.107/src/coreclr/tools/Common/JitInterface/ThunkGenerator/InstructionSetDesc.txt
@@ -281,10 +283,10 @@ static IEnumerable<string> GetCurrentProcessInstructionSets(Platform platform)
281283

282284
private static bool GetIsSupported([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] string typeName)
283285
{
284-
Type type = Type.GetType(typeName);
286+
Type type = Type.GetType(typeName)!;
285287
if (type == null) return false;
286288

287-
return (bool)type.GetProperty("IsSupported", System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static).GetValue(null, null);
289+
return (bool)type.GetProperty("IsSupported", System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static)!.GetValue(null, null)!;
288290
}
289291
}
290292
}

‎src/BenchmarkDotNet/Detectors/Cpu/Linux/LinuxCpuInfoParser.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
namespace BenchmarkDotNet.Detectors.Cpu.Linux;
1212

13+
#nullable enable
14+
1315
internal static class LinuxCpuInfoParser
1416
{
1517
private static class ProcCpu
@@ -42,27 +44,27 @@ internal static CpuInfo Parse(string cpuInfo, string lscpu)
4244
var logicalCores = SectionsHelper.ParseSections(cpuInfo, ':');
4345
foreach (var logicalCore in logicalCores)
4446
{
45-
if (logicalCore.TryGetValue(ProcCpu.PhysicalId, out string physicalId) &&
46-
logicalCore.TryGetValue(ProcCpu.CpuCores, out string cpuCoresValue) &&
47+
if (logicalCore.TryGetValue(ProcCpu.PhysicalId, out var physicalId) &&
48+
logicalCore.TryGetValue(ProcCpu.CpuCores, out var cpuCoresValue) &&
4749
int.TryParse(cpuCoresValue, out int cpuCoreCount) &&
4850
cpuCoreCount > 0)
4951
processorsToPhysicalCoreCount[physicalId] = cpuCoreCount;
5052

51-
if (logicalCore.TryGetValue(ProcCpu.ModelName, out string modelName))
53+
if (logicalCore.TryGetValue(ProcCpu.ModelName, out var modelName))
5254
{
5355
processorModelNames.Add(modelName);
5456
logicalCoreCount++;
5557
}
5658

57-
if (logicalCore.TryGetValue(ProcCpu.MaxFrequency, out string maxCpuFreqValue) &&
59+
if (logicalCore.TryGetValue(ProcCpu.MaxFrequency, out var maxCpuFreqValue) &&
5860
Frequency.TryParseMHz(maxCpuFreqValue.Replace(',', '.'), out Frequency maxCpuFreq)
5961
&& maxCpuFreq > 0)
6062
{
6163
maxFrequency = Math.Max(maxFrequency, maxCpuFreq.ToMHz());
6264
}
6365

64-
bool nominalFrequencyHasValue = logicalCore.TryGetValue(ProcCpu.NominalFrequency, out string nominalFreqValue);
65-
bool nominalFrequencyBackupHasValue = logicalCore.TryGetValue(ProcCpu.NominalFrequencyBackup, out string nominalFreqBackupValue);
66+
bool nominalFrequencyHasValue = logicalCore.TryGetValue(ProcCpu.NominalFrequency, out var nominalFreqValue);
67+
bool nominalFrequencyBackupHasValue = logicalCore.TryGetValue(ProcCpu.NominalFrequencyBackup, out var nominalFreqBackupValue);
6668

6769
double nominalCpuFreq = 0.0;
6870
double nominalCpuBackupFreq = 0.0;
@@ -115,7 +117,7 @@ internal static CpuInfo Parse(string cpuInfo, string lscpu)
115117
}
116118
}
117119

118-
string processorName = processorModelNames.Count > 0 ? string.Join(", ", processorModelNames) : null;
120+
string? processorName = processorModelNames.Count > 0 ? string.Join(", ", processorModelNames) : null;
119121
int? physicalProcessorCount = processorsToPhysicalCoreCount.Count > 0 ? processorsToPhysicalCoreCount.Count : null;
120122
int? physicalCoreCount = processorsToPhysicalCoreCount.Count > 0 ? processorsToPhysicalCoreCount.Values.Sum() : coresPerSocket;
121123

‎src/BenchmarkDotNet/Detectors/Cpu/Windows/MosCpuDetector.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
using Perfolizer.Horology;
99
using Perfolizer.Models;
1010

11+
#nullable enable
12+
1113
namespace BenchmarkDotNet.Detectors.Cpu.Windows;
1214

1315
internal class MosCpuDetector : ICpuDetector
@@ -33,7 +35,7 @@ public bool IsApplicable() => OsDetector.IsWindows() &&
3335
{
3436
foreach (var moProcessor in mosProcessor.Get().Cast<ManagementObject>())
3537
{
36-
string name = moProcessor[WmicCpuInfoKeyNames.Name]?.ToString();
38+
string? name = moProcessor[WmicCpuInfoKeyNames.Name]?.ToString();
3739
if (name.IsNotBlank())
3840
{
3941
processorModelNames.Add(name);
@@ -51,7 +53,7 @@ public bool IsApplicable() => OsDetector.IsWindows() &&
5153
}
5254
}
5355

54-
string processorName = processorModelNames.Count > 0 ? string.Join(", ", processorModelNames) : null;
56+
string? processorName = processorModelNames.Count > 0 ? string.Join(", ", processorModelNames) : null;
5557
Frequency? maxFrequencyActual = maxFrequency > 0 && processorsCount > 0
5658
? Frequency.FromMHz(maxFrequency)
5759
: null;

‎src/BenchmarkDotNet/Detectors/Cpu/Windows/PowershellWmiCpuInfoParser.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
namespace BenchmarkDotNet.Detectors.Cpu.Windows;
99

10+
#nullable enable
11+
1012
internal static class PowershellWmiCpuInfoParser
1113
{
1214
internal static CpuInfo Parse(string powershellWmiOutput)
@@ -22,23 +24,23 @@ internal static CpuInfo Parse(string powershellWmiOutput)
2224
List<Dictionary<string, string>> processors = SectionsHelper.ParseSectionsForPowershellWmi(powershellWmiOutput, ':');
2325
foreach (Dictionary<string, string> processor in processors)
2426
{
25-
if (processor.TryGetValue(WmicCpuInfoKeyNames.NumberOfCores, out string numberOfCoresValue) &&
27+
if (processor.TryGetValue(WmicCpuInfoKeyNames.NumberOfCores, out string? numberOfCoresValue) &&
2628
int.TryParse(numberOfCoresValue, out int numberOfCores) &&
2729
numberOfCores > 0)
2830
physicalCoreCount += numberOfCores;
2931

30-
if (processor.TryGetValue(WmicCpuInfoKeyNames.NumberOfLogicalProcessors, out string numberOfLogicalValue) &&
32+
if (processor.TryGetValue(WmicCpuInfoKeyNames.NumberOfLogicalProcessors, out string? numberOfLogicalValue) &&
3133
int.TryParse(numberOfLogicalValue, out int numberOfLogical) &&
3234
numberOfLogical > 0)
3335
logicalCoreCount += numberOfLogical;
3436

35-
if (processor.TryGetValue(WmicCpuInfoKeyNames.Name, out string name))
37+
if (processor.TryGetValue(WmicCpuInfoKeyNames.Name, out string? name))
3638
{
3739
processorModelNames.Add(name);
3840
processorCount++;
3941
}
4042

41-
if (processor.TryGetValue(WmicCpuInfoKeyNames.MaxClockSpeed, out string frequencyValue)
43+
if (processor.TryGetValue(WmicCpuInfoKeyNames.MaxClockSpeed, out string? frequencyValue)
4244
&& double.TryParse(frequencyValue, out double frequency)
4345
&& frequency > 0)
4446
{

0 commit comments

Comments
 (0)