Removed WorkloadActionSingleInvokes from BenchmarkType and EngineParameters, just use () => engineParameters.WorkloadActionNoUnroll(1) instead.

Author: timcassell

src/BenchmarkDotNet/Engines/EngineFactory.cs

@@ -112,7 +112,7 @@ private static Engine CreateEngine(EngineParameters engineParameters, Job job, A
                 engineParameters.Dummy3Action,
                 idle,
                 main,
-                engineParameters.WorkloadActionSingleInvoke,
+                () => engineParameters.WorkloadActionNoUnroll(1),
                 job,
                 engineParameters.GlobalSetupAction,
                 engineParameters.GlobalCleanupAction,

src/BenchmarkDotNet/Engines/EngineParameters.cs

@@ -14,7 +14,6 @@ public class EngineParameters
         public IHost Host { get; set; }
         public Action<long> WorkloadActionNoUnroll { get; set; }
         public Action<long> WorkloadActionUnroll { get; set; }
-        public Action WorkloadActionSingleInvoke { get; set; }
         public Action Dummy1Action { get; set; }
         public Action Dummy2Action { get; set; }
         public Action Dummy3Action { get; set; }

src/BenchmarkDotNet/Templates/BenchmarkType.txt

@@ -26,7 +26,6 @@
                 Host = host,
                 WorkloadActionUnroll = instance.WorkloadActionUnroll,
                 WorkloadActionNoUnroll = instance.WorkloadActionNoUnroll,
-                WorkloadActionSingleInvoke = instance.WorkloadActionSingleInvoke,
                 Dummy1Action = instance.Dummy1,
                 Dummy2Action = instance.Dummy2,
                 Dummy3Action = instance.Dummy3,
@@ -150,12 +149,6 @@
                 consumer.Consume(workloadDelegate($PassArguments$)$ConsumeField$);
             }
         }
-
-        private void WorkloadActionSingleInvoke()
-        {
-            $LoadArguments$
-            consumer.Consume(workloadDelegate($PassArguments$)$ConsumeField$);
-        }
 
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization | System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         public $WorkloadMethodReturnType$ $DisassemblerEntryMethodName$()
@@ -215,12 +208,6 @@
             NonGenericKeepAliveWithoutBoxing(result);
         }
 
-        private void WorkloadActionSingleInvoke()
-        {
-            $LoadArguments$
-            NonGenericKeepAliveWithoutBoxing(workloadDelegate($PassArguments$));
-        }
-
         // we must not simply use DeadCodeEliminationHelper.KeepAliveWithoutBoxing<T> because it's generic method
         // and stack-only types like Span<T> can not be generic type arguments http://adamsitnik.com/Span/#span-must-not-be-a-generic-type-argument
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
@@ -286,14 +273,6 @@
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(ref alias);
         }
 
-        private void WorkloadActionSingleInvoke()
-        {
-            $LoadArguments$
-            ref $WorkloadMethodReturnType$ alias = ref workloadDefaultValueHolder;
-            alias = workloadDelegate($PassArguments$);
-            BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(ref alias);
-        }
-
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization | System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         public ref $WorkloadMethodReturnType$ $DisassemblerEntryMethodName$()
         {
@@ -353,14 +332,6 @@
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxingReadonly(alias);
         }
 
-        private void WorkloadActionSingleInvoke()
-        {
-            $LoadArguments$
-            ref $WorkloadMethodReturnType$ alias = ref workloadDefaultValueHolder;
-            alias = workloadDelegate($PassArguments$);
-            BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxingReadonly(alias);
-        }
-
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization | System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         public ref readonly $WorkloadMethodReturnType$ $DisassemblerEntryMethodName$()
         {
@@ -410,12 +381,6 @@
             }
         }
 
-        private void WorkloadActionSingleInvoke()
-        {
-            $LoadArguments$
-            workloadDelegate($PassArguments$);
-        }
-
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization | System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         public void $DisassemblerEntryMethodName$()
         {

src/BenchmarkDotNet/Toolchains/InProcess.Emit.Implementation/Runnable/RunnableConstants.cs

@@ -35,7 +35,6 @@ public class RunnableConstants
         public const string OverheadActionNoUnrollMethodName = "OverheadActionNoUnroll";
         public const string WorkloadActionUnrollMethodName = "WorkloadActionUnroll";
         public const string WorkloadActionNoUnrollMethodName = "WorkloadActionNoUnroll";
-        public const string WorkloadActionSingleInvokeMethodName = "WorkloadActionSingleInvoke";
         public const string ForDisassemblyDiagnoserMethodName = "__ForDisassemblyDiagnoser__";
         public const string InvokeCountParamName = "invokeCount";
 

src/BenchmarkDotNet/Toolchains/InProcess.Emit.Implementation/Runnable/RunnableReuse.cs

@@ -90,7 +90,6 @@ private static EngineParameters CreateEngineParameters<T>(
                 Host = host,
                 WorkloadActionUnroll = LoopCallbackFromMethod(instance, WorkloadActionUnrollMethodName),
                 WorkloadActionNoUnroll = LoopCallbackFromMethod(instance, WorkloadActionNoUnrollMethodName),
-                WorkloadActionSingleInvoke = CallbackFromMethod(instance, WorkloadActionSingleInvokeMethodName),
                 Dummy1Action = CallbackFromMethod(instance, Dummy1MethodName),
                 Dummy2Action = CallbackFromMethod(instance, Dummy2MethodName),
                 Dummy3Action = CallbackFromMethod(instance, Dummy3MethodName),

src/BenchmarkDotNet/Toolchains/InProcess.NoEmit/InProcessNoEmitRunner.cs

@@ -135,7 +135,6 @@ public static void RunCore(IHost host, BenchmarkCase benchmarkCase)
                             workloadAction.InvokeSingle();
                     },
                     WorkloadActionUnroll = workloadAction.InvokeMultiple,
-                    WorkloadActionSingleInvoke = workloadAction.InvokeSingle,
                     Dummy1Action = dummy1.InvokeSingle,
                     Dummy2Action = dummy2.InvokeSingle,
                     Dummy3Action = dummy3.InvokeSingle,

src/BenchmarkDotNet/Toolchains/InProcess/InProcessRunner.cs

@@ -134,7 +134,6 @@ public static void RunCore(IHost host, BenchmarkCase benchmarkCase, BenchmarkAct
                             workloadAction.InvokeSingle();
                     },
                     WorkloadActionUnroll = workloadAction.InvokeMultiple,
-                    WorkloadActionSingleInvoke = workloadAction.InvokeSingle,
                     Dummy1Action = dummy1.InvokeSingle,
                     Dummy2Action = dummy2.InvokeSingle,
                     Dummy3Action = dummy3.InvokeSingle,