From: Amy Date: Tue, 7 Aug 2018 22:06:01 +0000 (-0700) Subject: R2RDump - Tests for Debug, avoid copying expected xml files (#19321) X-Git-Tag: accepted/tizen/unified/20190422.045933~1501 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25452220f8486f9ecb56b7ffa84a37d80136b750;p=platform%2Fupstream%2Fcoreclr.git R2RDump - Tests for Debug, avoid copying expected xml files (#19321) * Add Debug expected xml, pass xml path to R2RDumpTest * Pass expected xml path as argument * Remove copy expected xml, clean up --- diff --git a/tests/src/readytorun/r2rdump/BasicTests.cs b/tests/src/readytorun/r2rdump/BasicTests.cs index 2acdeee..628fe3f 100644 --- a/tests/src/readytorun/r2rdump/BasicTests.cs +++ b/tests/src/readytorun/r2rdump/BasicTests.cs @@ -12,10 +12,10 @@ namespace R2RDumpTest { Console.WriteLine("Starting the test"); - TestHelpers.RunTest("HelloWorld"); - TestHelpers.RunTest("MultipleRuntimeFunctions"); - TestHelpers.RunTest("GenericFunctions"); - TestHelpers.RunTest("GcInfoTransitions"); + TestHelpers.RunTest(args[0], "HelloWorld"); + TestHelpers.RunTest(args[0], "MultipleRuntimeFunctions"); + TestHelpers.RunTest(args[0], "GenericFunctions"); + TestHelpers.RunTest(args[0], "GcInfoTransitions"); Console.WriteLine("PASSED"); return 100; diff --git a/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/tests/src/readytorun/r2rdump/R2RDumpTest.csproj index 6a2f6bc..3be5ee5 100644 --- a/tests/src/readytorun/r2rdump/R2RDumpTest.csproj +++ b/tests/src/readytorun/r2rdump/R2RDumpTest.csproj @@ -15,6 +15,8 @@ ../../../../../../ $(BashCoreClrDir)bin/Product/$(BuildOS).$(BuildArch).$(BuildType)/netcoreapp2.0/R2RDump.dll $(BashCoreClrDir)Tools/dotnetcli/dotnet + $(CoreClrDir)tests\src\readytorun\r2rdump\files\$(BuildOS).$(BuildArch).$(BuildType)\ + true @@ -36,7 +38,6 @@ testXmlNodes = ReadXmlNodes($"{name}-test.xml", true).Cast().ToList(); - List expectedXmlNodes = ReadXmlNodes($"{name}.xml", true).Cast().ToList(); + List expectedXmlNodes = ReadXmlNodes($"{expectedXmlPath}{name}.xml", true).Cast().ToList(); bool identical = XmlDiff(testXmlNodes, expectedXmlNodes); Assert.True(identical); } diff --git a/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/GcInfoTransitions.xml b/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/GcInfoTransitions.xml new file mode 100644 index 0000000..73a79df --- /dev/null +++ b/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/GcInfoTransitions.xml @@ -0,0 +1,677 @@ + + + + GcInfoTransitions.ni.dll + true + Amd64 + 6891812028416 + +
+ + RTR + 5395538 + 2 + 2 + 3 + +
+ + 9 +
+ + + CoreCLR 4.5.30319.0 __BUILDMACHINE__ + +
+
+ + + + + CORCOMPILE_IMPORT_FLAGS_EAGER + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
0
+ + + + + 0 +
0
+ + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_STUB_DISPATCH + + + 0 +
6891812037717
+ + + 8 +
6891812037717
+ + + 16 +
6891812037717
+ + + + 2 + 0 + RT_Object + 0 + 0 + -1 + -1 + -1 + -1 + 4294967295 + 4294967295 + -1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + 0 + + + 22 + 3644 + + + + 0 +
6891812037717
+ + + 8 +
6891812037717
+ + + 16 +
6891812037717
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + GcInfoTransitions.GcInfoTransitions + .<Module> + +
+
+ + +
+
+ + +
+ + + + + abc + GcInfoTransitions.GcInfoTransitions.abc(String) + false + GcInfoTransitions.GcInfoTransitions + 100663297 + 1 + 0 + + + + 2 + 12 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 0 + 0 + 1 + + + + 8 + 10 + + + + 0 + 0 + 1 + 1 + + + -1 + + 16 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 73 + 3512 + + + + + 1 + + 12 + 0 + + + + 12 + 1 + 3 + 1 + 1 + EAX + 0 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 609157120 + + + + + + + + Main + GcInfoTransitions.GcInfoTransitions.Main(String[]) + false + GcInfoTransitions.GcInfoTransitions + 100663298 + 2 + 1 + + + + 2 + 317 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 32 + 0 + 1 + + + + 35 + 309 + + + + 2 + 0 + 9 + 11 + + + 0 + GC_SLOT_BASE + + + 1 + GC_SLOT_BASE + + + -1 + + 432 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 440 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 448 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 456 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 464 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 472 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 480 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 488 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 528 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 587 + 3540 + + + 1 + true + 0 + + + 1 + false + 0 + + + 1 + true + 0 + + + 1 + false + 0 + + + 1 + true + 0 + + + 1 + false + 0 + + + 1 + true + 0 + + + 0 + false + 1 + + + 1 + true + 1 + + + 1 + false + 1 + + + 1 + true + 1 + + + 1 + false + 1 + + + 1 + true + 1 + + + 1 + false + 1 + + + 1 + true + 2 + + + 1 + false + 2 + + + 1 + true + 2 + + + 1 + false + 2 + + + 1 + true + 2 + + + 0 + false + 2 + + + 1 + true + 2 + + + 0 + true + 2 + + + 1 + true + 3 + + + 1 + false + 3 + + + 1 + true + 3 + + + 1 + false + 3 + + + 1 + true + 3 + + + 1 + false + 3 + + + 1 + true + 3 + + + 1 + false + 4 + + + 1 + true + 4 + + + 1 + false + 4 + + + + + 2 + + 317 + 0 + + + + 16 + 1 + 3 + 7 + 4 + EAX + 0 + + + 7 + UWOP_ALLOC_SMALL + 11 + 7 + 11 + 45575 + + + 3 + UWOP_PUSH_NONVOL + 6 + 3 + 6 + 24579 + + + 2 + UWOP_PUSH_NONVOL + 7 + 2 + 7 + 28674 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9295 + + + + + + + + .ctor + GcInfoTransitions.GcInfoTransitions..ctor() + false + GcInfoTransitions.GcInfoTransitions + 100663299 + 3 + 2 + + + + 2 + 32 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 32 + 0 + 1 + + + + 14 + 26 + + + + 1 + 0 + 1 + 2 + + + 1 + GC_SLOT_BASE + + + -1 + + 16 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 106 + 3628 + + + 0 + true + 0 + + + 0 + false + 0 + + + + + 3 + + 32 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 3 + 5 + 3 + 12805 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9295 + + + + + + + \ No newline at end of file diff --git a/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/GenericFunctions.xml b/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/GenericFunctions.xml new file mode 100644 index 0000000..bdf885a --- /dev/null +++ b/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/GenericFunctions.xml @@ -0,0 +1,1049 @@ + + + + GenericFunctions.ni.dll + true + Amd64 + 6891812028416 + +
+ + RTR + 5395538 + 2 + 2 + 3 + +
+ + 9 +
+ + + CoreCLR 4.5.30319.0 __BUILDMACHINE__ + +
+
+ + + + + CORCOMPILE_IMPORT_FLAGS_EAGER + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
0
+ + + + + 0 +
0
+ + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_STUB_DISPATCH + + + 0 +
6891812037799
+ + + 8 +
6891812037799
+ + + 16 +
6891812037799
+ + + 24 +
6891812037799
+ + + 32 +
6891812037799
+ + + + 2 + 0 + RT_Object + 0 + 0 + -1 + -1 + -1 + -1 + 4294967295 + 4294967295 + -1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + 0 + + + 22 + 4164 + + + + 0 +
6891812037799
+ + + 8 +
6891812037799
+ + + 16 +
6891812037799
+ + + 24 +
6891812037799
+ + + 32 +
6891812037799
+ + + + + CORCOMPILE_IMPORT_FLAGS_UNKNOWN + CORCOMPILE_IMPORT_TYPE_STRING_HANDLE + + + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
6891812037783
+ + + + + 0 +
6891812037783
+ + + + + CORCOMPILE_IMPORT_FLAGS_UNKNOWN + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + GenericFunctions.GenericFunctions + .<Module> + GenericFunctions.UserDefinedStruct + GenericFunctions.UserDefinedClass + +
+
+ + +
+
+ + +
+ + + + + .ctor + GenericFunctions.UserDefinedStruct..ctor(Int32) + false + GenericFunctions.UserDefinedStruct + 100663297 + 1 + 0 + + + + 2 + 24 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 0 + 0 + 1 + + + + 11 + 22 + + + + 1 + 0 + 1 + 2 + + + 0 + GC_SLOT_INTERIOR + + + -1 + + 16 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 99 + 3964 + + + 0 + true + 0 + + + + + 1 + + 24 + 0 + + + + 12 + 1 + 3 + 1 + 1 + EAX + 0 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 613482496 + + + + + + + + .ctor + GenericFunctions.UserDefinedClass..ctor(Int32) + false + GenericFunctions.UserDefinedClass + 100663298 + 2 + 1 + + + + 2 + 46 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 32 + 0 + 1 + + + + 17 + 40 + + + + 2 + 0 + 1 + 3 + + + 0 + GC_SLOT_BASE + + + 1 + GC_SLOT_BASE + + + -1 + + 16 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 116 + 3992 + + + 1 + true + 0 + + + 1 + false + 0 + + + 0 + true + 0 + + + + + 2 + + 46 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 3 + 5 + 3 + 12805 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9361 + + + + + + + + Main + GenericFunctions.GenericFunctions.Main(String[]) + false + GenericFunctions.GenericFunctions + 100663300 + 4 + 3 + + + 2 + 0 + + + 4 + 0 + + + 4 + 1 + + + 4 + 2 + + + + + + 2 + 162 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 32 + 0 + 1 + + + + 35 + 154 + + + + 4 + 0 + 4 + 8 + + + 1 + GC_SLOT_INTERIOR + + + 0 + GC_SLOT_BASE + + + 1 + GC_SLOT_BASE + + + 8 + GC_SLOT_BASE + + + -1 + + 448 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 464 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 488 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 528 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 264 + 4052 + + + 2 + true + 0 + + + 2 + false + 0 + + + 0 + false + 0 + + + 3 + true + 0 + + + 3 + false + 0 + + + 1 + true + 1 + + + 2 + true + 1 + + + 2 + false + 1 + + + 2 + true + 1 + + + 2 + false + 1 + + + 3 + true + 1 + + + 3 + false + 1 + + + + + 4 + + 162 + 0 + + + + 16 + 1 + 3 + 7 + 4 + EAX + 0 + + + 7 + UWOP_ALLOC_SMALL + 11 + 7 + 11 + 45575 + + + 3 + UWOP_PUSH_NONVOL + 6 + 3 + 6 + 24579 + + + 2 + UWOP_PUSH_NONVOL + 7 + 2 + 7 + 28674 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9361 + + + + + + + + .ctor + GenericFunctions.GenericFunctions..ctor() + false + GenericFunctions.GenericFunctions + 100663301 + 5 + 4 + + + + 2 + 32 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 32 + 0 + 1 + + + + 14 + 26 + + + + 1 + 0 + 1 + 2 + + + 1 + GC_SLOT_BASE + + + -1 + + 16 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 106 + 4100 + + + 0 + true + 0 + + + 0 + false + 0 + + + + + 5 + + 32 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 3 + 5 + 3 + 12805 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9361 + + + + + + + + GenericFunction + GenericFunctions.GenericFunctions.GenericFunction<__Canon, Int32>(Int32, __Canon) + true + GenericFunctions.GenericFunctions + 100663299 + 3 + 5 + + + + 2 + 45 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 0 + 0 + 1 + + + + 26 + 39 + + + + 0 + 0 + 1 + 1 + + + -1 + + 32 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 73 + 4128 + + + + + 3 + + 45 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 1 + 5 + 1 + 4613 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9361 + + + + + + + + GenericFunction + GenericFunctions.GenericFunctions.GenericFunction<__Canon, __Canon>(__Canon, __Canon) + true + GenericFunctions.GenericFunctions + 100663299 + 3 + 2 + + + + 2 + 50 + RT_Object + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 0 + 0 + 1 + + + + 28 + 44 + + + + 1 + 0 + 3 + 4 + + + 0 + GC_SLOT_BASE + + + -1 + + 504 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 536 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + -1 + + 544 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 122 + 4020 + + + 0 + true + 0 + + + 0 + false + 0 + + + + + 3 + + 50 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 1 + 5 + 1 + 4613 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9361 + + + + + + + + GenericFunction + GenericFunctions.GenericFunctions.GenericFunction<__Canon, UserDefinedStruct>(UserDefinedStruct, __Canon) + true + GenericFunctions.GenericFunctions + 100663299 + 3 + 6 + + + + 2 + 47 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 0 + 0 + 1 + + + + 28 + 41 + + + + 0 + 0 + 1 + 1 + + + -1 + + 32 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 73 + 4152 + + + + + 3 + + 47 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 1 + 5 + 1 + 4613 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9361 + + + + + + + \ No newline at end of file diff --git a/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/HelloWorld.xml b/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/HelloWorld.xml new file mode 100644 index 0000000..7848302 --- /dev/null +++ b/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/HelloWorld.xml @@ -0,0 +1,362 @@ + + + + HelloWorld.ni.dll + true + Amd64 + 6891812028416 + +
+ + RTR + 5395538 + 2 + 2 + 3 + +
+ + 9 +
+ + + CoreCLR 4.5.30319.0 __BUILDMACHINE__ + +
+
+ + + + + CORCOMPILE_IMPORT_FLAGS_EAGER + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
0
+ + + + + 0 +
0
+ + + + + CORCOMPILE_IMPORT_FLAGS_UNKNOWN + CORCOMPILE_IMPORT_TYPE_STRING_HANDLE + + + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_STUB_DISPATCH + + + 0 +
6891812037705
+ + + 8 +
6891812037705
+ + + + 2 + 0 + RT_Object + 0 + 0 + -1 + -1 + -1 + -1 + 4294967295 + 4294967295 + -1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + 0 + + + 22 + 3140 + + + + 0 +
6891812037705
+ + + 8 +
6891812037705
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + HelloWorld.HelloWorld + .<Module> + +
+
+ + +
+
+ + +
+ + + + + Main + HelloWorld.HelloWorld.Main(String[]) + false + HelloWorld.HelloWorld + 100663297 + 1 + 0 + + + 1 + 0 + + + + + + 2 + 39 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 32 + 0 + 1 + + + + 14 + 33 + + + + 1 + 0 + 1 + 2 + + + 1 + GC_SLOT_BASE + + + -1 + + 16 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 106 + 3096 + + + 0 + true + 0 + + + 0 + false + 0 + + + + + 1 + + 39 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 3 + 5 + 3 + 12805 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9283 + + + + + + + + .ctor + HelloWorld.HelloWorld..ctor() + false + HelloWorld.HelloWorld + 100663298 + 2 + 1 + + + + 2 + 32 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 32 + 0 + 1 + + + + 14 + 26 + + + + 1 + 0 + 1 + 2 + + + 1 + GC_SLOT_BASE + + + -1 + + 16 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 106 + 3124 + + + 0 + true + 0 + + + 0 + false + 0 + + + + + 2 + + 32 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 3 + 5 + 3 + 12805 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9283 + + + + + + + \ No newline at end of file diff --git a/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/MultipleRuntimeFunctions.xml b/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/MultipleRuntimeFunctions.xml new file mode 100644 index 0000000..8cb0864 --- /dev/null +++ b/tests/src/readytorun/r2rdump/files/Windows_NT.x64.Debug/MultipleRuntimeFunctions.xml @@ -0,0 +1,469 @@ + + + + MultipleRuntimeFunctions.ni.dll + true + Amd64 + 6891812028416 + +
+ + RTR + 5395538 + 2 + 2 + 3 + +
+ + 10 +
+ + + CoreCLR 4.5.30319.0 __BUILDMACHINE__ + +
+
+ + + + + CORCOMPILE_IMPORT_FLAGS_EAGER + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
0
+ + + + + 0 +
0
+ + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_STUB_DISPATCH + + + 0 +
6891812037761
+ + + 8 +
6891812037761
+ + + + 2 + 0 + RT_Object + 0 + 0 + -1 + -1 + -1 + -1 + 4294967295 + 4294967295 + -1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + 0 + + + 22 + 3316 + + + + 0 +
6891812037761
+ + + 8 +
6891812037761
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + MultipleRuntimeFunctions.MultipleRuntimeFunctions + .<Module> + +
+
+ + +
+
+ + +
+ + + + + MethodWithMultipleRuntimeFunctions + MultipleRuntimeFunctions.MultipleRuntimeFunctions.MethodWithMultipleRuntimeFunctions() + false + MultipleRuntimeFunctions.MultipleRuntimeFunctions + 100663297 + 1 + 0 + + + + 2 + 61 + RT_Scalar + 0 + 0 + -1 + -1 + 0 + -1 + 5 + 4294967295 + -1 + 0 + 0 + 3 + + + + 14 + 28 + + + 29 + 30 + + + 52 + 55 + + + + 0 + 0 + 0 + 0 + + + 94 + 3240 + + + + + 1 + + 36 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 1 + 5 + 1 + 4613 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9339 + + + + + 1 + + 25 + 36 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 1 + 5 + 1 + 4613 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9339 + + + + + + + + Main + MultipleRuntimeFunctions.MultipleRuntimeFunctions.Main(String[]) + false + MultipleRuntimeFunctions.MultipleRuntimeFunctions + 100663298 + 2 + 2 + + + + 2 + 29 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 32 + 0 + 1 + + + + 14 + 23 + + + + 0 + 0 + 1 + 1 + + + -1 + + 16 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 73 + 3276 + + + + + 2 + + 29 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 3 + 5 + 3 + 12805 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9339 + + + + + + + + .ctor + MultipleRuntimeFunctions.MultipleRuntimeFunctions..ctor() + false + MultipleRuntimeFunctions.MultipleRuntimeFunctions + 100663299 + 3 + 3 + + + + 2 + 32 + RT_Scalar + 0 + 0 + -1 + -1 + -1 + -1 + 5 + 4294967295 + -1 + 32 + 0 + 1 + + + + 14 + 26 + + + + 1 + 0 + 1 + 2 + + + 1 + GC_SLOT_BASE + + + -1 + + 16 + GC_FRAMEREG_REL + + GC_SLOT_UNTRACKED + + + + 106 + 3300 + + + 0 + true + 0 + + + 0 + false + 0 + + + + + 3 + + 32 + 0 + + + + 12 + 1 + 3 + 5 + 2 + EAX + 0 + + + 5 + UWOP_ALLOC_SMALL + 3 + 5 + 3 + 12805 + + + 1 + UWOP_PUSH_NONVOL + 5 + 1 + 5 + 20481 + + + 9339 + + + + + + + \ No newline at end of file diff --git a/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/GcInfoTransitions.xml b/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/GcInfoTransitions.xml new file mode 100644 index 0000000..b9b45e1 --- /dev/null +++ b/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/GcInfoTransitions.xml @@ -0,0 +1,219 @@ + + + + GcInfoTransitions.ni.dll + true + I386 + 268500992 + +
+ + RTR + 5395538 + 2 + 2 + 3 + +
+ + 9 +
+ + + CoreCLR 4.5.30319.0 __BUILDMACHINE__ + +
+
+ + + + + CORCOMPILE_IMPORT_FLAGS_EAGER + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
0
+ + + + + 0 +
0
+ + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_STUB_DISPATCH + + + 0 +
1153242871508313160
+ + + 8 +
268510280
+ + + 16 +
0
+ + + + 2 + 0 + RT_Object + 0 + 0 + -1 + -1 + -1 + -1 + 4294967295 + 4294967295 + -1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + 0 + + + 22 + 3404 + + + + 0 +
1153242871508313160
+ + + 8 +
268510280
+ + + 16 +
0
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + GcInfoTransitions.GcInfoTransitions + .<Module> + +
+
+ + +
+
+ + +
+ + + + + abc + GcInfoTransitions.GcInfoTransitions.abc(String) + false + GcInfoTransitions.GcInfoTransitions + 100663297 + 1 + 0 + + + + 1 + + 13 + 0 + + + + 4 + 13 + + + + + + + + Main + GcInfoTransitions.GcInfoTransitions.Main(String[]) + false + GcInfoTransitions.GcInfoTransitions + 100663298 + 2 + 1 + + + + 2 + + 260 + 0 + + + + 4 + 260 + + + + + + + + .ctor + GcInfoTransitions.GcInfoTransitions..ctor() + false + GcInfoTransitions.GcInfoTransitions + 100663299 + 3 + 2 + + + + 3 + + 22 + 0 + + + + 4 + 22 + + + + + + + \ No newline at end of file diff --git a/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/GenericFunctions.xml b/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/GenericFunctions.xml new file mode 100644 index 0000000..55c8e51 --- /dev/null +++ b/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/GenericFunctions.xml @@ -0,0 +1,389 @@ + + + + GenericFunctions.ni.dll + true + I386 + 268500992 + +
+ + RTR + 5395538 + 2 + 2 + 3 + +
+ + 9 +
+ + + CoreCLR 4.5.30319.0 __BUILDMACHINE__ + +
+
+ + + + + CORCOMPILE_IMPORT_FLAGS_EAGER + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
0
+ + + + + 0 +
0
+ + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_STUB_DISPATCH + + + 0 +
1153243223695631514
+ + + 8 +
1153243223695631514
+ + + 16 +
268510362
+ + + 24 +
0
+ + + 32 +
0
+ + + + 2 + 0 + RT_Object + 0 + 0 + -1 + -1 + -1 + -1 + 4294967295 + 4294967295 + -1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + 0 + + + 22 + 3808 + + + + 0 +
1153243223695631514
+ + + 8 +
1153243223695631514
+ + + 16 +
268510362
+ + + 24 +
0
+ + + 32 +
0
+ + + + + CORCOMPILE_IMPORT_FLAGS_UNKNOWN + CORCOMPILE_IMPORT_TYPE_STRING_HANDLE + + + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
1153243223695631498
+ + + + + 0 +
1153243223695631498
+ + + + + CORCOMPILE_IMPORT_FLAGS_UNKNOWN + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + GenericFunctions.GenericFunctions + .<Module> + GenericFunctions.UserDefinedStruct + GenericFunctions.UserDefinedClass + +
+
+ + +
+
+ + +
+ + + + + .ctor + GenericFunctions.UserDefinedStruct..ctor(Int32) + false + GenericFunctions.UserDefinedStruct + 100663297 + 1 + 0 + + + + 1 + + 26 + 0 + + + + 4 + 26 + + + + + + + + .ctor + GenericFunctions.UserDefinedClass..ctor(Int32) + false + GenericFunctions.UserDefinedClass + 100663298 + 2 + 1 + + + + 2 + + 37 + 0 + + + + 4 + 37 + + + + + + + + Main + GenericFunctions.GenericFunctions.Main(String[]) + false + GenericFunctions.GenericFunctions + 100663300 + 4 + 3 + + + 2 + 0 + + + 4 + 0 + + + 4 + 1 + + + 4 + 2 + + + + + + 4 + + 143 + 0 + + + + 4 + 143 + + + + + + + + .ctor + GenericFunctions.GenericFunctions..ctor() + false + GenericFunctions.GenericFunctions + 100663301 + 5 + 4 + + + + 5 + + 22 + 0 + + + + 4 + 22 + + + + + + + + GenericFunction + GenericFunctions.GenericFunctions.GenericFunction<__Canon, Int32>(Int32, __Canon) + true + GenericFunctions.GenericFunctions + 100663299 + 3 + 5 + + + + 3 + + 36 + 0 + + + + 4 + 36 + + + + + + + + GenericFunction + GenericFunctions.GenericFunctions.GenericFunction<__Canon, __Canon>(__Canon, __Canon) + true + GenericFunctions.GenericFunctions + 100663299 + 3 + 2 + + + + 3 + + 36 + 0 + + + + 4 + 36 + + + + + + + + GenericFunction + GenericFunctions.GenericFunctions.GenericFunction<__Canon, UserDefinedStruct>(UserDefinedStruct, __Canon) + true + GenericFunctions.GenericFunctions + 100663299 + 3 + 6 + + + + 3 + + 36 + 0 + + + + 4 + 36 + + + + + + + \ No newline at end of file diff --git a/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/HelloWorld.xml b/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/HelloWorld.xml new file mode 100644 index 0000000..1b86982 --- /dev/null +++ b/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/HelloWorld.xml @@ -0,0 +1,198 @@ + + + + HelloWorld.ni.dll + true + I386 + 268500992 + +
+ + RTR + 5395538 + 2 + 2 + 3 + +
+ + 9 +
+ + + CoreCLR 4.5.30319.0 __BUILDMACHINE__ + +
+
+ + + + + CORCOMPILE_IMPORT_FLAGS_EAGER + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
0
+ + + + + 0 +
0
+ + + + + CORCOMPILE_IMPORT_FLAGS_UNKNOWN + CORCOMPILE_IMPORT_TYPE_STRING_HANDLE + + + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_STUB_DISPATCH + + + 0 +
1153242819968705596
+ + + 8 +
0
+ + + + 2 + 0 + RT_Object + 0 + 0 + -1 + -1 + -1 + -1 + 4294967295 + 4294967295 + -1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + 0 + + + 22 + 3036 + + + + 0 +
1153242819968705596
+ + + 8 +
0
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + HelloWorld.HelloWorld + .<Module> + +
+
+ + +
+
+ + +
+ + + + + Main + HelloWorld.HelloWorld.Main(String[]) + false + HelloWorld.HelloWorld + 100663297 + 1 + 0 + + + 1 + 0 + + + + + + 1 + + 28 + 0 + + + + 4 + 28 + + + + + + + + .ctor + HelloWorld.HelloWorld..ctor() + false + HelloWorld.HelloWorld + 100663298 + 2 + 1 + + + + 2 + + 22 + 0 + + + + 4 + 22 + + + + + + + \ No newline at end of file diff --git a/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/MultipleRuntimeFunctions.xml b/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/MultipleRuntimeFunctions.xml new file mode 100644 index 0000000..a389c42 --- /dev/null +++ b/tests/src/readytorun/r2rdump/files/Windows_NT.x86.Debug/MultipleRuntimeFunctions.xml @@ -0,0 +1,215 @@ + + + + MultipleRuntimeFunctions.ni.dll + true + I386 + 268500992 + +
+ + RTR + 5395538 + 2 + 2 + 3 + +
+ + 10 +
+ + + CoreCLR 4.5.30319.0 __BUILDMACHINE__ + +
+
+ + + + + CORCOMPILE_IMPORT_FLAGS_EAGER + CORCOMPILE_IMPORT_TYPE_UNKNOWN + + + 0 +
0
+ + + + + 0 +
0
+ + + + + CORCOMPILE_IMPORT_FLAGS_PCODE + CORCOMPILE_IMPORT_TYPE_STUB_DISPATCH + + + 0 +
1153243060486874228
+ + + 8 +
0
+ + + + 2 + 0 + RT_Object + 0 + 0 + -1 + -1 + -1 + -1 + 4294967295 + 4294967295 + -1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + 0 + + + 22 + 3164 + + + + 0 +
1153243060486874228
+ + + 8 +
0
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + MultipleRuntimeFunctions.MultipleRuntimeFunctions + .<Module> + +
+
+ + +
+
+ + +
+ + + + + MethodWithMultipleRuntimeFunctions + MultipleRuntimeFunctions.MultipleRuntimeFunctions.MethodWithMultipleRuntimeFunctions() + false + MultipleRuntimeFunctions.MultipleRuntimeFunctions + 100663297 + 1 + 0 + + + + 1 + + 65 + 0 + + + + 4 + 65 + + + + + + + + Main + MultipleRuntimeFunctions.MultipleRuntimeFunctions.Main(String[]) + false + MultipleRuntimeFunctions.MultipleRuntimeFunctions + 100663298 + 2 + 1 + + + + 2 + + 20 + 0 + + + + 4 + 20 + + + + + + + + .ctor + MultipleRuntimeFunctions.MultipleRuntimeFunctions..ctor() + false + MultipleRuntimeFunctions.MultipleRuntimeFunctions + 100663299 + 3 + 2 + + + + 3 + + 22 + 0 + + + + 4 + 22 + + + + + + + \ No newline at end of file diff --git a/tests/src/readytorun/r2rdump/rebaseline.cmd b/tests/src/readytorun/r2rdump/rebaseline.cmd index 66ab080..b619163 100644 --- a/tests/src/readytorun/r2rdump/rebaseline.cmd +++ b/tests/src/readytorun/r2rdump/rebaseline.cmd @@ -2,7 +2,9 @@ set CurrentDir=%~dp0 set ProjectDir=%CurrentDir%..\..\..\..\ "%ProjectDir%Tools\dotnetcli\dotnet.exe" build /p:__BuildArch=x64 /p:__BuildOS=Windows_NT /p:__BuildType=Checked %ProjectDir%src\tools\r2rdump\R2RDump.csproj +"%ProjectDir%Tools\dotnetcli\dotnet.exe" build /p:__BuildArch=x64 /p:__BuildOS=Windows_NT /p:__BuildType=Debug %ProjectDir%src\tools\r2rdump\R2RDump.csproj "%ProjectDir%Tools\dotnetcli\dotnet.exe" build /p:__BuildArch=x86 /p:__BuildOS=Windows_NT /p:__BuildType=Release %ProjectDir%src\tools\r2rdump\R2RDump.csproj +"%ProjectDir%Tools\dotnetcli\dotnet.exe" build /p:__BuildArch=x64 /p:__BuildOS=Windows_NT /p:__BuildType=Debug %ProjectDir%src\tools\r2rdump\R2RDump.csproj set tests=HelloWorld GcInfoTransitions GenericFunctions MultipleRuntimeFunctions @@ -13,10 +15,22 @@ set tests=HelloWorld GcInfoTransitions GenericFunctions MultipleRuntimeFunctions )) (for %%a in (%tests%) do ( + "%ProjectDir%Tools\dotnetcli\dotnet.exe" build /p:__BuildArch=x64 /p:__BuildOS=Windows_NT /p:__BuildType=Debug "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" + %ProjectDir%bin\tests\Windows_NT.x64.Debug\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%bin\tests\Windows_NT.x64.Debug\Tests\Core_Root /out %%a.ni.dll %ProjectDir%bin\tests\Windows_NT.x64.Debug\readytorun\r2rdump\files\%%a\%%a.dll + "%ProjectDir%Tools\dotnetcli\dotnet.exe" %ProjectDir%bin\Product\Windows_NT.x64.Debug\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Debug\%%a.xml -x -v --ignoreSensitive +)) + +(for %%a in (%tests%) do ( "%ProjectDir%Tools\dotnetcli\dotnet.exe" build /p:__BuildArch=x86 /p:__BuildOS=Windows_NT /p:__BuildType=Release "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" %ProjectDir%bin\tests\Windows_NT.x86.Release\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%bin\tests\Windows_NT.x86.Release\Tests\Core_Root /out %%a.ni.dll %ProjectDir%bin\tests\Windows_NT.x86.Release\readytorun\r2rdump\files\%%a\%%a.dll "%ProjectDir%Tools\dotnetcli\dotnet.exe" %ProjectDir%bin\Product\Windows_NT.x86.Release\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Release\%%a.xml -x -v --ignoreSensitive )) +(for %%a in (%tests%) do ( + "%ProjectDir%Tools\dotnetcli\dotnet.exe" build /p:__BuildArch=x86 /p:__BuildOS=Windows_NT /p:__BuildType=Debug "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" + %ProjectDir%bin\tests\Windows_NT.x86.Debug\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%bin\tests\Windows_NT.x86.Debug\Tests\Core_Root /out %%a.ni.dll %ProjectDir%bin\tests\Windows_NT.x86.Debug\readytorun\r2rdump\files\%%a\%%a.dll + "%ProjectDir%Tools\dotnetcli\dotnet.exe" %ProjectDir%bin\Product\Windows_NT.x86.Debug\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Debug\%%a.xml -x -v --ignoreSensitive +)) + COPY /Y %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Checked\*.xml %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Release\ COPY /Y %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Release\*.xml %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Checked\