Fixed InProcessEmitTests

Author: timcassell

src/BenchmarkDotNet/Helpers/Reflection.Emit/IlGeneratorStatementExtensions.cs

@@ -194,7 +194,7 @@ public static void EmitLoopEndFromFldTo0(
             ilBuilder.EmitLdloc(counterLocal);
             ilBuilder.Emit(OpCodes.Ldc_I4_0);
             ilBuilder.Emit(OpCodes.Conv_I8);
-            ilBuilder.Emit(OpCodes.Bge_S, loopStartLabel);
+            ilBuilder.Emit(OpCodes.Bge, loopStartLabel);
         }
     }
 }

src/BenchmarkDotNet/Toolchains/InProcess.Emit.Implementation/Emitters/TaskConsumeEmitter.cs

@@ -164,8 +164,8 @@ class Perfolizer.Horology.IClock clock
             var ilBuilder = actionMethodBuilder.GetILGenerator();
 
             // init locals
-            var argLocals = runnableEmitter.EmitDeclareArgLocals(ilBuilder);
             var valueLocal = ilBuilder.DeclareLocal(ConsumableInfo.OverheadMethodReturnType);
+            var argLocals = runnableEmitter.EmitDeclareArgLocals(ilBuilder);
             var indexLocal = ilBuilder.DeclareLocal(typeof(long));
 
             /*
@@ -215,7 +215,7 @@ class Perfolizer.Horology.IClock clock
                     */
                     ilBuilder.Emit(OpCodes.Ldarg_0);
                     ilBuilder.Emit(OpCodes.Ldfld, actionDelegateField);
-                    ilBuilder.Emit(OpCodes.Callvirt, actionInvokeMethod);
+                    ilBuilder.EmitInstanceCallThisValueOnStack(null, actionInvokeMethod, argLocals);
                     ilBuilder.EmitStloc(valueLocal);
                 }
                 ilBuilder.EmitLoopEndFromFldTo0(loopStartLabel, loopHeadLabel, repeatsRemainingField, indexLocal);
@@ -367,8 +367,8 @@ instance void __RunTask () cil managed
             //    [1] int64,
             //    [2] class [System.Private.CoreLib]System.Exception e
             //)
-            var argLocals = runnableEmitter.EmitDeclareArgLocals(ilBuilder);
             var clockspanLocal = ilBuilder.DeclareLocal(typeof(ClockSpan));
+            var argLocals = runnableEmitter.EmitDeclareArgLocals(ilBuilder);
             LocalBuilder maybeValueTaskLocal = actionInvokeMethod.ReturnType.IsValueType
                 ? ilBuilder.DeclareLocal(actionInvokeMethod.ReturnType)
                 : null;
@@ -417,7 +417,7 @@ instance void __RunTask () cil managed
                     ilBuilder.Emit(OpCodes.Ldarg_0);
                     ilBuilder.Emit(OpCodes.Ldflda, currentAwaiterField);
                     ilBuilder.Emit(OpCodes.Call, currentAwaiterField.FieldType.GetProperty(nameof(TaskAwaiter.IsCompleted), BindingFlagsAllInstance).GetGetMethod(true));
-                    ilBuilder.Emit(OpCodes.Brtrue_S, isCompletedLabel);
+                    ilBuilder.Emit(OpCodes.Brtrue, isCompletedLabel);
                     {
                         /*
                             // currentAwaiter.UnsafeOnCompleted(continuation);
@@ -433,7 +433,7 @@ instance void __RunTask () cil managed
                         ilBuilder.Emit(OpCodes.Ldfld, continuationField);
                         ilBuilder.Emit(OpCodes.Call, currentAwaiterField.FieldType.GetMethod(nameof(TaskAwaiter.UnsafeOnCompleted), BindingFlagsAllInstance));
                         // return;
-                        ilBuilder.Emit(OpCodes.Leave_S, returnLabel);
+                        ilBuilder.Emit(OpCodes.Leave, returnLabel);
                     }
                     ilBuilder.MarkLabel(isCompletedLabel);
                     /*
@@ -468,7 +468,7 @@ instance void __RunTask () cil managed
                 ilBuilder.EmitLdloc(exceptionLocal);
                 ilBuilder.Emit(OpCodes.Call, setExceptionMethod);
                 // return;
-                ilBuilder.Emit(OpCodes.Leave_S, returnLabel);
+                ilBuilder.Emit(OpCodes.Leave, returnLabel);
             }
             ilBuilder.EndExceptionBlock();
 
@@ -570,7 +570,7 @@ instance void __Continuation () cil managed
                 ilBuilder.EmitLdloc(exceptionLocal);
                 ilBuilder.Emit(OpCodes.Call, setExceptionMethod);
                 // return;
-                ilBuilder.Emit(OpCodes.Leave_S, returnLabel);
+                ilBuilder.Emit(OpCodes.Leave, returnLabel);
             }
             ilBuilder.EndExceptionBlock();
 

tests/BenchmarkDotNet.IntegrationTests/InProcess.EmitTests/NaiveRunnableEmitDiff.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using BenchmarkDotNet.Loggers;
+using BenchmarkDotNet.Toolchains.InProcess.Emit.Implementation;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Mono.Collections.Generic;
@@ -31,7 +32,9 @@ public class NaiveRunnableEmitDiff
         {
             { OpCodes.Br_S, OpCodes.Br },
             { OpCodes.Blt_S, OpCodes.Blt },
-            { OpCodes.Bne_Un_S, OpCodes.Bne_Un }
+            { OpCodes.Bne_Un_S, OpCodes.Bne_Un },
+            { OpCodes.Bge_S, OpCodes.Bge },
+            { OpCodes.Brtrue_S, OpCodes.Brtrue },
         };
 
         public static void RunDiff(string roslynAssemblyPath, string emittedAssemblyPath, ILogger logger)
@@ -63,7 +66,15 @@ private static bool AreSameTypeIgnoreNested(TypeReference left, TypeReference ri
 
         private static bool AreSameSignature(MethodReference left, MethodReference right)
         {
-            return (left.Name == right.Name || (left.Name.StartsWith("<.ctor>") && right.Name == "__Workload"))
+            var lookup = new HashSet<string>()
+            {
+                RunnableConstants.WorkloadImplementationMethodName,
+                RunnableConstants.GlobalSetupMethodName,
+                RunnableConstants.GlobalCleanupMethodName,
+                RunnableConstants.IterationSetupMethodName,
+                RunnableConstants.IterationCleanupMethodName
+            };
+            return (left.Name == right.Name || (left.Name.StartsWith("<.ctor>") && lookup.Contains(right.Name)))
                 && AreSameTypeIgnoreNested(left.ReturnType, right.ReturnType)
                 && left.Parameters.Count == right.Parameters.Count
                 && left.Parameters
@@ -80,7 +91,9 @@ private static List<Instruction> GetOpInstructions(MethodDefinition method)
             var result = new List<Instruction>(bodyInstructions.Count);
             foreach (var instruction in bodyInstructions)
             {
-                if (compareNops || instruction.OpCode != OpCodes.Nop)
+                // Skip leave instructions since the IlBuilder forces them differently than Roslyn.
+                if (instruction.OpCode != OpCodes.Leave && instruction.OpCode != OpCodes.Leave_S
+                    && (compareNops || instruction.OpCode != OpCodes.Nop))
                     result.Add(instruction);
             }
 
@@ -289,14 +302,17 @@ private static void DiffMembers(TypeDefinition type1, TypeDefinition type2, ILog
             }
 
             var methods2ByName = type2.Methods.ToLookup(f => f.Name);
+            var methods2ByComparison = new HashSet<MethodDefinition>(type2.Methods);
             foreach (var method1 in type1.Methods)
             {
                 logger.Write($"    method {method1.FullName}");
 
                 var method2 = methods2ByName[method1.Name].SingleOrDefault(m => AreSameSignature(method1, m));
                 if (method2 == null)
-                    method2 = type2.Methods.SingleOrDefault(m => AreSameSignature(method1, m));
-                if (method2 == null)
+                    method2 = methods2ByComparison.FirstOrDefault(m => AreSameSignature(method1, m));
+                if (method2 != null)
+                    methods2ByComparison.Remove(method2);
+                else
                     method2 = methods2ByName[method1.Name].SingleOrDefault();
 
                 if (Diff(method1, method2))