Display correct default InvocationCount in SummaryTable, fixes #1929 (#1930)

Author: AndreyAkinshin

src/BenchmarkDotNet/Characteristics/CharacteristicObject.cs

@@ -159,11 +159,21 @@ public T ResolveValue<T>(Characteristic<T> characteristic, IResolver resolver)
             return resolver.Resolve(this, characteristic);
         }
 
+        public T ResolveValue<T>(Characteristic<T> characteristic, IResolver resolver, T defaultValue)
+        {
+            return resolver.Resolve(this, characteristic, defaultValue);
+        }
+
         public object ResolveValue(Characteristic characteristic, IResolver resolver)
         {
             return resolver.Resolve(this, characteristic);
         }
 
+        public object ResolveValue(Characteristic characteristic, IResolver resolver, object defaultValue)
+        {
+            return resolver.Resolve(this, characteristic, defaultValue);
+        }
+
         public T ResolveValue<T>(Characteristic<T> characteristic, T defaultValue)
         {
             return HasValue(characteristic) ? GetValue(characteristic) : (T)characteristic.ResolveValueCore(this, defaultValue);

src/BenchmarkDotNet/Characteristics/CompositeResolver.cs

@@ -16,6 +16,9 @@ public CompositeResolver(params IResolver[] resolvers)
 
         public object Resolve(CharacteristicObject obj, Characteristic characteristic)
         {
+            if (obj.HasValue(characteristic))
+                return characteristic[obj];
+
             var resolver = resolvers.FirstOrDefault(r => r.CanResolve(characteristic));
             if (resolver != null)
                 return resolver.Resolve(obj, characteristic);
@@ -24,10 +27,35 @@ public object Resolve(CharacteristicObject obj, Characteristic characteristic)
 
         public T Resolve<T>(CharacteristicObject obj, Characteristic<T> characteristic)
         {
+            if (obj.HasValue(characteristic))
+                return characteristic[obj];
+
             var resolver = resolvers.FirstOrDefault(r => r.CanResolve(characteristic));
             if (resolver != null)
                 return resolver.Resolve(obj, characteristic);
             throw new InvalidOperationException($"There is no default resolver for {characteristic.FullId}");
         }
+
+        public object Resolve(CharacteristicObject obj, Characteristic characteristic, object defaultValue)
+        {
+            if (obj.HasValue(characteristic))
+                return characteristic[obj];
+
+            var resolver = resolvers.FirstOrDefault(r => r.CanResolve(characteristic));
+            if (resolver != null)
+                return resolver.Resolve(obj, characteristic, defaultValue);
+            return defaultValue;
+        }
+
+        public T Resolve<T>(CharacteristicObject obj, Characteristic<T> characteristic, T defaultValue)
+        {
+            if (obj.HasValue(characteristic))
+                return characteristic[obj];
+
+            var resolver = resolvers.FirstOrDefault(r => r.CanResolve(characteristic));
+            if (resolver != null)
+                return resolver.Resolve(obj, characteristic, defaultValue);
+            return defaultValue;
+        }
     }
 }

src/BenchmarkDotNet/Characteristics/IResolver.cs

@@ -10,5 +10,9 @@ public interface IResolver
         object Resolve(CharacteristicObject obj, Characteristic characteristic);
 
         T Resolve<T>(CharacteristicObject obj, Characteristic<T> characteristic);
+
+        object Resolve(CharacteristicObject obj, Characteristic characteristic, object defaultValue);
+
+        T Resolve<T>(CharacteristicObject obj, Characteristic<T> characteristic, T defaultValue);
     }
 }

src/BenchmarkDotNet/Characteristics/Resolver.cs

@@ -34,5 +34,27 @@ public T Resolve<T>(CharacteristicObject obj, Characteristic<T> characteristic)
                 return (T)resolver(obj);
             throw new InvalidOperationException($"There is no default resolver for {characteristic.FullId}");
         }
+
+        public object Resolve(CharacteristicObject obj, Characteristic characteristic, object defaultValue)
+        {
+            if (obj.HasValue(characteristic))
+                return characteristic[obj];
+
+            if (resolvers.TryGetValue(characteristic, out var resolver))
+                return resolver(obj);
+
+            return defaultValue;
+        }
+
+        public T Resolve<T>(CharacteristicObject obj, Characteristic<T> characteristic, T defaultValue)
+        {
+            if (obj.HasValue(characteristic))
+                return characteristic[obj];
+
+            if (resolvers.TryGetValue(characteristic, out var resolver))
+                return (T)resolver(obj);
+
+            return defaultValue;
+        }
     }
 }

src/BenchmarkDotNet/Engines/Engine.cs

@@ -39,7 +39,6 @@ public class Engine : IEngine
         private int UnrollFactor { get; }
         private RunStrategy Strategy { get; }
         private bool EvaluateOverhead { get; }
-        private int InvocationCount { get; }
         private bool MemoryRandomization { get; }
 
         private readonly EnginePilotStage pilotStage;
@@ -78,7 +77,6 @@ internal Engine(
             UnrollFactor = targetJob.ResolveValue(RunMode.UnrollFactorCharacteristic, Resolver);
             Strategy = targetJob.ResolveValue(RunMode.RunStrategyCharacteristic, Resolver);
             EvaluateOverhead = targetJob.ResolveValue(AccuracyMode.EvaluateOverheadCharacteristic, Resolver);
-            InvocationCount = targetJob.ResolveValue(RunMode.InvocationCountCharacteristic, Resolver);
             MemoryRandomization = targetJob.ResolveValue(RunMode.MemoryRandomizationCharacteristic, Resolver);
 
             warmupStage = new EngineWarmupStage(this);
@@ -106,7 +104,7 @@ public void Dispose()
 
         public RunResults Run()
         {
-            long invokeCount = InvocationCount;
+            long invokeCount = TargetJob.ResolveValue(RunMode.InvocationCountCharacteristic, Resolver, 1);
             IReadOnlyList<Measurement> idle = null;
 
             if (EngineEventSource.Log.IsEnabled())

src/BenchmarkDotNet/Environments/EnvironmentResolver.cs

@@ -39,7 +39,6 @@ private EnvironmentResolver()
                         throw new NotSupportedException($"Unknown runStrategy: {strategy}");
                 }
             });
-            Register(RunMode.InvocationCountCharacteristic, () => 1);
         }
     }
 }