Limit contended paths to physical cores not logical cores

src/Nethermind/Nethermind.Consensus/Processing/BlockCachePreWarmer.cs

@@ -9,6 +9,7 @@
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
 using Nethermind.Core.Threading;
+using Nethermind.Core.Cpu;
 using Nethermind.Evm;
 using Nethermind.Evm.Tracing;
 using Nethermind.Evm.TransactionProcessing;
@@ -54,7 +55,7 @@ private void PreWarmCachesParallel(Block suggestedBlock, Hash256 parentStateRoot
 
         try
         {
-            ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = Math.Max(1, Environment.ProcessorCount - 2), CancellationToken = cancellationToken };
+            ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = Math.Max(1, RuntimeInformation.PhysicalCoreCount - 2), CancellationToken = cancellationToken };
             IReleaseSpec spec = specProvider.GetSpec(suggestedBlock.Header);
 
             WarmupTransactions(parallelOptions, spec, suggestedBlock, parentStateRoot);

src/Nethermind/Nethermind.Init/Cpu/ConsoleExitHandler.cs → src/Nethermind/Nethermind.Core/Cpu/ConsoleExitHandler.cs

@@ -7,7 +7,7 @@
 using System;
 using System.Diagnostics;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 internal class ConsoleExitHandler : IDisposable
 {

src/Nethermind/Nethermind.Init/Cpu/CpuInfo.cs → src/Nethermind/Nethermind.Core/Cpu/CpuInfo.cs

@@ -4,9 +4,9 @@
 // Derived from https://github.com/dotnet/BenchmarkDotNet
 // Licensed under the MIT License
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
-internal class CpuInfo
+public class CpuInfo
 {
     public string ProcessorName { get; }
     public int? PhysicalProcessorCount { get; }

src/Nethermind/Nethermind.Init/Cpu/DefaultCultureInfo.cs → src/Nethermind/Nethermind.Core/Cpu/DefaultCultureInfo.cs

@@ -6,7 +6,7 @@
 
 using System.Globalization;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 internal static class DefaultCultureInfo
 {

src/Nethermind/Nethermind.Init/Cpu/Frequency.cs → src/Nethermind/Nethermind.Core/Cpu/Frequency.cs

@@ -6,9 +6,9 @@
 
 using System.Globalization;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
-internal readonly struct Frequency
+public readonly struct Frequency
 {
     public static readonly Frequency Zero = new Frequency(0.0);
 

src/Nethermind/Nethermind.Init/Cpu/FrequencyUnit.cs → src/Nethermind/Nethermind.Core/Cpu/FrequencyUnit.cs

@@ -4,9 +4,9 @@
 // Derived from https://github.com/AndreyAkinshin/perfolizer
 // Licensed under the MIT License
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
-internal class FrequencyUnit
+public class FrequencyUnit
 {
     public static readonly FrequencyUnit Hz = new FrequencyUnit("Hz", "Hertz", 1L);
 

src/Nethermind/Nethermind.Init/Cpu/ProcCpuInfoKeyNames.cs → src/Nethermind/Nethermind.Core/Cpu/ProcCpuInfoKeyNames.cs

@@ -4,7 +4,7 @@
 // Derived from https://github.com/dotnet/BenchmarkDotNet
 // Licensed under the MIT License
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 internal static class ProcCpuInfoKeyNames
 {

src/Nethermind/Nethermind.Init/Cpu/ProcCpuInfoParser.cs → src/Nethermind/Nethermind.Core/Cpu/ProcCpuInfoParser.cs

@@ -8,7 +8,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 internal static partial class ProcCpuInfoParser
 {

src/Nethermind/Nethermind.Init/Cpu/ProcCpuInfoProvider.cs → src/Nethermind/Nethermind.Core/Cpu/ProcCpuInfoProvider.cs

@@ -7,7 +7,7 @@
 using System;
 using System.Linq;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 /// <summary>
 /// CPU information from output of the `cat /proc/info` command.

src/Nethermind/Nethermind.Init/Cpu/ProcessExtensions.cs → src/Nethermind/Nethermind.Core/Cpu/ProcessExtensions.cs

@@ -10,7 +10,7 @@
 using System.Diagnostics;
 using System.IO;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 // we need it public to reuse it in the auto-generated dll
 // but we hide it from intellisense with following attribute

src/Nethermind/Nethermind.Init/Cpu/ProcessHelper.cs → src/Nethermind/Nethermind.Core/Cpu/ProcessHelper.cs

@@ -7,7 +7,7 @@
 using System;
 using System.Diagnostics;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 internal static class ProcessHelper
 {

src/Nethermind/Nethermind.Init/Cpu/RuntimeInformation.cs → src/Nethermind/Nethermind.Core/Cpu/RuntimeInformation.cs

@@ -5,10 +5,11 @@
 // Licensed under the MIT License
 
 using System;
+using System.Threading.Tasks;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
-internal static class RuntimeInformation
+public static class RuntimeInformation
 {
     [System.Runtime.Versioning.SupportedOSPlatformGuard("windows")]
     internal static bool IsWindows() => OperatingSystem.IsWindows(); // prefer linker-friendly OperatingSystem APIs
@@ -19,7 +20,7 @@ internal static class RuntimeInformation
     [System.Runtime.Versioning.SupportedOSPlatformGuard("macos")]
     internal static bool IsMacOS() => OperatingSystem.IsMacOS();
 
-    internal static CpuInfo? GetCpuInfo()
+    public static CpuInfo? GetCpuInfo()
     {
         if (IsWindows())
             return WmicCpuInfoProvider.WmicCpuInfo.Value;
@@ -31,5 +32,9 @@ internal static class RuntimeInformation
         return null;
     }
 
+    public static int PhysicalCoreCount { get; } = GetCpuInfo()?.PhysicalCoreCount ?? Environment.ProcessorCount;
+    public static ParallelOptions ParallelOptionsPhysicalCores { get; } = new() { MaxDegreeOfParallelism = PhysicalCoreCount };
+    public static ParallelOptions ParallelOptionsLogicalCores { get; } = new() { MaxDegreeOfParallelism = Environment.ProcessorCount };
+
     public static bool Is64BitPlatform() => IntPtr.Size == 8;
 }

src/Nethermind/Nethermind.Init/Cpu/SectionsHelper.cs → src/Nethermind/Nethermind.Core/Cpu/SectionsHelper.cs

@@ -9,7 +9,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 internal static partial class SectionsHelper
 {

src/Nethermind/Nethermind.Init/Cpu/SysctlCpuInfoParser.cs → src/Nethermind/Nethermind.Core/Cpu/SysctlCpuInfoParser.cs

@@ -6,7 +6,7 @@
 
 using System.Collections.Generic;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 internal static class SysctlCpuInfoParser
 {

src/Nethermind/Nethermind.Init/Cpu/SysctlCpuInfoProvider.cs → src/Nethermind/Nethermind.Core/Cpu/SysctlCpuInfoProvider.cs

@@ -6,7 +6,7 @@
 
 using System;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 /// <summary>
 /// CPU information from output of the `sysctl -a` command.

src/Nethermind/Nethermind.Init/Cpu/TimeInterval.cs → src/Nethermind/Nethermind.Core/Cpu/TimeInterval.cs

@@ -6,9 +6,9 @@
 
 using System.Globalization;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
-internal readonly struct TimeInterval
+public readonly struct TimeInterval
 {
     public static readonly TimeInterval Nanosecond = TimeUnit.Nanosecond.ToInterval(1L);
 

src/Nethermind/Nethermind.Init/Cpu/TimeUnit.cs → src/Nethermind/Nethermind.Core/Cpu/TimeUnit.cs

@@ -7,9 +7,9 @@
 using System;
 using System.Linq;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
-internal class TimeUnit : IEquatable<TimeUnit>
+public class TimeUnit : IEquatable<TimeUnit>
 {
     public static readonly TimeUnit Nanosecond = new TimeUnit("ns", "Nanosecond", 1L);
 

src/Nethermind/Nethermind.Init/Cpu/UnitPresentation.cs → src/Nethermind/Nethermind.Core/Cpu/UnitPresentation.cs

@@ -4,9 +4,9 @@
 // Derived from https://github.com/AndreyAkinshin/perfolizer
 // Licensed under the MIT License
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
-internal class UnitPresentation
+public class UnitPresentation
 {
     public static readonly UnitPresentation Default = new UnitPresentation(isVisible: true, 0);
 

src/Nethermind/Nethermind.Init/Cpu/WmicCpuInfoKeyNames.cs → src/Nethermind/Nethermind.Core/Cpu/WmicCpuInfoKeyNames.cs

@@ -4,7 +4,7 @@
 // Derived from https://github.com/dotnet/BenchmarkDotNet
 // Licensed under the MIT License
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 internal static class WmicCpuInfoKeyNames
 {

src/Nethermind/Nethermind.Init/Cpu/WmicCpuInfoParser.cs → src/Nethermind/Nethermind.Core/Cpu/WmicCpuInfoParser.cs

@@ -6,7 +6,7 @@
 
 using System.Collections.Generic;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 internal static class WmicCpuInfoParser
 {

src/Nethermind/Nethermind.Init/Cpu/WmicCpuInfoProvider.cs → src/Nethermind/Nethermind.Core/Cpu/WmicCpuInfoProvider.cs

@@ -6,7 +6,7 @@
 
 using System;
 
-namespace Nethermind.Init.Cpu;
+namespace Nethermind.Core.Cpu;
 
 /// <summary>
 /// CPU information from output of the `wmic cpu get Name, NumberOfCores, NumberOfLogicalProcessors /Format:List` command.

src/Nethermind/Nethermind.Init/Steps/LogHardwareInfo.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Nethermind.Api;
+using Nethermind.Core.Cpu;
 using ILogger = Nethermind.Logging.ILogger;
 
 namespace Nethermind.Init.Steps;
@@ -25,7 +26,7 @@ public Task Execute(CancellationToken cancellationToken)
 
         try
         {
-            var cpu = Cpu.RuntimeInformation.GetCpuInfo();
+            var cpu = RuntimeInformation.GetCpuInfo();
             if (cpu is not null)
             {
                 _logger.Info($"CPU: {cpu.ProcessorName} ({cpu.PhysicalCoreCount}C{cpu.LogicalCoreCount}T)");

src/Nethermind/Nethermind.State/PersistentStorageProvider.cs

@@ -18,6 +18,7 @@
 
 namespace Nethermind.State
 {
+    using Nethermind.Core.Cpu;
     /// <summary>
     /// Manages persistent storage allowing for snapshotting and restoring
     /// Persists data to ITrieStore
@@ -263,7 +264,7 @@ void UpdateRootHashesSingleThread()
             void UpdateRootHashesMultiThread()
             {
                 // We can recalculate the roots in parallel as they are all independent tries
-                Parallel.ForEach(_storages, kvp =>
+                Parallel.ForEach(_storages, RuntimeInformation.ParallelOptionsLogicalCores, kvp =>
                 {
                     if (!_toUpdateRoots.Contains(kvp.Key))
                     {

src/Nethermind/Nethermind.Trie/PatriciaTree.cs

@@ -14,6 +14,7 @@
 using System.Threading.Tasks;
 using Nethermind.Core;
 using Nethermind.Core.Buffers;
+using Nethermind.Core.Cpu;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Extensions;
 using Nethermind.Logging;
@@ -227,7 +228,7 @@ private void Commit(NodeCommitInfo nodeCommitInfo, bool skipSelf = false)
                     if (nodesToCommit.Count >= 4)
                     {
                         ClearExceptions();
-                        Parallel.For(0, nodesToCommit.Count, i =>
+                        Parallel.For(0, nodesToCommit.Count, RuntimeInformation.ParallelOptionsLogicalCores, i =>
                         {
                             try
                             {

src/Nethermind/Nethermind.Trie/Pruning/TrieStore.cs

@@ -21,6 +21,7 @@
 
 namespace Nethermind.Trie.Pruning
 {
+    using Nethermind.Core.Cpu;
     /// <summary>
     /// Trie store helps to manage trie commits block by block.
     /// If persistence and pruning are needed they have a chance to execute their behaviour on commits.
@@ -1275,7 +1276,7 @@ void PersistNode(TrieNode n, Hash256? address, TreePath path)
                             n.IsPersisted = true;
                         }
                     }
-                    Parallel.For(0, nodesCopy.Length, new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount / 2 }, i =>
+                    Parallel.For(0, nodesCopy.Length, RuntimeInformation.ParallelOptionsPhysicalCores, i =>
                     {
                         if (cancellationToken.IsCancellationRequested) return;
                         DirtyNodesCache.Key key = nodesCopy[i].Key;

src/Nethermind/Nethermind.Trie/TrieNode.Decoder.cs

@@ -9,6 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Nethermind.Core.Buffers;
+using Nethermind.Core.Cpu;
 using Nethermind.Core.Crypto;
 using Nethermind.Serialization.Rlp;
 using Nethermind.Trie.Pruning;
@@ -174,7 +175,7 @@ private static int GetChildrenRlpLengthForBranchParallel(ITrieNodeResolver tree,
             private static int GetChildrenRlpLengthForBranchNonRlpParallel(ITrieNodeResolver tree, TreePath rootPath, TrieNode item, ICappedArrayPool bufferPool)
             {
                 int totalLength = 0;
-                Parallel.For(0, BranchesCount,
+                Parallel.For(0, BranchesCount, RuntimeInformation.ParallelOptionsLogicalCores,
                     () => 0,
                     (i, _, local) =>
                     {
@@ -235,7 +236,7 @@ private static int GetChildrenRlpLengthForBranchNonRlp(ITrieNodeResolver tree, r
             private static int GetChildrenRlpLengthForBranchRlpParallel(ITrieNodeResolver tree, TreePath rootPath, TrieNode item, ICappedArrayPool? bufferPool)
             {
                 int totalLength = 0;
-                Parallel.For(0, BranchesCount,
+                Parallel.For(0, BranchesCount, RuntimeInformation.ParallelOptionsLogicalCores,
                     () => 0,
                     (i, _, local) =>
                     {

src/Nethermind/Nethermind.Trie/TrieNode.Visitor.cs

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using Nethermind.Core;
 using Nethermind.Core.Buffers;
+using Nethermind.Core.Cpu;
 using Nethermind.Core.Crypto;
 using Nethermind.Serialization.Rlp;
 using Nethermind.Trie.Pruning;
@@ -192,7 +193,7 @@ void VisitMultiThread(TreePath parentPath, ITreeVisitor<TNodeContext> treeVisito
                             var copy = nodeContext;
 
                             // multithreaded route
-                            Parallel.For(0, BranchesCount, i =>
+                            Parallel.For(0, BranchesCount, RuntimeInformation.ParallelOptionsPhysicalCores, i =>
                             {
                                 visitContext.Semaphore.Wait();
                                 try