Fixed unroll factor in InProcessNoEmit.

timcassell · timcassell · commit 36ba1bba111c · 2022-03-26T22:52:46.000-04:00
Fixed some EmitSameIL tests.
diff --git a/src/BenchmarkDotNet/Templates/BenchmarkType.txt b/src/BenchmarkDotNet/Templates/BenchmarkType.txt
@@ -302,9 +302,8 @@
             {
                 result = overheadDelegate($PassArguments$);@Unroll@
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(result);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> OverheadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)
@@ -316,9 +315,8 @@
             {
                 result = overheadDelegate($PassArguments$);
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(result);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> WorkloadActionUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)
@@ -330,9 +328,8 @@
             {
                 result = workloadDelegate($PassArguments$);@Unroll@
             }
-            var elapsed = startedClock.GetElapsed();
             NonGenericKeepAliveWithoutBoxing(result);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> WorkloadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)
@@ -344,9 +341,8 @@
             {
                 result = workloadDelegate($PassArguments$);
             }
-            var elapsed = startedClock.GetElapsed();
             NonGenericKeepAliveWithoutBoxing(result);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         // we must not simply use DeadCodeEliminationHelper.KeepAliveWithoutBoxing<T> because it's generic method
@@ -377,9 +373,8 @@
             {
                 value = overheadDelegate($PassArguments$);@Unroll@
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(value);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> OverheadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)
@@ -391,9 +386,8 @@
             {
                 value = overheadDelegate($PassArguments$);
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(value);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         private $WorkloadMethodReturnType$ workloadDefaultValueHolder = default($WorkloadMethodReturnType$);
@@ -407,9 +401,8 @@
             {
                 alias = workloadDelegate($PassArguments$);@Unroll@
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(ref alias);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
         
         private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> WorkloadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)
@@ -421,9 +414,8 @@
             {
                 alias = workloadDelegate($PassArguments$);
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(ref alias);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization | System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
@@ -448,9 +440,8 @@
             {
                 value = overheadDelegate($PassArguments$);@Unroll@
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(value);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> OverheadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)
@@ -462,9 +453,8 @@
             {
                 value = overheadDelegate($PassArguments$);
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(value);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         private $WorkloadMethodReturnType$ workloadDefaultValueHolder = default($WorkloadMethodReturnType$);
@@ -478,9 +468,8 @@
             {
                 alias = workloadDelegate($PassArguments$);@Unroll@
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxingReadonly(alias);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
         
         private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> WorkloadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)
@@ -492,9 +481,8 @@
             {
                 alias = workloadDelegate($PassArguments$);
             }
-            var elapsed = startedClock.GetElapsed();
             BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxingReadonly(alias);
-            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);
+            return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());
         }
 
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization | System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
diff --git a/src/BenchmarkDotNet/Toolchains/InProcess.NoEmit/InProcessNoEmitRunner.cs b/src/BenchmarkDotNet/Toolchains/InProcess.NoEmit/InProcessNoEmitRunner.cs
@@ -104,9 +104,9 @@ private static class Runnable
         {
             public static void RunCore(IHost host, BenchmarkCase benchmarkCase)
             {
+                int unrollFactor = BenchmarkActionFactory.GetUnrollFactor(benchmarkCase);
                 var target = benchmarkCase.Descriptor;
                 var job = benchmarkCase.Job; // TODO: filter job (same as SourceCodePresenter does)?
-                int unrollFactor = BenchmarkActionFactory.GetUnrollFactor(benchmarkCase);
 
                 // DONTTOUCH: these should be allocated together
                 var instance = Activator.CreateInstance(benchmarkCase.Descriptor.Type);
diff --git a/src/BenchmarkDotNet/Toolchains/InProcess/BenchmarkActionFactory_Implementations.cs b/src/BenchmarkDotNet/Toolchains/InProcess/BenchmarkActionFactory_Implementations.cs
@@ -113,7 +113,6 @@ private ValueTask<ClockSpan> InvokeUnrollHardcoded(long repeatCount, IClock cloc
                 var startedClock = clock.Start();
                 for (long i = 0; i < repeatCount; i++)
                     result = unrolledCallback();
-                unrolledCallback();
                 return new ValueTask<ClockSpan>(startedClock.GetElapsed());
             }
 
diff --git a/src/BenchmarkDotNet/Toolchains/InProcess/InProcessRunner.cs b/src/BenchmarkDotNet/Toolchains/InProcess/InProcessRunner.cs
@@ -101,9 +101,9 @@ private static class Runnable
         {
             public static void RunCore(IHost host, BenchmarkCase benchmarkCase, BenchmarkActionCodegen codegenMode)
             {
+                int unrollFactor = BenchmarkActionFactory.GetUnrollFactor(benchmarkCase);
                 var target = benchmarkCase.Descriptor;
                 var job = benchmarkCase.Job; // TODO: filter job (same as SourceCodePresenter does)?
-                int unrollFactor = BenchmarkActionFactory.GetUnrollFactor(benchmarkCase);
 
                 // DONTTOUCH: these should be allocated together
                 var instance = Activator.CreateInstance(benchmarkCase.Descriptor.Type);

Original file line number	Diff line number	Diff line change
`@@ -302,9 +302,8 @@`
`302`	`302`	`{`
`303`	`303`	`result = overheadDelegate($PassArguments$);@Unroll@`
`304`	`304`	`}`
`305`		`- var elapsed = startedClock.GetElapsed();`
`306`	`305`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(result);`
`307`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`306`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`308`	`307`	`}`
`309`	`308`
`310`	`309`	`private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> OverheadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)`
`@@ -316,9 +315,8 @@`
`316`	`315`	`{`
`317`	`316`	`result = overheadDelegate($PassArguments$);`
`318`	`317`	`}`
`319`		`- var elapsed = startedClock.GetElapsed();`
`320`	`318`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(result);`
`321`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`319`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`322`	`320`	`}`
`323`	`321`
`324`	`322`	`private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> WorkloadActionUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)`
`@@ -330,9 +328,8 @@`
`330`	`328`	`{`
`331`	`329`	`result = workloadDelegate($PassArguments$);@Unroll@`
`332`	`330`	`}`
`333`		`- var elapsed = startedClock.GetElapsed();`
`334`	`331`	`NonGenericKeepAliveWithoutBoxing(result);`
`335`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`332`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`336`	`333`	`}`
`337`	`334`
`338`	`335`	`private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> WorkloadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)`
`@@ -344,9 +341,8 @@`
`344`	`341`	`{`
`345`	`342`	`result = workloadDelegate($PassArguments$);`
`346`	`343`	`}`
`347`		`- var elapsed = startedClock.GetElapsed();`
`348`	`344`	`NonGenericKeepAliveWithoutBoxing(result);`
`349`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`345`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`350`	`346`	`}`
`351`	`347`
`352`	`348`	`// we must not simply use DeadCodeEliminationHelper.KeepAliveWithoutBoxing<T> because it's generic method`
`@@ -377,9 +373,8 @@`
`377`	`373`	`{`
`378`	`374`	`value = overheadDelegate($PassArguments$);@Unroll@`
`379`	`375`	`}`
`380`		`- var elapsed = startedClock.GetElapsed();`
`381`	`376`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(value);`
`382`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`377`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`383`	`378`	`}`
`384`	`379`
`385`	`380`	`private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> OverheadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)`
`@@ -391,9 +386,8 @@`
`391`	`386`	`{`
`392`	`387`	`value = overheadDelegate($PassArguments$);`
`393`	`388`	`}`
`394`		`- var elapsed = startedClock.GetElapsed();`
`395`	`389`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(value);`
`396`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`390`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`397`	`391`	`}`
`398`	`392`
`399`	`393`	`private $WorkloadMethodReturnType$ workloadDefaultValueHolder = default($WorkloadMethodReturnType$);`
`@@ -407,9 +401,8 @@`
`407`	`401`	`{`
`408`	`402`	`alias = workloadDelegate($PassArguments$);@Unroll@`
`409`	`403`	`}`
`410`		`- var elapsed = startedClock.GetElapsed();`
`411`	`404`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(ref alias);`
`412`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`405`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`413`	`406`	`}`
`414`	`407`
`415`	`408`	`private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> WorkloadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)`
`@@ -421,9 +414,8 @@`
`421`	`414`	`{`
`422`	`415`	`alias = workloadDelegate($PassArguments$);`
`423`	`416`	`}`
`424`		`- var elapsed = startedClock.GetElapsed();`
`425`	`417`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(ref alias);`
`426`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`418`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`427`	`419`	`}`
`428`	`420`
`429`	`421`	`[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization \| System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]`
`@@ -448,9 +440,8 @@`
`448`	`440`	`{`
`449`	`441`	`value = overheadDelegate($PassArguments$);@Unroll@`
`450`	`442`	`}`
`451`		`- var elapsed = startedClock.GetElapsed();`
`452`	`443`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(value);`
`453`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`444`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`454`	`445`	`}`
`455`	`446`
`456`	`447`	`private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> OverheadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)`
`@@ -462,9 +453,8 @@`
`462`	`453`	`{`
`463`	`454`	`value = overheadDelegate($PassArguments$);`
`464`	`455`	`}`
`465`		`- var elapsed = startedClock.GetElapsed();`
`466`	`456`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxing(value);`
`467`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`457`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`468`	`458`	`}`
`469`	`459`
`470`	`460`	`private $WorkloadMethodReturnType$ workloadDefaultValueHolder = default($WorkloadMethodReturnType$);`
`@@ -478,9 +468,8 @@`
`478`	`468`	`{`
`479`	`469`	`alias = workloadDelegate($PassArguments$);@Unroll@`
`480`	`470`	`}`
`481`		`- var elapsed = startedClock.GetElapsed();`
`482`	`471`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxingReadonly(alias);`
`483`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`472`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`484`	`473`	`}`
`485`	`474`
`486`	`475`	`private System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan> WorkloadActionNoUnroll(System.Int64 invokeCount, Perfolizer.Horology.IClock clock)`
`@@ -492,9 +481,8 @@`
`492`	`481`	`{`
`493`	`482`	`alias = workloadDelegate($PassArguments$);`
`494`	`483`	`}`
`495`		`- var elapsed = startedClock.GetElapsed();`
`496`	`484`	`BenchmarkDotNet.Engines.DeadCodeEliminationHelper.KeepAliveWithoutBoxingReadonly(alias);`
`497`		`- return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(elapsed);`
	`485`	`+ return new System.Threading.Tasks.ValueTask<Perfolizer.Horology.ClockSpan>(startedClock.GetElapsed());`
`498`	`486`	`}`
`499`	`487`
`500`	`488`	`[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization \| System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,9 @@ private static class Runnable`
`104`	`104`	`{`
`105`	`105`	`public static void RunCore(IHost host, BenchmarkCase benchmarkCase)`
`106`	`106`	`{`
	`107`	`+ int unrollFactor = BenchmarkActionFactory.GetUnrollFactor(benchmarkCase);`
`107`	`108`	`var target = benchmarkCase.Descriptor;`
`108`	`109`	`var job = benchmarkCase.Job; // TODO: filter job (same as SourceCodePresenter does)?`
`109`		`- int unrollFactor = BenchmarkActionFactory.GetUnrollFactor(benchmarkCase);`
`110`	`110`
`111`	`111`	`// DONTTOUCH: these should be allocated together`
`112`	`112`	`var instance = Activator.CreateInstance(benchmarkCase.Descriptor.Type);`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ private ValueTask<ClockSpan> InvokeUnrollHardcoded(long repeatCount, IClock cloc`
`113`	`113`	`var startedClock = clock.Start();`
`114`	`114`	`for (long i = 0; i < repeatCount; i++)`
`115`	`115`	`result = unrolledCallback();`
`116`		`- unrolledCallback();`
`117`	`116`	`return new ValueTask<ClockSpan>(startedClock.GetElapsed());`
`118`	`117`	`}`
`119`	`118`
Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,9 @@ private static class Runnable`
`101`	`101`	`{`
`102`	`102`	`public static void RunCore(IHost host, BenchmarkCase benchmarkCase, BenchmarkActionCodegen codegenMode)`
`103`	`103`	`{`
	`104`	`+ int unrollFactor = BenchmarkActionFactory.GetUnrollFactor(benchmarkCase);`
`104`	`105`	`var target = benchmarkCase.Descriptor;`
`105`	`106`	`var job = benchmarkCase.Job; // TODO: filter job (same as SourceCodePresenter does)?`
`106`		`- int unrollFactor = BenchmarkActionFactory.GetUnrollFactor(benchmarkCase);`
`107`	`107`
`108`	`108`	`// DONTTOUCH: these should be allocated together`
`109`	`109`	`var instance = Activator.CreateInstance(benchmarkCase.Descriptor.Type);`