Merge branch 'master' into async-refactor

# Conflicts:
#	src/BenchmarkDotNet/BenchmarkDotNet.csproj
#	src/BenchmarkDotNet/Code/CodeGenerator.cs
#	src/BenchmarkDotNet/Code/DeclarationsProvider.cs
#	src/BenchmarkDotNet/Templates/BenchmarkProgram.txt

Author: timcassell

.github/workflows/run-tests.yaml

@@ -18,9 +18,11 @@ jobs:
         os: [windows-latest, windows-11-arm]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Disable Windows Defender
-        run: Set-MpPreference -DisableRealtimeMonitoring $true
+      - name: Add Windows Defender Exclusions
         shell: powershell
+        run: |
+          Add-MpPreference -ExclusionPath $env:GITHUB_WORKSPACE
+          Add-MpPreference -ExclusionPath $env:TEMP
       - uses: actions/checkout@v6
       # Build and Test
       - name: Run task 'build'
@@ -51,9 +53,11 @@ jobs:
         os: [windows-latest, windows-11-arm]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Disable Windows Defender
-        run: Set-MpPreference -DisableRealtimeMonitoring $true
+      - name: Add Windows Defender Exclusions
         shell: powershell
+        run: |
+          Add-MpPreference -ExclusionPath $env:GITHUB_WORKSPACE
+          Add-MpPreference -ExclusionPath $env:TEMP
       - uses: actions/checkout@v6
       # Build and Test
       - name: Run task 'build'

docs/articles/overview.md

@@ -57,7 +57,9 @@ namespace MyBenchmarks
 }
 ```
 
-The `BenchmarkRunner.Run<Md5VsSha256>()` call runs your benchmarks and prints results to the console.
+The `BenchmarkRunner.Run(typeof(Program).Assembly)` call runs all benchmarks in the current assembly and prints results to the console. If you'd like to run a single benchmark type, you can use `BenchmarkRunner.Run<Md5VsSha256>()`.
+
+BenchmarkDotNet discovers benchmark types via reflection, so benchmarks can be placed in different files as long as they are in the same project/assembly and the benchmark classes are `public`.
 
 Note that BenchmarkDotNet will only run benchmarks if the application is built in the Release configuration.
 This is to prevent unoptimized code from being benchmarked.

src/BenchmarkDotNet.Annotations/Jobs/RuntimeMoniker.cs

@@ -248,5 +248,25 @@ public enum RuntimeMoniker
         /// .NET 11 using MonoVM (not CLR which is the default)
         /// </summary>
         Mono11_0,
+
+        /// <summary>
+        /// .NET 8 CLR with composite ReadyToRun compilation
+        /// </summary>
+        R2R80,
+
+        /// <summary>
+        /// .NET 9 CLR with composite ReadyToRun compilation
+        /// </summary>
+        R2R90,
+
+        /// <summary>
+        /// .NET 10 CLR with composite ReadyToRun compilation
+        /// </summary>
+        R2R10_0,
+
+        /// <summary>
+        /// .NET 11 CLR with composite ReadyToRun compilation
+        /// </summary>
+        R2R11_0,
     }
 }

src/BenchmarkDotNet.Diagnostics.dotMemory/DotMemoryDiagnoser.cs

@@ -14,7 +14,7 @@ public class DotMemoryDiagnoser(Uri? nugetUrl = null, string? downloadTo = null)
 
     protected override void InitTool(Progress progress)
     {
-        DotMemory.InitAsync(progress, nugetUrl, NuGetApi.V3, downloadTo).Wait();
+        DotMemory.InitAsync(progress, nugetUrl, NuGetApi.V3, downloadTo).GetAwaiter().GetResult();
     }
 
     protected override void AttachToCurrentProcess(string snapshotFile)
@@ -24,7 +24,11 @@ protected override void AttachToCurrentProcess(string snapshotFile)
 
     protected override void AttachToProcessByPid(int pid, string snapshotFile)
     {
-        DotMemory.Attach(new DotMemory.Config().ProfileExternalProcess(pid).SaveToFile(snapshotFile));
+        var config = new DotMemory.Config()
+            .UseCustomResponseTimeout(milliseconds:60 * 1000)
+            .ProfileExternalProcess(pid)
+            .SaveToFile(snapshotFile);
+        DotMemory.Attach(config);
     }
 
     protected override void TakeSnapshot()
@@ -83,6 +87,10 @@ internal override bool IsSupported(RuntimeMoniker runtimeMoniker)
             case RuntimeMoniker.Net90:
             case RuntimeMoniker.Net10_0:
             case RuntimeMoniker.Net11_0:
+            case RuntimeMoniker.R2R80:
+            case RuntimeMoniker.R2R90:
+            case RuntimeMoniker.R2R10_0:
+            case RuntimeMoniker.R2R11_0:
                 return true;
             case RuntimeMoniker.NotRecognized:
             case RuntimeMoniker.Mono:

src/BenchmarkDotNet.Diagnostics.dotTrace/DotTraceDiagnoser.cs

@@ -14,7 +14,7 @@ public class DotTraceDiagnoser(Uri? nugetUrl = null, string? downloadTo = null)
 
     protected override void InitTool(Progress progress)
     {
-        DotTrace.InitAsync(progress, nugetUrl, NuGetApi.V3, downloadTo).Wait();
+        DotTrace.InitAsync(progress, nugetUrl, NuGetApi.V3, downloadTo).GetAwaiter().GetResult();
     }
 
     protected override void AttachToCurrentProcess(string snapshotFile)
@@ -25,7 +25,11 @@ protected override void AttachToCurrentProcess(string snapshotFile)
 
     protected override void AttachToProcessByPid(int pid, string snapshotFile)
     {
-        DotTrace.Attach(new DotTrace.Config().ProfileExternalProcess(pid).SaveToFile(snapshotFile));
+        var config = new DotTrace.Config()
+            .UseCustomResponseTimeout(milliseconds: 60 * 1000)
+            .ProfileExternalProcess(pid)
+            .SaveToFile(snapshotFile);
+        DotTrace.Attach(config);
         DotTrace.StartCollectingData();
     }
 
@@ -86,6 +90,10 @@ internal override bool IsSupported(RuntimeMoniker runtimeMoniker)
             case RuntimeMoniker.Net90:
             case RuntimeMoniker.Net10_0:
             case RuntimeMoniker.Net11_0:
+            case RuntimeMoniker.R2R80:
+            case RuntimeMoniker.R2R90:
+            case RuntimeMoniker.R2R10_0:
+            case RuntimeMoniker.R2R11_0:
                 return true;
             case RuntimeMoniker.NotRecognized:
             case RuntimeMoniker.Mono:

src/BenchmarkDotNet/Attributes/ConfigAttribute.cs

@@ -1,13 +1,15 @@
 using System;
 using BenchmarkDotNet.Configs;
 
+#nullable enable
+
 namespace BenchmarkDotNet.Attributes
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Assembly)]
     public class ConfigAttribute : Attribute, IConfigSource
     {
         public IConfig Config { get; }
 
-        public ConfigAttribute(Type type) => Config = (IConfig)Activator.CreateInstance(type);
+        public ConfigAttribute(Type type) => Config = (IConfig)Activator.CreateInstance(type)!;
     }
 }

src/BenchmarkDotNet/Attributes/Jobs/SimpleJobAttribute.cs

@@ -5,6 +5,8 @@
 using BenchmarkDotNet.Jobs;
 using JetBrains.Annotations;
 
+#nullable enable
+
 namespace BenchmarkDotNet.Attributes
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Assembly, AllowMultiple = true)]
@@ -18,7 +20,7 @@ public SimpleJobAttribute(
             int warmupCount = DefaultValue,
             int iterationCount = DefaultValue,
             int invocationCount = DefaultValue,
-            string? id = null,
+            string id = "",
             bool baseline = false
         ) : base(CreateJob(id, launchCount, warmupCount, iterationCount, invocationCount, null, baseline)) { }
 
@@ -29,7 +31,7 @@ public SimpleJobAttribute(
             int warmupCount = DefaultValue,
             int iterationCount = DefaultValue,
             int invocationCount = DefaultValue,
-            string? id = null,
+            string id = "",
             bool baseline = false
         ) : base(CreateJob(id, launchCount, warmupCount, iterationCount, invocationCount, runStrategy, baseline)) { }
 
@@ -40,7 +42,7 @@ public SimpleJobAttribute(
             int warmupCount = DefaultValue,
             int iterationCount = DefaultValue,
             int invocationCount = DefaultValue,
-            string? id = null,
+            string id = "",
             bool baseline = false
         ) : base(CreateJob(id, launchCount, warmupCount, iterationCount, invocationCount, null, baseline, runtimeMoniker)) { }
 
@@ -52,11 +54,11 @@ public SimpleJobAttribute(
             int warmupCount = DefaultValue,
             int iterationCount = DefaultValue,
             int invocationCount = DefaultValue,
-            string? id = null,
+            string id = "",
             bool baseline = false
         ) : base(CreateJob(id, launchCount, warmupCount, iterationCount, invocationCount, runStrategy, baseline, runtimeMoniker)) { }
 
-        private static Job CreateJob(string? id, int launchCount, int warmupCount, int iterationCount, int invocationCount, RunStrategy? runStrategy,
+        private static Job CreateJob(string id, int launchCount, int warmupCount, int iterationCount, int invocationCount, RunStrategy? runStrategy,
             bool baseline, RuntimeMoniker runtimeMoniker = RuntimeMoniker.HostProcess)
         {
             var job = new Job(id);

src/BenchmarkDotNet/BenchmarkDotNet.csproj

@@ -29,6 +29,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
     <PackageReference Include="System.Management" Version="10.0.1" />
     <PackageReference Include="System.Linq.AsyncEnumerable" Version="10.0.1" />
+    <PackageReference Include="System.Text.Json" Version="10.0.1" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />

src/BenchmarkDotNet/Characteristics/CharacteristicPresenter.cs

@@ -40,6 +40,9 @@ public override string ToPresentation(object? value, Characteristic characterist
                 if (characteristic == EnvironmentMode.AffinityCharacteristic && value is IntPtr intPtr)
                     return intPtr.ToPresentation(Environment.ProcessorCount);
 
+                if (characteristic == EnvironmentMode.PowerPlanModeCharacteristic && value is Guid guid && guid == Guid.Empty)
+                    return ""; // Replace Guid.Empty to empty string.
+
                 return ToPresentation(value);
             }
 
@@ -70,8 +73,6 @@ private static string ToPresentation(object? value)
                 => (value as IFormattable)?.ToString(null, DefaultCultureInfo.Instance)
                       ?? value?.ToString()
                       ?? "";
-
-
         }
 
         private class SourceCodeCharacteristicPresenter : CharacteristicPresenter

src/BenchmarkDotNet/Characteristics/CharacteristicSetPresenter.cs

@@ -1,11 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Environments;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Toolchains;
 using JetBrains.Annotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+#nullable enable
 
 namespace BenchmarkDotNet.Characteristics
 {
@@ -58,7 +60,9 @@ private class DisplayPresenter : CharacteristicSetPresenter
             public override string ToPresentation(CharacteristicObject obj)
             {
                 var values = GetPresentableCharacteristics(obj)
-                    .Select(c => c.Id + "=" + CharacteristicPresenter.ToPresentation(obj, c));
+                    .Select(c => (c.Id, Value: CharacteristicPresenter.ToPresentation(obj, c)))
+                    .Where(x => x.Value != "")
+                    .Select(x => $"{x.Id}={x.Value}");
                 return string.Join(Separator, values);
             }
         }