diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
commit | 61d6a817e39d3bae0f47dbc09838d51db22a5d30 (patch) | |
tree | cb37caa1784bc738b976273335d6ed04a7cc80b0 /tests | |
parent | 5b975f8233e8c8d17b215372f89ca713b45d6a0b (diff) | |
download | coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.gz coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.bz2 coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.zip |
Imported Upstream version 2.0.0.11992upstream/2.0.0.11992
Diffstat (limited to 'tests')
364 files changed, 4583 insertions, 2841 deletions
diff --git a/tests/arm64/Tests.lst b/tests/arm64/Tests.lst index 53801cb072..6e963c1b87 100644 --- a/tests/arm64/Tests.lst +++ b/tests/arm64/Tests.lst @@ -689,7 +689,7 @@ RelativePath=baseservices\exceptions\regressions\Dev11\147911\test147911\test147 WorkingDir=baseservices\exceptions\regressions\Dev11\147911\test147911 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;EXCLUDED +Categories=EXPECTED_FAIL;EXCLUDED;RVA_STATIC HostStyle=0 [dynamicmethodliveness.cmd_86] @@ -865,7 +865,7 @@ RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\UnmanagedToManaged\Un WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\UnmanagedToManaged Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL +Categories=EXPECTED_FAIL;EXCLUDED;RVA_STATIC HostStyle=0 [UserException.cmd_108] @@ -26241,7 +26241,7 @@ RelativePath=GC\Stress\Framework\ReliabilityFramework\ReliabilityFramework.cmd WorkingDir=GC\Stress\Framework\ReliabilityFramework Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS +Categories=EXPECTED_FAIL;11534 HostStyle=0 [csgen.1.cmd_3473] @@ -59193,7 +59193,7 @@ RelativePath=JIT\Methodical\tailcall_v4\smallFrame\smallFrame.cmd WorkingDir=JIT\Methodical\tailcall_v4\smallFrame Expected=0 MaxAllowedDurationSeconds=600 -Categories=Pri0;JIT;9462;EXPECTED_FAIL;6881 +Categories=Pri0;JIT;9462;EXPECTED_FAIL;6881;EXCLUDED;ILLEGAL_IL_TAILCALL_POP_RET HostStyle=0 [tailcall_AV.cmd_7668] @@ -61457,7 +61457,7 @@ RelativePath=JIT\opt\perf\doublealign\Locals\Locals.cmd WorkingDir=JIT\opt\perf\doublealign\Locals Expected=0 MaxAllowedDurationSeconds=600 -Categories=Pri0;EXPECTED_FAIL;8418 +Categories=Pri0;EXPECTED_PASS HostStyle=0 [objects.cmd_7953] @@ -62041,7 +62041,7 @@ RelativePath=JIT\Performance\CodeQuality\Roslyn\CscBench\CscBench.cmd WorkingDir=JIT\Performance\CodeQuality\Roslyn\CscBench Expected=0 MaxAllowedDurationSeconds=600 -Categories=Pri0;LONG_RUNNING;EXPECTED_PASS +Categories=Pri0;LONG_RUNNING;EXPECTED_FAIL;11533 HostStyle=0 [SciMark.cmd_8027] @@ -75873,7 +75873,7 @@ RelativePath=managed\Compilation\Compilation\Compilation.cmd WorkingDir=managed\Compilation\Compilation Expected=0 MaxAllowedDurationSeconds=800 -Categories=RT;Pri0;LONG_RUNNING;NATIVE_INTEROP;EXPECTED_FAIL;10108 +Categories=RT;Pri0;LONG_RUNNING;NATIVE_INTEROP;EXPECTED_FAIL;11533 HostStyle=0 [generics.cmd_9787] @@ -75881,7 +75881,7 @@ RelativePath=readytorun\generics\generics.cmd WorkingDir=readytorun\generics Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS +Categories=EXPECTED_FAIL;11534 HostStyle=0 [callgenericctor.cmd_9788] @@ -75889,7 +75889,7 @@ RelativePath=readytorun\genericsload\callgenericctor\callgenericctor.cmd WorkingDir=readytorun\genericsload\callgenericctor Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS +Categories=EXPECTED_FAIL;11534 HostStyle=0 [usegenericfield.cmd_9789] @@ -75897,7 +75897,7 @@ RelativePath=readytorun\genericsload\usegenericfield\usegenericfield.cmd WorkingDir=readytorun\genericsload\usegenericfield Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS +Categories=EXPECTED_FAIL;11534 HostStyle=0 [mainv1.cmd_9790] @@ -75905,7 +75905,7 @@ RelativePath=readytorun\mainv1\mainv1.cmd WorkingDir=readytorun\mainv1 Expected=0 MaxAllowedDurationSeconds=600 -Categories=UNSTABLE;EXPECTED_PASS +Categories=UNSTABLE;EXPECTED_FAIL;11534 HostStyle=0 [mainv2.cmd_9791] @@ -75913,7 +75913,7 @@ RelativePath=readytorun\mainv2\mainv2.cmd WorkingDir=readytorun\mainv2 Expected=0 MaxAllowedDurationSeconds=600 -Categories=UNSTABLE;EXPECTED_PASS +Categories=UNSTABLE;EXPECTED_FAIL;11534 HostStyle=0 [Dev10_629953.cmd_9792] @@ -76513,7 +76513,7 @@ RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474\b410474.cmd WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated1156.cmd_9867] @@ -76665,7 +76665,7 @@ RelativePath=JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847\b07847.cmd WorkingDir=JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2441;NEW +Categories=EXPECTED_FAIL;2441;EXCLUDED;RVA_STATIC HostStyle=0 [Generated554.cmd_9886] @@ -76681,7 +76681,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i60\mcc_i60.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i60 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1394.cmd_9888] @@ -77105,7 +77105,7 @@ RelativePath=GC\Regressions\dev10bugs\536168\536168\536168.cmd WorkingDir=GC\Regressions\dev10bugs\536168\536168 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW +Categories=EXPECTED_FAIL;11534;LONG_RUNNING;NEW HostStyle=0 [Generated1498.cmd_9941] @@ -77289,7 +77289,7 @@ RelativePath=JIT\Directed\rvastatics\rvastatic2\rvastatic2.cmd WorkingDir=JIT\Directed\rvastatics\rvastatic2 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated748.cmd_9964] @@ -77569,7 +77569,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409748\b409748\b409748.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409748\b409748 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1366.cmd_9999] @@ -77889,7 +77889,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32374\b32374\b32374.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32374\b32374 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [BestFitMapping.cmd_10039] @@ -78049,7 +78049,7 @@ RelativePath=JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_d\nonrefsdarr WorkingDir=JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_d Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;4851;NEW +Categories=EXPECTED_FAIL;4851;EXCLUDED;VERIFY HostStyle=0 [Generated987.cmd_10060] @@ -78161,7 +78161,7 @@ RelativePath=JIT\Methodical\refany\_il_relseq\_il_relseq.cmd WorkingDir=JIT\Methodical\refany\_il_relseq Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1476.cmd_10074] @@ -78313,7 +78313,7 @@ RelativePath=JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix. WorkingDir=JIT\opt\Tailcall\TailcallVerifyWithPrefix Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;EXCLUDED;ILLEGAL_IL_TAILCALL_POP_RET HostStyle=0 [Generated611.cmd_10093] @@ -78337,7 +78337,7 @@ RelativePath=JIT\Directed\PREFIX\unaligned\2\arglist\arglist.cmd WorkingDir=JIT\Directed\PREFIX\unaligned\2\arglist Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated404.cmd_10096] @@ -78433,7 +78433,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102637\b102637\b102637.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102637\b102637 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [ExecuteCodeWithGuaranteedCleanup.cmd_10108] @@ -78577,7 +78577,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i32\mcc_i32.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i32 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated778.cmd_10126] @@ -78801,7 +78801,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28901\b28901\b28901.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28901\b28901 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated659.cmd_10154] @@ -78841,7 +78841,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i10\mcc_i10.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i10 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [overlap.cmd_10159] @@ -78849,7 +78849,7 @@ RelativePath=JIT\Directed\RVAInit\overlap\overlap.cmd WorkingDir=JIT\Directed\RVAInit\overlap Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [b30838.cmd_10160] @@ -78857,7 +78857,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30838\b30838\b30838.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30838\b30838 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1430.cmd_10161] @@ -78889,7 +78889,7 @@ RelativePath=JIT\Directed\tls\mutualrecurthd-tls\mutualrecurthd-tls.cmd WorkingDir=JIT\Directed\tls\mutualrecurthd-tls Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2441;NEW +Categories=EXPECTED_FAIL;2441;EXCLUDED;TLS HostStyle=0 [Generated461.cmd_10165] @@ -78961,7 +78961,7 @@ RelativePath=JIT\Directed\PREFIX\volatile\1\arglist\arglist.cmd WorkingDir=JIT\Directed\PREFIX\volatile\1\arglist Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated995.cmd_10174] @@ -79073,7 +79073,7 @@ RelativePath=JIT\Directed\intrinsic\interlocked\rva_rvastatic1\rva_rvastatic1.cm WorkingDir=JIT\Directed\intrinsic\interlocked\rva_rvastatic1 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated1145.cmd_10188] @@ -79281,7 +79281,7 @@ RelativePath=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_ro\DevDiv_359736 WorkingDir=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_ro Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;10111;NEW +Categories=EXPECTED_FAIL;8648;NEW HostStyle=0 [Generated1104.cmd_10214] @@ -79689,7 +79689,7 @@ RelativePath=JIT\Methodical\tailcall\_il_dbgpointer_i\_il_dbgpointer_i.cmd WorkingDir=JIT\Methodical\tailcall\_il_dbgpointer_i Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated376.cmd_10266] @@ -79753,7 +79753,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689\b03689.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2441;NEW +Categories=EXPECTED_FAIL;2441;EXCLUDED;TLS HostStyle=0 [FixedAddressValueType.cmd_10274] @@ -80057,7 +80057,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324a\b26324a.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324a Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated563.cmd_10312] @@ -80137,7 +80137,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i72\mcc_i72.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i72 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated277.cmd_10322] @@ -80433,7 +80433,7 @@ RelativePath=JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd WorkingDir=JIT\Directed\coverage\importer\Desktop\bleref_il_r Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;4851NEW +Categories=EXPECTED_FAIL;4851;EXCLUDED;VERIFY HostStyle=0 [Generated1391.cmd_10359] @@ -80489,7 +80489,7 @@ RelativePath=JIT\Methodical\cctor\misc\global_il_d\global_il_d.cmd WorkingDir=JIT\Methodical\cctor\misc\global_il_d Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;10109;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated229.cmd_10367] @@ -80521,7 +80521,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i51\mcc_i51.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i51 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1179.cmd_10371] @@ -80609,7 +80609,7 @@ RelativePath=JIT\Directed\PREFIX\unaligned\1\arglist\arglist.cmd WorkingDir=JIT\Directed\PREFIX\unaligned\1\arglist Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated413.cmd_10382] @@ -80809,7 +80809,7 @@ RelativePath=JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd WorkingDir=JIT\jit64\localloc\verify\verify01_small Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;8156;NEW +Categories=EXPECTED_FAIL;4581;EXCLUDED;VERIFY HostStyle=0 [Generated962.cmd_10407] @@ -80905,7 +80905,7 @@ RelativePath=JIT\Methodical\eh\deadcode\badcodeafterfinally_d\badcodeafterfinall WorkingDir=JIT\Methodical\eh\deadcode\badcodeafterfinally_d Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2444;NEW +Categories=EXPECTED_FAIL;2444;EXCLUDED HostStyle=0 [Generated1238.cmd_10419] @@ -81065,7 +81065,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49644\b49644\b49644.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49644\b49644 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [global_il_r.cmd_10439] @@ -81073,7 +81073,7 @@ RelativePath=JIT\Methodical\cctor\misc\global_il_r\global_il_r.cmd WorkingDir=JIT\Methodical\cctor\misc\global_il_r Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;10109;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [dev10_865840.cmd_10440] @@ -81081,7 +81081,7 @@ RelativePath=JIT\Regression\Dev11\dev10_865840\dev10_865840\dev10_865840.cmd WorkingDir=JIT\Regression\Dev11\dev10_865840\dev10_865840 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2445;NEW +Categories=EXPECTED_FAIL;2445;EXCLUDED HostStyle=0 [Generated728.cmd_10441] @@ -81201,7 +81201,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i82\mcc_i82.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i82 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1333.cmd_10456] @@ -81257,7 +81257,7 @@ RelativePath=JIT\Directed\rvastatics\rvastatic4\rvastatic4.cmd WorkingDir=JIT\Directed\rvastatics\rvastatic4 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated944.cmd_10463] @@ -81297,7 +81297,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16423\b16423\b16423.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16423\b16423 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [DevDiv_279829.cmd_10468] @@ -81337,7 +81337,7 @@ RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b26323\b26323\b26323.cmd WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b26323\b26323 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [smalloom.cmd_10473] @@ -81473,7 +81473,7 @@ RelativePath=JIT\Methodical\xxobj\operand\_il_rellocalloc\_il_rellocalloc.cmd WorkingDir=JIT\Methodical\xxobj\operand\_il_rellocalloc Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2444;NEW +Categories=EXPECTED_FAIL;2444;EXCLUDED HostStyle=0 [Generated1025.cmd_10490] @@ -81513,7 +81513,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37646\b37646\b37646.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37646\b37646 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1223.cmd_10495] @@ -81545,7 +81545,7 @@ RelativePath=JIT\Methodical\tailcall\_il_dbgpointer\_il_dbgpointer.cmd WorkingDir=JIT\Methodical\tailcall\_il_dbgpointer Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated910.cmd_10499] @@ -81569,7 +81569,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i52\mcc_i52.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i52 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1380.cmd_10502] @@ -81721,7 +81721,7 @@ RelativePath=JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd WorkingDir=JIT\jit64\localloc\verify\verify01_large Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;4851;NEW +Categories=EXPECTED_FAIL;4851;EXCLUDED;VERIFY HostStyle=0 [Generated202.cmd_10522] @@ -81945,7 +81945,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31746\b31746\b31746.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31746\b31746 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated158.cmd_10550] @@ -82305,7 +82305,7 @@ RelativePath=JIT\Methodical\Coverage\arglist_pos\arglist_pos.cmd WorkingDir=JIT\Methodical\Coverage\arglist_pos Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [mcc_i03.cmd_10596] @@ -82313,7 +82313,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i03\mcc_i03.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i03 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated126.cmd_10597] @@ -82465,7 +82465,7 @@ RelativePath=JIT\Directed\rvastatics\rvastatic3\rvastatic3.cmd WorkingDir=JIT\Directed\rvastatics\rvastatic3 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated1268.cmd_10616] @@ -82705,7 +82705,7 @@ RelativePath=JIT\Methodical\tailcall\_il_relpointer\_il_relpointer.cmd WorkingDir=JIT\Methodical\tailcall\_il_relpointer Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated1472.cmd_10646] @@ -82929,7 +82929,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i01\mcc_i01.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i01 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1017.cmd_10674] @@ -83081,7 +83081,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i70\mcc_i70.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i70 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated335.cmd_10693] @@ -83369,7 +83369,7 @@ RelativePath=JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd WorkingDir=JIT\jit64\regress\ndpw\21220\b21220 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;4851;NEW +Categories=EXPECTED_FAIL;4851;EXCLUDED;VERIFY HostStyle=0 [Generated1054.cmd_10730] @@ -83889,7 +83889,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i53\mcc_i53.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i53 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [b37598.cmd_10795] @@ -83897,7 +83897,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37598\b37598\b37598.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37598\b37598 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated647.cmd_10796] @@ -83985,7 +83985,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i71\mcc_i71.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i71 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated790.cmd_10807] @@ -84065,7 +84065,7 @@ RelativePath=JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd WorkingDir=JIT\Directed\coverage\importer\Desktop\bleref_il_d Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;4851;NEW +Categories=EXPECTED_FAIL;4851;EXCLUDED;VERIFY HostStyle=0 [Generated113.cmd_10817] @@ -84137,7 +84137,7 @@ RelativePath=JIT\Directed\RVAInit\extended\extended.cmd WorkingDir=JIT\Directed\RVAInit\extended Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated255.cmd_10826] @@ -84297,7 +84297,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46867\b46867\b46867.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46867\b46867 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated635.cmd_10847] @@ -84449,7 +84449,7 @@ RelativePath=JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d\ldelemnu WorkingDir=JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;4851;NEW +Categories=EXPECTED_FAIL;4851;EXCLUDED;VERIFY HostStyle=0 [Generated1080.cmd_10866] @@ -84481,7 +84481,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91248\b91248\b91248.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91248\b91248 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated42.cmd_10870] @@ -84497,7 +84497,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i33\mcc_i33.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i33 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated830.cmd_10872] @@ -84681,7 +84681,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i63\mcc_i63.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i63 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated582.cmd_10895] @@ -84713,7 +84713,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i02\mcc_i02.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i02 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1004.cmd_10900] @@ -84897,7 +84897,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i00\mcc_i00.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i00 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1389.cmd_10923] @@ -85049,7 +85049,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36472\b36472\b36472.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36472\b36472 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [mcc_i31.cmd_10942] @@ -85057,7 +85057,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i31\mcc_i31.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i31 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated572.cmd_10943] @@ -85137,7 +85137,7 @@ RelativePath=JIT\jit64\gc\misc\funclet\funclet.cmd WorkingDir=JIT\jit64\gc\misc\funclet Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated671.cmd_10953] @@ -85153,7 +85153,7 @@ RelativePath=JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_r\ldelemnu WorkingDir=JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_r Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;4851;NEW +Categories=EXPECTED_FAIL;4851;EXCLUDED;VERIFY HostStyle=0 [Generated1228.cmd_10956] @@ -85337,7 +85337,7 @@ RelativePath=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_do\DevDiv_359736 WorkingDir=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_do Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;10111;NEW +Categories=EXPECTED_FAIL;8648;NEW HostStyle=0 [nonrefsdarr_il_r.cmd_10979] @@ -85345,7 +85345,7 @@ RelativePath=JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_r\nonrefsdarr WorkingDir=JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_r Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;4851;NEW +Categories=EXPECTED_FAIL;4851;EXCLUDED;VERIFY HostStyle=0 [Generated107.cmd_10980] @@ -85433,7 +85433,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324b\b26324b.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324b Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [b41391.cmd_10992] @@ -85441,7 +85441,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41391\b41391\b41391.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41391\b41391 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated814.cmd_10993] @@ -85545,7 +85545,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046\b08046.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;8156;NEW +Categories=EXPECTED_FAIL;4849;EXCLUDED HostStyle=0 [Generated1045.cmd_11006] @@ -85913,7 +85913,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i81\mcc_i81.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i81 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated273.cmd_11052] @@ -85969,7 +85969,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31745\b31745\b31745.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31745\b31745 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated463.cmd_11059] @@ -86009,7 +86009,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i73\mcc_i73.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i73 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1198.cmd_11064] @@ -86073,7 +86073,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30864\b30864\b30864.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30864\b30864 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated738.cmd_11072] @@ -86257,7 +86257,7 @@ RelativePath=JIT\Methodical\eh\deadcode\badcodeafterfinally_r\badcodeafterfinall WorkingDir=JIT\Methodical\eh\deadcode\badcodeafterfinally_r Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2444;NEW +Categories=EXPECTED_FAIL;2444;EXCLUDED HostStyle=0 [Generated180.cmd_11095] @@ -86321,7 +86321,7 @@ RelativePath=JIT\Directed\tls\test-tls\test-tls.cmd WorkingDir=JIT\Directed\tls\test-tls Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2441;NEW +Categories=EXPECTED_FAIL;2441;EXCLUDED;TLS HostStyle=0 [Generated1227.cmd_11103] @@ -86481,7 +86481,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i11\mcc_i11.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i11 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated715.cmd_11124] @@ -86633,7 +86633,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b41852\b41852\b41852.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b41852\b41852 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated78.cmd_11143] @@ -86905,7 +86905,7 @@ RelativePath=JIT\Directed\PREFIX\unaligned\4\arglist\arglist.cmd WorkingDir=JIT\Directed\PREFIX\unaligned\4\arglist Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1384.cmd_11177] @@ -86929,7 +86929,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b35784\b35784\b35784.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b35784\b35784 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated445.cmd_11180] @@ -87353,7 +87353,7 @@ RelativePath=JIT\superpmi\superpmicollect\superpmicollect.cmd WorkingDir=JIT\superpmi\superpmicollect Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;NEW +Categories=EXPECTED_FAIL;EXCLUDED;REQUIRES_SOURCES HostStyle=0 [Generated483.cmd_11233] @@ -87409,7 +87409,7 @@ RelativePath=JIT\Directed\intrinsic\interlocked\rva_rvastatic2\rva_rvastatic2.cm WorkingDir=JIT\Directed\intrinsic\interlocked\rva_rvastatic2 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated993.cmd_11240] @@ -87553,7 +87553,7 @@ RelativePath=JIT\Methodical\tailcall\_il_relpointer_i\_il_relpointer_i.cmd WorkingDir=JIT\Methodical\tailcall\_il_relpointer_i Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated955.cmd_11258] @@ -87713,7 +87713,7 @@ RelativePath=JIT\Directed\rvastatics\rvastatic1\rvastatic1.cmd WorkingDir=JIT\Directed\rvastatics\rvastatic1 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated708.cmd_11278] @@ -87793,7 +87793,7 @@ RelativePath=JIT\Methodical\refany\_il_dbgseq\_il_dbgseq.cmd WorkingDir=JIT\Methodical\refany\_il_dbgseq Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [mcc_i61.cmd_11288] @@ -87801,7 +87801,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i61\mcc_i61.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i61 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1500.cmd_11289] @@ -87849,7 +87849,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i13\mcc_i13.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i13 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated568.cmd_11295] @@ -88169,7 +88169,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i83\mcc_i83.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i83 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated858.cmd_11335] @@ -88337,7 +88337,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i30\mcc_i30.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i30 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated597.cmd_11356] @@ -88505,7 +88505,7 @@ RelativePath=JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd WorkingDir=JIT\jit64\localloc\verify\verify01_dynamic Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;4851;NEW +Categories=EXPECTED_FAIL;4851;EXCLUDED;VERIFY HostStyle=0 [Generated1094.cmd_11377] @@ -88697,7 +88697,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i62\mcc_i62.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i62 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1398.cmd_11401] @@ -88713,7 +88713,7 @@ RelativePath=JIT\Methodical\xxobj\operand\_il_dbglocalloc\_il_dbglocalloc.cmd WorkingDir=JIT\Methodical\xxobj\operand\_il_dbglocalloc Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2444;NEW +Categories=EXPECTED_FAIL;2444;EXCLUDED HostStyle=0 [mcc_i50.cmd_11403] @@ -88721,7 +88721,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i50\mcc_i50.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i50 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated341.cmd_11404] @@ -89145,7 +89145,7 @@ RelativePath=JIT\Directed\rvastatics\rvastatic5\rvastatic5.cmd WorkingDir=JIT\Directed\rvastatics\rvastatic5 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [pinvoke-bug.cmd_11457] @@ -89321,7 +89321,7 @@ RelativePath=JIT\Directed\pinvoke\preemptive_cooperative\preemptive_cooperative. WorkingDir=JIT\Directed\pinvoke\preemptive_cooperative Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;NEW;R2R_FAIL;10069;2434 +Categories=EXPECTED_PASS;NEW;R2R_FAIL;EXCLUDED;2434;KERNEL_32_DEPENDENCY HostStyle=0 [Generated1089.cmd_11479] @@ -89433,7 +89433,7 @@ RelativePath=JIT\Directed\intrinsic\interlocked\rva_rvastatic4\rva_rvastatic4.cm WorkingDir=JIT\Directed\intrinsic\interlocked\rva_rvastatic4 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated249.cmd_11493] @@ -89505,7 +89505,7 @@ RelativePath=JIT\Directed\intrinsic\interlocked\rva_rvastatic3\rva_rvastatic3.cm WorkingDir=JIT\Directed\intrinsic\interlocked\rva_rvastatic3 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;2451;NEW +Categories=EXPECTED_FAIL;2451;EXCLUDED;RVA_STATIC HostStyle=0 [Generated968.cmd_11502] @@ -89593,7 +89593,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88793\b88793\b88793.cmd WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88793\b88793 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated58.cmd_11513] @@ -89649,7 +89649,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i12\mcc_i12.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i12 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated1282.cmd_11520] @@ -89849,7 +89849,7 @@ RelativePath=JIT\jit64\mcc\interop\mcc_i80\mcc_i80.cmd WorkingDir=JIT\jit64\mcc\interop\mcc_i80 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;9462;NEW +Categories=EXPECTED_FAIL;9462;EXCLUDED;VARARG HostStyle=0 [Generated652.cmd_11546] @@ -90257,7 +90257,7 @@ RelativePath=JIT\CheckProjects\CheckProjects\CheckProjects.cmd WorkingDir=JIT\CheckProjects\CheckProjects Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;10635;NEW +Categories=EXPECTED_FAIL;10635;EXCLUDED;REQUIRES_SOURCES HostStyle=0 [ArrayMD1.cmd_11597] diff --git a/tests/build.proj b/tests/build.proj index 518d59ca69..ff2d96bada 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -20,6 +20,19 @@ </TraversalBuildDependsOn> </PropertyGroup> + <ItemGroup> + <RestoreProjects Include="$(MSBuildThisFileDirectory)scripts\scripts.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\targeting_pack_ref\targeting_pack_ref.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_dependencies\test_dependencies.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_runtime\test_runtime.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark\benchmark.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\performance\performance.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\TestWrappersConfig\TestWrappersConfig.csproj" /> + </ItemGroup> + <Target Name="BuildTargetingPack" AfterTargets="BatchRestorePackages"> <Message Text="Building Targeting Pack" Importance="High" /> <MSBuild Projects="$(MSBuildThisFileDirectory)\src\Common\external\external.depproj" /> @@ -28,32 +41,19 @@ <Target Name="BatchRestorePackages" DependsOnTargets="VerifyDependencies"> <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." /> - <!-- restore all project.jsons in one pass for perf & to avoid concurrency problems --> - <Exec Command="$(DnuRestoreCommand) $(DnuRestoreDirs)" - StandardOutputImportance="Low" /> - + <!-- restore all csproj's with PackageReferences in one pass --> + <MSBuild Projects="build.proj" + Properties="RestoreProj=%(RestoreProjects.Identity)" + Targets="RestorePackage" /> + <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." /> </Target> - <!-- Task from buildtools that validates dependencies contained in project.json files. --> - <UsingTask TaskName="ValidateProjectDependencyVersions" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - - <!-- Tasks from buildtools for easy project.json dependency updates --> - <UsingTask TaskName="UpdatePackageDependencyVersion" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - - <!-- Create a collection of all project.json files for dependency updates. --> - <ItemGroup> - <ProjectJsonFiles Include="$(SourceDir)**\project.json" /> - <ProjectJsonFiles Include="$(ProjectDir)scripts\**\project.json" /> - </ItemGroup> - - <Target Name="UpdatePackageDependencyVersion"> - <UpdatePackageDependencyVersion ProjectJsons="@(ProjectJsonFiles)" - PackageId="$(PackageId)" - OldVersion="$(OldVersion)" - NewVersion="$(NewVersion)" /> + <Target Name="RestorePackage"> + <Exec Command="$(DotnetRestoreCommand) $(RestoreProj) $(PackageVersionArg)" + StandardOutputImportance="Low" /> </Target> <!-- Override RestorePackages from dir.traversal.targets and do a batch restore --> <Target Name="RestorePackages" DependsOnTargets="BatchRestorePackages" /> -</Project> +</Project>
\ No newline at end of file diff --git a/tests/dir.props b/tests/dir.props index 3a9b043b09..96c3b2a6d9 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -1,5 +1,4 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <!-- $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix. --> @@ -36,7 +35,7 @@ <!-- Common properties --> <PropertyGroup> <RootBinDir>$(__RootBinDir)\</RootBinDir> - <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir> + <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)..\bin\</RootBinDir> </PropertyGroup> <!-- Default Test platform to deploy the netstandard compiled tests to --> @@ -59,56 +58,36 @@ <TargetingPackPath Condition="'$(BaseTargetingPackPath)' == ''">$(RootBinDir)TargetingPack\</TargetingPackPath> </PropertyGroup> - <Import Condition="Exists('$(ToolsDir)BuildVersion.targets')" Project="$(ToolsDir)BuildVersion.targets" /> + <!-- Import Build tools common props file where repo-independent properties are found --> + <Import Condition="Exists('$(ToolsDir)Build.Common.props')" Project="$(ToolsDir)Build.Common.props" /> <!-- Provides properties for dependency versions and configures dependency verification/auto-upgrade. --> <Import Project="$(ProjectDir)..\dependencies.props" /> - <!-- Common nuget properties --> - <PropertyGroup> - <NuGetToolPath Condition="'$(NuGetToolPath)'==''">$(PackagesDir)NuGet.exe</NuGetToolPath> - <NuGetConfigFile Condition="'$(NuGetConfigFile)'==''">$(SourceDir)NuGet.Config</NuGetConfigFile> - <NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine> - - <NugetRestoreCommand>"$(NuGetToolPath)"</NugetRestoreCommand> - <NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand> - <!-- Trim off the last slash so that nuget doesn't get confused and say there are illegal characters on - the path. --> - <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand> - <NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand> - <NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand> - <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand> - </PropertyGroup> - - <!-- list of nuget package sources passed to dnu --> <ItemGroup> <!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. --> - <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" /> - <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> - <DnuSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> + <DotnetSourceList Include="$(PackagesDir)AzureTransfer\$(__BuildType)\pkg\" Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" /> + <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" /> + <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> + <DotnetSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> </ItemGroup> - - - <!-- list of directories to perform batch restore --> - <ItemGroup> - <DnuRestoreDir Include=""$(MSBuildProjectDirectory)\src"" /> - </ItemGroup> <PropertyGroup Condition="'$(BuildAllProjects)'=='true'"> <!-- When we do a traversal build we get all packages up front, don't restore them again --> <RestorePackages>false</RestorePackages> </PropertyGroup> - + <PropertyGroup> - <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'!='Unix'">$(DotnetCliPath)dotnet.exe</DotnetToolCommand> - <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand> + <BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile> + </PropertyGroup> - <DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource> - <DnuRestoreDirs>@(DnuRestoreDir -> '%(Identity)', ' ')</DnuRestoreDirs> + <!-- If we want to overwrite the desired CoreCLR package version, we need to get the new version from the generated props file in bin/obj --> + <Import Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" Project="$(BuildVersionFile)" /> - <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand> - <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> - <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand> + <PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'"> + <VersionToRestore Condition="'$(StableVersion)' != ''">$(StableVersion)</VersionToRestore> + <VersionToRestore Condition="'$(VersionToRestore)' == ''">$(PackageVersion)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionToRestore> + <PackageVersionArg>/p:CoreClrPackageVersion=$(VersionToRestore)</PackageVersionArg> </PropertyGroup> <!-- Which tests shall we build? Default: Priority 0 tests. diff --git a/tests/helixperftasks.targets b/tests/helixperftasks.targets index 62da5e4c32..d578360092 100644 --- a/tests/helixperftasks.targets +++ b/tests/helixperftasks.targets @@ -52,12 +52,8 @@ <Output TaskParameter="PerfTestAssemblies" ItemName="CoreCLRPerfTest" /> </GetPerfTestAssemblies> - <ItemGroup> - <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" /> - </ItemGroup> - <!-- Restore the runtime dependencies --> - <Exec Command="$(DnuRestoreCommand) "$(TestRuntimeProjectJson)"" + <Exec Command="$(DotnetRestoreCommand) "$(TestRuntimeProjectJson)"" StandardOutputImportance="Low" CustomErrorRegularExpression="^Unable to resolve .*" IgnoreExitCode="true" diff --git a/tests/helixprep.proj b/tests/helixprep.proj index 22c5935ce1..2d08e91b13 100644 --- a/tests/helixprep.proj +++ b/tests/helixprep.proj @@ -74,7 +74,7 @@ Condition="'$(TargetsWindows)' == 'true' "> <PropertyGroup> - <CmdCrossgenVar Condition="'$(Crossgen)' == 'true'">set RunCrossGen=true</CrossgenVar> + <CmdCrossgenVar Condition="'$(Crossgen)' == 'true'">set RunCrossGen=true</CmdCrossgenVar> <WrapperCmdContents> <![CDATA[ @ECHO OFF @@ -129,7 +129,7 @@ EXIT /B %ERRORLEVEL% <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) do%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) filename=%24{fileToPrecompile}%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) echo Precompiling %24filename%0a</WrapperShContents> - <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) %24overlayDir/crossgen /Platform_Assemblies_Paths %24overlayDir %24filename 1> %24filename.stdout 2>%24filename.stderr%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) %24overlayDir/crossgen /Platform_Assemblies_Paths %24overlayDir /in %24filename /out %24overlayDir/temp.ni.dll 1> %24filename.stdout 2>%24filename.stderr%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) exitCode=%24%3F%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) if [ %24exitCode != 0 ]%3B then%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) if grep -q -e '(COR_E_ASSEMBLYEXPECTED)' %24filename.stderr%3B then%0a</WrapperShContents> @@ -137,7 +137,10 @@ EXIT /B %ERRORLEVEL% <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) else%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) echo Unable to precompile %24filename.%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) fi%0a</WrapperShContents> - <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) fi%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) else%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) rm %24filename%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) mv %24overlayDir/temp.ni.dll %24filename%0a</WrapperShContents> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) fi%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) rm %24filename.stdout%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) rm %24filename.stderr%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) done%0a</WrapperShContents> diff --git a/tests/issues.targets b/tests/issues.targets index 0592888bb3..df8fc554d8 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -1,9 +1,6 @@ <?xml version="1.0" ?> <Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Condition="'$(XunitTestBinBase)' != ''"> - <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\DoublinkList\doublinkgen\*"> - <Issue>6574</Issue> - </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\271010\*"> <Issue>3392</Issue> </ExcludeList> @@ -43,9 +40,6 @@ <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\muldimjagary\muldimjagary\*"> <Issue>3392</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\DoublinkList\dlstack\*"> - <Issue>6553</Issue> - </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d\ldelemnullarr1_il_d.cmd"> <Issue>4851</Issue> </ExcludeList> @@ -121,22 +115,22 @@ <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474\b410474.cmd"> <Issue>2451</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd"> + <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd"> <Issue>4851</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd"> + <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd"> <Issue>4851</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd"> + <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd"> <Issue>4851</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd"> + </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd"> <Issue>4851</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd"> + </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd"> <Issue>4851</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd"> + </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd"> <Issue>4851</Issue> </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\preemptive_cooperative\preemptive_cooperative.cmd"> @@ -169,6 +163,9 @@ <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\dev10_865840\dev10_865840\dev10_865840.cmd"> <Issue>2445</Issue> </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\GitHub_11408\GitHub_11408\GitHub_11408.cmd"> + <Issue>11408</Issue> + </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest612\Generated612\*"> <Issue>6707</Issue> </ExcludeList> @@ -187,12 +184,6 @@ <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\*"> <Issue>6707</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall_v4\smallFrame\smallFrame.cmd"> - <Issue>9880</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd"> - <Issue>9880</Issue> - </ExcludeList> </ItemGroup> <!-- The following are x86 failures --> @@ -217,7 +208,10 @@ <Issue>7163, fails on both legacy backend and RyuJIT</Issue> </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\DevDiv_255294\DevDiv_255294\DevDiv_255294.cmd"> - <Issue>The test is too large for x86 and causes OutOfMemory exception.</Issue> + <Issue>11469, The test causes OutOfMemory exception in crossgen mode.</Issue> + </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\DevDiv_278523\DevDiv_278523\DevDiv_278523.cmd"> + <Issue>11476, fails on both jit32 and RyuJit x86</Issue> </ExcludeList> </ItemGroup> @@ -1139,9 +1133,6 @@ <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\dev10_865840\dev10_865840\dev10_865840.cmd"> <Issue>needs triage</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JITBlue\DevDiv_255294\DevDiv_255294\DevDiv_255294.cmd"> - <Issue>11142</Issue> - </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b302509\b302509\b302509.cmd"> <Issue>needs triage</Issue> </ExcludeList> diff --git a/tests/override.targets b/tests/override.targets index a01163225f..0e7f82bf77 100644 --- a/tests/override.targets +++ b/tests/override.targets @@ -3,13 +3,13 @@ Overrides for all other targets (including build tools) can go in this file. --> - <!-- Contains overrides for the nuget reference resolution. The regular nuget reference resolution will not + <!-- Contains overrides for the nuget reference resolution. The regular nuget reference resolution will not copy references local, which we need in order to correctly execute the xunit project --> <Import Project="xunitwrapper.targets" Condition="'$(IsXunitWrapperProject)'=='true'" /> <!-- Override the AddDesignTimeFacadeReferences target to add the ability to reference System.Private.CoreLib. Some tests use functionality not available in the portable reference assemblies. - For portability reasons it's generally a good idea to reference the facades instead of the + For portability reasons it's generally a good idea to reference the facades instead of the raw implementation assemblies. However, these tests are useful. --> <Target Name="AddDesignTimeFacadeReferences" Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'" @@ -21,4 +21,13 @@ <ReferencePath Include="$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\System.Private.CoreLib.dll" /> </ItemGroup> </Target> + + <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> + <!-- + Allow this project to setup the default target frameworks. Note this depends on the targeting packs that VS + installs to resolve mscorlib and System. That should be fixed in the future. + --> + <_TargetFrameworkDirectories></_TargetFrameworkDirectories> + <_FullFrameworkReferenceAssemblyPaths></_FullFrameworkReferenceAssemblyPaths> + </PropertyGroup> </Project> diff --git a/tests/x86/legacyjit_x86_testenv.cmd b/tests/protononjit_testenv.cmd index 41da4cf63d..bba0b6738c 100644 --- a/tests/x86/legacyjit_x86_testenv.cmd +++ b/tests/protononjit_testenv.cmd @@ -1,12 +1,12 @@ @REM ------------------------------------------------------------------------- @REM -@REM This script provides x86 LEGACY_BACKEND JIT test environment settings +@REM This script provides test environment settings for prototype/cross-targeting JITs. @REM @REM ------------------------------------------------------------------------- set COMPLUS_AltJit=* set COMPLUS_AltJitNgen=* -set COMPLUS_AltJitName=legacyjit.dll +set COMPLUS_AltJitName=protononjit.dll set COMPLUS_NoGuiOnAssert=1 set COMPLUS_AltJitAssertOnNYI=1 diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index 6d1c6bdc78..8cae729776 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -18,20 +18,20 @@ </PropertyGroup> <ItemGroup> - <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_runtime\project.lock.json"/> - <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_dependencies\project.lock.json"/> + <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_runtime\obj\project.assets.json"/> + <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_dependencies\obj\project.assets.json"/> </ItemGroup> <ItemGroup> - <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\project.lock.json"/> + <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\obj\project.assets.json"/> </ItemGroup> <ItemGroup> - <ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\project.lock.json"/> + <ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\obj\project.assets.json"/> </ItemGroup> <ItemGroup> - <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(CoreClrPackageVersion)\tools\crossgen*"/> + <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/> </ItemGroup> <PropertyGroup> @@ -43,10 +43,6 @@ Inputs="@(CoreRootProjectLockJsonFiles)" Outputs="$(CORE_ROOT)\*.*"> - <MSBuild Projects="$(SourceDir)Common\test_runtime\test_runtime.csproj"/> - - <MSBuild Projects="$(SourceDir)Common\test_dependencies\test_dependencies.csproj"/> - <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items for the xunit wrapper projects --> <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="false" @@ -89,8 +85,6 @@ Inputs="@(RefProjectLockJsonFiles)" Outputs="$(RefDestination)\*.*"> - <MSBuild Projects="$(SourceDir)Common\targeting_pack_ref\targeting_pack_ref.csproj"/> - <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items for the xunit wrapper projects --> <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true" @@ -121,8 +115,6 @@ Inputs="@(ProductProjectLockJsonFiles)" Outputs="$(ProductDestination)\*.*"> - <MSBuild Projects="$(SourceDir)Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj"/> - <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items for the xunit wrapper projects --> <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true" diff --git a/tests/runtest.cmd b/tests/runtest.cmd index dcff1bd2ee..d500c53289 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -44,6 +44,7 @@ set __LongGCTests= set __GCSimulatorTests= set __AgainstPackages= set __JitDisasm= +set __IlasmRoundTrip= set __CollectDumps= :Arg_Loop @@ -59,6 +60,7 @@ if /i "%1" == "-help" goto Usage if /i "%1" == "x64" (set __BuildArch=x64&set __MSBuildBuildArch=x64&shift&goto Arg_Loop) if /i "%1" == "x86" (set __BuildArch=x86&set __MSBuildBuildArch=x86&shift&goto Arg_Loop) if /i "%1" == "arm" (set __BuildArch=arm&set __MSBuildBuildArch=arm&shift&goto Arg_Loop) +if /i "%1" == "arm64" (set __BuildArch=arm64&set __MSBuildBuildArch=arm64&shift&goto Arg_Loop) if /i "%1" == "debug" (set __BuildType=Debug&shift&goto Arg_Loop) if /i "%1" == "release" (set __BuildType=Release&shift&goto Arg_Loop) @@ -78,6 +80,7 @@ if /i "%1" == "jitstressregs" (set COMPlus_JitStressRegs=%2&shift&shift& if /i "%1" == "jitminopts" (set COMPlus_JITMinOpts=1&shift&shift&goto Arg_Loop) if /i "%1" == "jitforcerelocs" (set COMPlus_ForceRelocs=1&shift&shift&goto Arg_Loop) if /i "%1" == "jitdisasm" (set __JitDisasm=1&shift&goto Arg_Loop) +if /i "%1" == "ilasmroundtrip" (set __IlasmRoundTrip=1&shift&goto Arg_Loop) if /i "%1" == "GenerateLayoutOnly" (set __GenerateLayoutOnly=1&shift&goto Arg_Loop) if /i "%1" == "PerfTests" (set __PerfTests=true&shift&goto Arg_Loop) if /i "%1" == "runcrossgentests" (set RunCrossGen=true&shift&goto Arg_Loop) @@ -199,6 +202,8 @@ call :PrecompileFX :SkipPrecompileFX if defined __GenerateLayoutOnly ( + REM Delete the unecessary mscorlib.ni file. + del %CORE_ROOT%\mscorlib.ni.dll exit /b 0 ) @@ -233,6 +238,7 @@ if "%__CollectDumps%"=="true" ( echo %__MsgPrefix%CORE_ROOT that will be used is: %CORE_ROOT% echo %__MsgPrefix%Starting the test run ... +REM Delete the unecessary mscorlib.ni file. del %CORE_ROOT%\mscorlib.ni.dll set __BuildLogRootName=TestRunResults @@ -406,6 +412,11 @@ if defined __JitDisasm ( set RunningJitDisasm=1 ) +if defined __IlasmRoundTrip ( + echo Running Ilasm round trip + set RunningIlasmRoundTrip=1 +) + set __BuildLogRootName=Tests_GenerateRuntimeLayout call :msbuild "%__ProjectFilesDir%\runtest.proj" /p:GenerateRuntimeLayout=true if errorlevel 1 ( @@ -438,6 +449,7 @@ echo jitstressregs n - Runs the tests with COMPlus_JitStressRegs=n echo jitminopts - Runs the tests with COMPlus_JITMinOpts=1 echo jitforcerelocs - Runs the tests with COMPlus_ForceRelocs=1 echo jitdisasm - Runs jit-dasm on the tests +echo ilasmroundtrip - Runs ilasm round trip on the tests echo gcstresslevel n - Runs the tests with COMPlus_GCStress=n echo 0: None 1: GC on all allocs and 'easy' places echo 2: GC on transitions to preemptive GC 4: GC on every allowable JITed instr diff --git a/tests/runtest.proj b/tests/runtest.proj index 9ebe5c00b6..e4b3664f31 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -80,14 +80,13 @@ $(_XunitEpilog) <OutputType>Library</OutputType> <TargetFrameworkIdentifier Condition ="'$(BuildTestsAgainstPackages)' != 'true'">.NETFramework</TargetFrameworkIdentifier> <TargetFrameworkVersion Condition ="'$(BuildTestsAgainstPackages)' != 'true'">v4.5</TargetFrameworkVersion> + <NugetTargetMonikerShort Condition ="'$(BuildTestsAgainstPackages)' != 'true'">net45</NugetTargetMonikerShort> <IsXunitWrapperProject>true</IsXunitWrapperProject> <SkipSigning>true</SkipSigning> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <CLRTestKind>BuildOnly</CLRTestKind> <IsTestProject>true</IsTestProject> - <ProjectJson Condition="'$(BuildTestsAgainstPackages)' != 'true'">%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson> - <ProjectLockJson Condition="'$(BuildTestsAgainstPackages)' != 'true'">%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '%24(Configuration)|%24(Platform)' == 'Debug|AnyCPU' "> @@ -118,7 +117,8 @@ $(_XunitEpilog) </ItemGroup> <Import Project="$(SourceDir)dir.targets" /> <PropertyGroup> - <OutDir>$(XunitTestBinBase)\$(CategoryWithSlash)\</OutDir> + <OutDir>$(XunitTestBinBase)\$(CategoryWithSlash)\</OutDir> + <ProjectAssetsFile Condition="'$(BuildTestsAgainstPackages)' != 'true'">%24(TestWrappersPackagesConfigFileDirectory)obj/project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> ]]> @@ -318,7 +318,16 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <ItemGroup> <AllRunnableTestPaths Include="$(XunitTestBinBase)\**\*.cmd" /> </ItemGroup> - </Target> + </Target> + + <!-- If we want to overwrite the desired CoreCLR package version, we need to get the new version from the generated props file in bin/obj --> + <Import Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" Project="$(BuildVersionFile)" /> + + <PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'"> + <VersionToRestore Condition="'$(StableVersion)' != ''">$(StableVersion)</VersionToRestore> + <VersionToRestore Condition="'$(VersionToRestore)' == ''">$(PackageVersion)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionToRestore> + <DesiredPackageVersionArg>$(VersionToRestore)</DesiredPackageVersionArg> + </PropertyGroup> <Import Project="tests.targets" /> <Import Project="publishdependency.targets" /> @@ -326,6 +335,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <PropertyGroup> <TargetRid Condition="'$(RuntimeId)' != ''">$(RuntimeId)</TargetRid> <TargetRid Condition="'$(RuntimeId)' == ''">$(TestNugetRuntimeId)</TargetRid> + <DesiredPackageVersionArg Condition="'$(DesiredPackageVersionArg)' == ''">$(CoreClrPackageVersion)</DesiredPackageVersionArg> </PropertyGroup> <Target Name="CreateTestOverlay"> diff --git a/tests/runtest.sh b/tests/runtest.sh index e0458133da..439bbb66e6 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -51,6 +51,7 @@ function print_usage { echo ' --jitforcerelocs : Runs the tests with COMPlus_ForceRelocs=1' echo ' --jitdisasm : Runs jit-dasm on the tests' echo ' --gcstresslevel=<n> : Runs the tests with COMPlus_GCStress=n' + echo ' --ilasmroundtrip : Runs ilasm round trip on the tests' echo ' 0: None 1: GC on all allocs and '"'easy'"' places' echo ' 2: GC on transitions to preemptive GC 4: GC on every allowable JITed instr' echo ' 8: GC on every allowable NGEN instr 16: GC only on a unique stack trace' @@ -406,7 +407,7 @@ function precompile_overlay_assemblies { $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 1> $filename.stdout 2>$filename.stderr local exitCode=$? if [[ $exitCode != 0 ]]; then - if grep -q -e '(COR_E_ASSEMBLYEXPECTED)' $filename.stderr; then + if grep -q -e '0x80131018' $filename.stderr; then printf "\n\t$filename is not a managed assembly.\n\n" else echo Unable to precompile $filename. @@ -975,6 +976,7 @@ illinker= verbose=0 doCrossgen=0 jitdisasm=0 +ilasmroundtrip= for i in "$@" do @@ -1008,6 +1010,9 @@ do --jitdisasm) jitdisasm=1 ;; + --ilasmroundtrip) + ((ilasmroundtrip = 1)) + ;; --testRootDir=*) testRootDir=${i#*=} ;; @@ -1139,6 +1144,11 @@ if [[ ! "$jitdisasm" -eq 0 ]]; then export RunningJitDisasm=1 fi +if [ ! -z "$ilasmroundtrip" ]; then + echo "Running Ilasm round trip" + export RunningIlasmRoundTrip=1 +fi + # If this is a coverage run, make sure the appropriate args have been passed if [ "$CoreClrCoverage" == "ON" ] then @@ -1192,18 +1202,6 @@ else load_failing_tests fi -# Other architectures are not supported yet. -if [ "$ARCH" == "x64" ] -then - scriptPath=$(dirname $0) - ${scriptPath}/setup-runtime-dependencies.sh --outputDir=$coreOverlayDir -else - if [ "$ARCH" != "arm64" ] - then - echo "Skip preparing for GC stress test. Dependent package is not supported on this architecture." - fi -fi - export __TestEnv=$testEnv cd "$testRootDir" diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh index 209ab39869..98f35066d4 100755 --- a/tests/scripts/arm32_ci_script.sh +++ b/tests/scripts/arm32_ci_script.sh @@ -265,7 +265,9 @@ function cross_build_coreclr_with_docker { # For armel Tizen, we are going to construct RootFS on the fly. case $__linuxCodeName in tizen) - __dockerImage=" t2wish/dotnetcore:ubuntu1404_cross_prereqs_v4" + __dockerImage=" hqueue/dotnetcore:ubuntu1404_cross_prereqs_v4-tizen_rootfs" + __skipRootFS=1 + __dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.build" __runtimeOS="tizen.4.0.0" ;; *) @@ -381,7 +383,9 @@ function run_tests_using_docker { elif [ "$__buildArch" == "armel" ]; then case $__linuxCodeName in tizen) - __dockerImage=" t2wish/dotnetcore:ubuntu1404_cross_prereqs_v3" + __dockerImage=" hqueue/dotnetcore:ubuntu1404_cross_prereqs_v4-tizen_rootfs" + __skipRootFS=1 + __dockerEnvironmentVariables=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.test" ;; *) exit_with_error "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch" false diff --git a/tests/scripts/arm32_ci_test.sh b/tests/scripts/arm32_ci_test.sh index 2f0b03150b..3fb36e12ec 100755 --- a/tests/scripts/arm32_ci_test.sh +++ b/tests/scripts/arm32_ci_test.sh @@ -81,25 +81,11 @@ else fi if [ "$__abi" == "armel" ]; then - # TODO: Make use of a single Tizen rootfs for build and test - - # TODO-cleanup: the latest docker image already has mic installed. - # Prepare Tizen (armel) environment - #echo "deb http://download.tizen.org/tools/latest-release/Ubuntu_14.04 /" >> /etc/apt/sources.list - #apt-get update - #apt-get -y -qq --force-yes install mic - + # Prepare armel emulation environment pushd ${CORECLR_DIR}/cross/armel/tizen - mic --non-interactive create fs --pack-to=tizen.tar.gz tizen-dotnet.ks - if [ -d ${__ROOTFS_DIR} ]; then - mv ${__ROOTFS_DIR} ${__ROOTFS_DIR}_build - fi - mkdir -p ${__ROOTFS_DIR} - tar -zxf mic-output/tizen.tar.gz -C ${__ROOTFS_DIR} apt-get update apt-get -y -qq --force-yes --reinstall install qemu binfmt-support qemu-user-static __qemuARM=$(which qemu-arm-static) - cp $__qemuARM ${CORECLR_DIR}/cross/rootfs/armel/usr/bin/ cp $__qemuARM ${__ROOTFS_DIR}/usr/bin/ popd fi diff --git a/tests/scripts/arm64_post_build.py b/tests/scripts/arm64_post_build.py index 4ed8032fc2..62818c433b 100644 --- a/tests/scripts/arm64_post_build.py +++ b/tests/scripts/arm64_post_build.py @@ -34,8 +34,7 @@ from collections import defaultdict g_arm64ci_path = os.path.join(os.environ["USERPROFILE"], "bin") g_dotnet_url = "https://go.microsoft.com/fwlink/?LinkID=831469" -g_test_url = "https://clrjit.blob.core.windows.net/arm64ci/CoreCLR-Pri1Testing.zip" -g_x64_client_url = "https://clrjit.blob.core.windows.net/arm64ci/x64_client.zip" +g_x64_client_url = "https://clrjit.blob.core.windows.net/arm64ci/x64_client_live_tests.zip" ################################################################################ # Argument Parser @@ -88,6 +87,34 @@ def copy_core_root(core_root): except OSError as error: log("Core Root not copied. Error: %s" % error) + sys.exit(1) + + return new_location + +def copy_tests(test_location): + """ Copy the test directory to the current dir as "tests" + Args: + test_location (str): location of the tests directory + Returns: + copy_location (str): name of the location, for now hardcoded to tests + : for backcompat in the old system + """ + + new_location = "tests" + + # Delete used instances. + if os.path.isdir(new_location): + try: + shutil.rmtree(new_location) + except: + assert not os.path.isdir(new_location) + + try: + shutil.copytree(test_location, new_location) + + except OSError as error: + log("Test location not copied. Error: %s" % error) + sys.exit(1) return new_location @@ -249,15 +276,28 @@ def validate_args(args): def main(args): global g_arm64ci_path - global g_test_url repo_root, arch, build_type, scenario, key_location, force_update = validate_args(args) + cwd = os.getcwd() + os.chdir(repo_root) + + runtest_location = os.path.join(repo_root, "tests", "runtest.cmd") + args = [runtest_location, "GenerateLayoutOnly", arch, build_type] + subprocess.check_call(args) + + os.chdir(cwd) + core_root = os.path.join(repo_root, "bin", "Product", "Windows_NT.%s.%s" % (arch, build_type)) + test_location = os.path.join(repo_root, + "bin", + "tests", + "Windows_NT.%s.%s" % (arch, build_type)) + cli_location = setup_cli(force_update=force_update) add_item_to_path(cli_location) @@ -269,6 +309,9 @@ def main(args): core_root = copy_core_root(core_root) log("Copied core_root to %s." % core_root) + test_location = copy_tests(test_location) + log("Copied test location to %s." % test_location) + # Make sure the lst file is copied into the core_root lst_file = os.path.join(repo_root, "tests", arch, "Tests.lst") shutil.copy2(lst_file, core_root) @@ -280,7 +323,7 @@ def main(args): build_type, scenario, core_root, - g_test_url] + test_location] log(" ".join(args)) proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/tests/scripts/optdata/bootstrap.py b/tests/scripts/optdata/bootstrap.py index 1cf55fa70c..8dcecca779 100755 --- a/tests/scripts/optdata/bootstrap.py +++ b/tests/scripts/optdata/bootstrap.py @@ -7,12 +7,12 @@ """ import argparse -import json import os from os import path import shutil import subprocess import sys +import xml.etree.ElementTree as ET # Display the docstring if the user passes -h|--help argparse.ArgumentParser(description=__doc__).parse_args() @@ -24,8 +24,8 @@ NUGET_SRC_DIR = path.join(REPO_ROOT, 'src', '.nuget') assert path.exists(NUGET_SRC_DIR), \ "Expected %s to exist; please check whether REPO_ROOT is really %s" % (NUGET_SRC_DIR, REPO_ROOT) -ORIGIN_FILE = path.join(SCRIPT_ROOT, 'project.json') -TARGET_FILE = path.join(NUGET_SRC_DIR, 'optdata', 'project.json') +ORIGIN_FILE = path.join(SCRIPT_ROOT, 'optdata.csproj') +TARGET_FILE = path.join(NUGET_SRC_DIR, 'optdata', 'optdata.csproj') ARCH_LIST = ['x64', 'x86'] TOOL_LIST = ['IBC', 'PGO'] @@ -40,9 +40,12 @@ def get_buildos(): def get_optdata_version(tool): """Returns the version string specified in project.json for the given tool.""" - package_name = 'optimization.%s.CoreCLR' % (tool) - with open(ORIGIN_FILE) as json_file: - return json.load(json_file)['dependencies'][package_name] + element_name = { + 'IBC': 'IbcDataPackageVersion', + 'PGO': 'PgoDataPackageVersion', + }[tool] + root = ET.parse(ORIGIN_FILE) + return root.findtext('./PropertyGroup/{}'.format(element_name)) def get_optdata_dir(tool, arch): """Returns an absolute path to the directory that should contain optdata given a tool,arch""" diff --git a/tests/scripts/optdata/optdata.csproj b/tests/scripts/optdata/optdata.csproj new file mode 100644 index 0000000000..ac7360643f --- /dev/null +++ b/tests/scripts/optdata/optdata.csproj @@ -0,0 +1,29 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <TargetFramework>netstandard</TargetFramework> + <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> + <RuntimeIdentifiers>win7-x64;win7-x86;linux-x64</RuntimeIdentifiers> + </PropertyGroup> + + <PropertyGroup> + <PgoDataPackageVersion>99.99.99-test</PgoDataPackageVersion> + <IbcDataPackageVersion>99.99.99-test</IbcDataPackageVersion> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="optimization.PGO.CoreCLR" Version="$(PgoDataPackageVersion)" Condition="'$(PgoDataPackageVersion)'!=''" /> + <PackageReference Include="optimization.IBC.CoreCLR" Version="$(IbcDataPackageVersion)" Condition="'$(IbcDataPackageVersion)'!=''" /> + </ItemGroup> + + <Target Name="DumpPgoDataPackageVersion"> + <Message Importance="high" Text="$(PgoDataPackageVersion)" /> + </Target> + + <Target Name="DumpIbcDataPackageVersion"> + <Message Importance="high" Text="$(IbcDataPackageVersion)" /> + </Target> + +</Project> diff --git a/tests/scripts/optdata/project.json b/tests/scripts/optdata/project.json deleted file mode 100644 index ae8f9463c4..0000000000 --- a/tests/scripts/optdata/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "optimization.IBC.CoreCLR": "99.99.99-test", - "optimization.PGO.CoreCLR": "99.99.99-test" - }, - "frameworks": { - "netstandard": {} - }, - "runtimes": { - "win7-x64": {} - } -} diff --git a/tests/scripts/project.json b/tests/scripts/project.json index b3c3a15f62..394cd2f922 100644 --- a/tests/scripts/project.json +++ b/tests/scripts/project.json @@ -15,4 +15,4 @@ ] } } -} +}
\ No newline at end of file diff --git a/tests/scripts/run-gc-reliability-framework.cmd b/tests/scripts/run-gc-reliability-framework.cmd new file mode 100644 index 0000000000..f9a6ae277d --- /dev/null +++ b/tests/scripts/run-gc-reliability-framework.cmd @@ -0,0 +1,10 @@ +@rem Licensed to the .NET Foundation under one or more agreements. +@rem The .NET Foundation licenses this file to you under the MIT license. +@rem See the LICENSE file in the project root for more information. + +@echo off + +set CORE_ROOT=%CD%\bin\tests\Windows_NT.%1.%2\Tests\Core_Root +set FRAMEWORK_DIR=%CD%\bin\tests\Windows_NT.%1.%2\GC\Stress\Framework\ReliabilityFramework +powershell "%CORE_ROOT%\CoreRun.exe %FRAMEWORK_DIR%\ReliabilityFramework.exe %FRAMEWORK_DIR%\testmix_gc.config | tee stdout.txt" + diff --git a/tests/scripts/run-gc-reliability-framework.sh b/tests/scripts/run-gc-reliability-framework.sh new file mode 100755 index 0000000000..d1c200ef02 --- /dev/null +++ b/tests/scripts/run-gc-reliability-framework.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +export CORE_ROOT=`pwd`/bin/tests/Windows_NT.$1.$2/Tests/coreoverlay +FRAMEWORK_DIR=`pwd`/bin/tests/Windows_NT.$1.$2/GC/Stress/Framework/ReliabilityFramework +$CORE_ROOT/corerun $FRAMEWORK_DIR/ReliabilityFramework.exe $FRAMEWORK_DIR/testmix_gc.config | tee stdout.txt + diff --git a/tests/scripts/run-throughput-perf.py b/tests/scripts/run-throughput-perf.py index ee6e4a3c58..cc1e151b41 100644 --- a/tests/scripts/run-throughput-perf.py +++ b/tests/scripts/run-throughput-perf.py @@ -53,7 +53,6 @@ jit_list = { 'Windows_NT': { 'x64': 'clrjit.dll', 'x86': 'clrjit.dll', - 'x86jit32': 'compatjit.dll' }, 'Linux': { 'x64': 'libclrjit.so' @@ -126,7 +125,7 @@ def validate_args(args): if not helper(arg): raise Exception('Argument: %s is not valid.' % (arg)) - valid_archs = {'Windows_NT': ['x86', 'x64', 'x86jit32'], 'Linux': ['x64']} + valid_archs = {'Windows_NT': ['x86', 'x64'], 'Linux': ['x64']} valid_build_types = ['Release'] valid_run_types = ['rolling', 'private'] valid_os = ['Windows_NT', 'Ubuntu14.04'] @@ -281,9 +280,6 @@ def main(args): architecture, operating_system, os_group, build_type, run_type, clr_root, assembly_root, benchview_path = validate_args(args) arch = architecture - if architecture == 'x86jit32': - arch = 'x86' - current_dir = os.getcwd() jit = jit_list[os_group][architecture] crossgen = 'crossgen' diff --git a/tests/scripts/run-xunit-perf.cmd b/tests/scripts/run-xunit-perf.cmd index 7895b3f16e..e223a3bda9 100644 --- a/tests/scripts/run-xunit-perf.cmd +++ b/tests/scripts/run-xunit-perf.cmd @@ -5,7 +5,7 @@ @echo off @if defined _echo echo on -setlocal +setlocal ENABLEDELAYEDEXPANSION set ERRORLEVEL= set BENCHVIEW_RUN_TYPE=local set CORECLR_REPO=%CD% @@ -15,17 +15,27 @@ setlocal set TEST_CONFIG=Release set IS_SCENARIO_TEST= set USAGE_DISPLAYED= + set SHOULD_UPLOAD_TO_BENCHVIEW= + set BENCHVIEW_PATH= + set COLLECTION_FLAGS=stopwatch + set ETW_COLLECTION=Off + set STABILITY_PREFIX= + set BENCHVIEW_GROUP=CoreCLR + set HAS_WARMUP_RUN=--drop-first-value + set BETTER=desc call :parse_command_line_arguments %* if defined USAGE_DISPLAYED exit /b %ERRORLEVEL% - call :set_test_architecture || exit /b 1 - call :verify_core_overlay || exit /b 1 - call :set_perf_run_log || exit /b 1 - call :setup_sandbox || exit /b 1 + call :set_test_architecture || exit /b 1 + call :set_collection_config || exit /b 1 + call :verify_benchview_tools || exit /b 1 + call :verify_core_overlay || exit /b 1 + call :set_perf_run_log || exit /b 1 + call :setup_sandbox || exit /b 1 - call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" restore "%CORECLR_REPO%\tests\src\Common\PerfHarness\project.json" || exit /b 1 - call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" publish "%CORECLR_REPO%\tests\src\Common\PerfHarness\project.json" -c Release -o "%CORECLR_REPO%\sandbox" || exit /b 1 + call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" restore "%CORECLR_REPO%\tests\src\Common\PerfHarness\PerfHarness.csproj" || exit /b 1 + call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" publish "%CORECLR_REPO%\tests\src\Common\PerfHarness\PerfHarness.csproj" -c Release -o "%CORECLR_REPO%\sandbox" || exit /b 1 rem TODO: Remove the version of the package to copy. e.g.) if multiple version exist, then error out? call :run_cmd xcopy /sy "%CORECLR_REPO%\packages\Microsoft.Diagnostics.Tracing.TraceEvent\1.0.3-alpha-experimental\lib\native"\* . >> %RUNLOG% || exit /b 1 @@ -34,7 +44,6 @@ setlocal rem find and stage the tests set /A "LV_FAILURES=0" for /R %CORECLR_PERF% %%T in (*.%TEST_FILE_EXT%) do ( - rem Skip known failures call :run_benchmark %%T || ( set /A "LV_FAILURES+=1" ) @@ -60,17 +69,13 @@ rem **************************************************************************** setlocal set BENCHNAME=%~n1 set BENCHDIR=%~p1 - set PERFOUT=perf-%BENCHNAME% - set XMLOUT=%PERFOUT%.xml rem copy benchmark and any input files - call :run_cmd xcopy /s %~1 . >> %RUNLOG% || exit /b 1 + call :run_cmd xcopy /sy %~1 . >> %RUNLOG% || exit /b 1 if exist "%BENCHDIR%*.txt" ( - call :run_cmd xcopy /s %BENCHDIR%*.txt . >> %RUNLOG% || exit /b 1 + call :run_cmd xcopy /sy %BENCHDIR%*.txt . >> %RUNLOG% || exit /b 1 ) - set CORE_ROOT=%CORECLR_REPO%\sandbox - rem setup additional environment variables if DEFINED TEST_ENV ( if EXIST "%TEST_ENV%" ( @@ -78,13 +83,26 @@ setlocal ) ) - set BENCHNAME_LOG_FILE_NAME=%BENCHNAME%.log + echo/ + echo/ ---------- + echo/ Running %BENCHNAME% + echo/ ---------- + + rem CORE_ROOT environment variable is used by some benchmarks such as Roslyn / CscBench. + set CORE_ROOT=%CORECLR_REPO%\sandbox + + set LV_RUNID=Perf-%ETW_COLLECTION% + set BENCHNAME_LOG_FILE_NAME=%LV_RUNID%-%BENCHNAME%.log + set LV_CMD= if defined IS_SCENARIO_TEST ( - call :run_cmd corerun.exe "%CORECLR_REPO%\sandbox\%BENCHNAME%.%TEST_FILE_EXT%" --perf:runid Perf 1>"%BENCHNAME_LOG_FILE_NAME%" 2>&1 + set "LV_CMD=corerun.exe "%CORECLR_REPO%\sandbox\%BENCHNAME%.%TEST_FILE_EXT%" --perf:runid "%LV_RUNID%"" ) else ( - call :run_cmd corerun.exe PerfHarness.dll "%CORECLR_REPO%\sandbox\%BENCHNAME%.%TEST_FILE_EXT%" --perf:runid Perf 1>"%BENCHNAME_LOG_FILE_NAME%" 2>&1 + set "LV_CMD=%STABILITY_PREFIX% corerun.exe PerfHarness.dll "%CORECLR_REPO%\sandbox\%BENCHNAME%.%TEST_FILE_EXT%" --perf:runid "%LV_RUNID%" --perf:collect %COLLECTION_FLAGS%" ) + call :print_to_console $ !LV_CMD! + call :run_cmd !LV_CMD! 1>"%BENCHNAME_LOG_FILE_NAME%" 2>&1 + IF %ERRORLEVEL% NEQ 0 ( call :print_error corerun.exe exited with %ERRORLEVEL% code. if exist "%BENCHNAME_LOG_FILE_NAME%" type "%BENCHNAME_LOG_FILE_NAME%" @@ -92,15 +110,16 @@ setlocal ) rem optionally generate results for benchview - if not [%BENCHVIEW_PATH%] == [] ( + if exist "%BENCHVIEW_PATH%" ( call :generate_results_for_benchview || exit /b 1 - ) else ( - type "%XMLOUT%" | findstr /i /c:"test name" ) rem Save off the results to the root directory for recovery later in Jenkins - call :run_cmd xcopy "Perf-%BENCHNAME%*.xml" "%CORECLR_REPO%\" || exit /b 1 - call :run_cmd xcopy "Perf-%BENCHNAME%*.etl" "%CORECLR_REPO%\" || exit /b 1 + for %%e in (xml etl log) do ( + IF EXIST ".\%LV_RUNID%-%BENCHNAME%.%%e" ( + call :run_cmd xcopy /vy ".\%LV_RUNID%-%BENCHNAME%.%%e" .. || exit /b 1 + ) + ) exit /b 0 @@ -114,23 +133,51 @@ rem **************************************************************************** shift goto :parse_command_line_arguments ) + IF /I [%~1] == [-stabilityPrefix] ( + set STABILITY_PREFIX=%~2 + shift + shift + goto :parse_command_line_arguments + ) IF /I [%~1] == [-scenarioTest] ( set IS_SCENARIO_TEST=1 shift goto :parse_command_line_arguments ) + IF /I [%~1] == [-uploadtobenchview] ( + set SHOULD_UPLOAD_TO_BENCHVIEW=1 + shift + goto :parse_command_line_arguments + ) + IF /I [%~1] == [-nowarmup] ( + set HAS_WARMUP_RUN= + shift + goto :parse_command_line_arguments + ) + IF /I [%~1] == [-better] ( + set BETTER=%~2 + shift + shift + goto :parse_command_line_arguments + ) IF /I [%~1] == [-runtype] ( set BENCHVIEW_RUN_TYPE=%~2 shift shift goto :parse_command_line_arguments ) + IF /I [%~1] == [-collectionflags] ( + set COLLECTION_FLAGS=%~2 + shift + shift + goto :parse_command_line_arguments + ) IF /I [%~1] == [-library] ( set TEST_FILE_EXT=dll shift goto :parse_command_line_arguments ) - IF /I [%~1] == [-uploadtobenchview] ( + IF /I [%~1] == [-generatebenchviewdata] ( set BENCHVIEW_PATH=%~2 shift shift @@ -154,7 +201,12 @@ rem **************************************************************************** shift goto :parse_command_line_arguments ) - + IF /I [%~1] == [-group] ( + set BENCHVIEW_GROUP=%~2 + shift + shift + goto :parse_command_line_arguments + ) if /I [%~1] == [-?] ( call :USAGE exit /b 0 @@ -173,10 +225,18 @@ rem **************************************************************************** rem **************************************************************************** rem Sets the test architecture. rem **************************************************************************** - IF /I [%TEST_ARCHITECTURE%] == [x86jit32] ( - set TEST_ARCH=x86 - ) ELSE ( - set TEST_ARCH=%TEST_ARCHITECTURE% + set TEST_ARCH=%TEST_ARCHITECTURE% + exit /b 0 + +:verify_benchview_tools +rem **************************************************************************** +rem Verifies that the path to the benchview tools is correct. +rem **************************************************************************** + if defined BENCHVIEW_PATH ( + if not exist "%BENCHVIEW_PATH%" ( + call :print_error BenchView path: "%BENCHVIEW_PATH%" was specified, but it does not exist. + exit /b 1 + ) ) exit /b 0 @@ -191,6 +251,18 @@ rem **************************************************************************** ) exit /b 0 +:set_collection_config +rem **************************************************************************** +rem Set's the config based on the providers used for collection +rem **************************************************************************** + if /I [%COLLECTION_FLAGS%] == [stopwatch] ( + set ETW_COLLECTION=Off + ) else ( + set ETW_COLLECTION=On + ) + exit /b 0 + + :set_perf_run_log rem **************************************************************************** rem Sets the script's output log file. @@ -207,7 +279,7 @@ rem **************************************************************************** rem Creates the sandbox folder used by the script to copy binaries locally, rem and execute benchmarks. rem **************************************************************************** - if exist sandbox rd /s /q sandbox + if exist sandbox rmdir /s /q sandbox if exist sandbox call :print_error Failed to remove the sandbox folder& exit /b 1 if not exist sandbox mkdir sandbox if not exist sandbox call :print_error Failed to create the sandbox folder& exit /b 1 @@ -224,15 +296,19 @@ rem **************************************************************************** set LV_MEASUREMENT_ARGS= set LV_MEASUREMENT_ARGS=%LV_MEASUREMENT_ARGS% %BENCHVIEW_MEASUREMENT_PARSER% - set LV_MEASUREMENT_ARGS=%LV_MEASUREMENT_ARGS% "Perf-%BENCHNAME%.xml" - set LV_MEASUREMENT_ARGS=%LV_MEASUREMENT_ARGS% --better desc - set LV_MEASUREMENT_ARGS=%LV_MEASUREMENT_ARGS% --drop-first-value + set LV_MEASUREMENT_ARGS=%LV_MEASUREMENT_ARGS% --better %BETTER% + set LV_MEASUREMENT_ARGS=%LV_MEASUREMENT_ARGS% %HAS_WARMUP_RUN% set LV_MEASUREMENT_ARGS=%LV_MEASUREMENT_ARGS% --append - call :run_cmd py.exe "%BENCHVIEW_PATH%\measurement.py" %LV_MEASUREMENT_ARGS% - IF %ERRORLEVEL% NEQ 0 ( - call :print_error Failed to generate BenchView measurement data. - exit /b 1 + + for /f %%f in ('dir /b Perf-*%BENCHNAME%.xml 2^>nul') do ( + call :run_cmd py.exe "%BENCHVIEW_PATH%\measurement.py" %LV_MEASUREMENT_ARGS% %%f + + IF !ERRORLEVEL! NEQ 0 ( + call :print_error Failed to generate BenchView measurement data. + exit /b 1 + ) ) + endlocal& exit /b %ERRORLEVEL% :upload_to_benchview @@ -244,23 +320,28 @@ setlocal set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --build ..\build.json set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --machine-data ..\machinedata.json set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --metadata ..\submission-metadata.json - set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --group "CoreCLR" + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --group "%BENCHVIEW_GROUP%" set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --type "%BENCHVIEW_RUN_TYPE%" set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config-name "%TEST_CONFIG%" set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config Configuration "%TEST_CONFIG%" set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config OS "Windows_NT" + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config Profile "%ETW_COLLECTION%" set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --arch "%TEST_ARCHITECTURE%" set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --machinepool "PerfSnake" + call :run_cmd py.exe "%BENCHVIEW_PATH%\submission.py" measurement.json %LV_SUBMISSION_ARGS% + IF %ERRORLEVEL% NEQ 0 ( call :print_error Creating BenchView submission data failed. exit /b 1 ) - call :run_cmd py.exe "%BENCHVIEW_PATH%\upload.py" submission.json --container coreclr - IF %ERRORLEVEL% NEQ 0 ( - call :print_error Uploading to BenchView failed. - exit /b 1 + if defined SHOULD_UPLOAD_TO_BENCHVIEW ( + call :run_cmd py.exe "%BENCHVIEW_PATH%\upload.py" submission.json --container coreclr + IF !ERRORLEVEL! NEQ 0 ( + call :print_error Uploading to BenchView failed. + exit /b 1 + ) ) exit /b %ERRORLEVEL% @@ -269,17 +350,25 @@ rem **************************************************************************** rem Script's usage. rem **************************************************************************** set USAGE_DISPLAYED=1 - echo run-xunit-perf.cmd -testBinLoc ^<path_to_tests^> [-library] [-arch] ^<x86^|x64^> [-configuration] ^<Release^|Debug^> [-uploadToBenchview] ^<path_to_benchview_tools^> [-runtype] ^<rolling^|private^> [-scenarioTest] + echo run-xunit-perf.cmd -testBinLoc ^<path_to_tests^> [-library] [-arch] ^<x86^|x64^> [-configuration] ^<Release^|Debug^> [-generateBenchviewData] ^<path_to_benchview_tools^> [-warmup] [-better] ^<asc ^| desc^> [-group] ^<group^> [-runtype] ^<rolling^|private^> [-scenarioTest] [-collectionFlags] ^<default^+CacheMisses^+InstructionRetired^+BranchMispredictions^+gcapi^> echo/ echo For the path to the tests you can pass a parent directory and the script will grovel for echo all tests in subdirectories and run them. echo The library flag denotes whether the tests are build as libraries (.dll) or an executable (.exe) echo Architecture defaults to x64 and configuration defaults to release. - echo -uploadtoBenchview is used to specify a path to the Benchview tooling and when this flag is - echo set we will upload the results of the tests to the coreclr container in benchviewupload. + echo -generateBenchviewData is used to specify a path to the Benchview tooling and when this flag is + echo set we will generate the results for upload to benchview. + echo -uploadToBenchview If this flag is set the generated benchview test data will be uploaded. + echo -nowarmup specifies not to discard the results of the first run + echo -better whether it is better to have ascending or descending numbers for the benchmark + echo -group specifies the Benchview group to which this data should be uploaded (default CoreCLR) echo Runtype sets the runtype that we upload to Benchview, rolling for regular runs, and private for echo PRs. echo -scenarioTest should be included if you are running a scenario benchmark. + echo -collectionFlags This is used to specify what collectoin flags get passed to the performance + echo harness that is doing the test running. If this is not specified we only use stopwatch. + echo Other flags are "default", which is the whatever the test being run specified, "CacheMisses", + echo "BranchMispredictions", and "InstructionsRetired". exit /b %ERRORLEVEL% :print_error @@ -287,19 +376,17 @@ rem **************************************************************************** rem Function wrapper that unifies how errors are output by the script. rem Functions output to the standard error. rem **************************************************************************** - echo [%DATE%][%TIME:~0,-3%][ERROR] %* 1>&2 + call :print_to_console [ERROR] %* 1>&2 exit /b %ERRORLEVEL% :print_to_console rem **************************************************************************** -rem Sends text to the console screen, no matter what (even when the script's -rem output is redirected). This can be useful to provide information on where -rem the script is executing. +rem Sends text to the console screen. This can be useful to provide +rem information on where the script is executing. rem **************************************************************************** - if defined _debug ( - echo [%DATE%][%TIME:~0,-3%] %* >CON - ) - echo [%DATE%][%TIME:~0,-3%] %* + echo/ + echo/%USERNAME%@%COMPUTERNAME% "%CD%" + echo/[%DATE%][%TIME:~0,-3%] %* exit /b %ERRORLEVEL% :run_cmd @@ -315,19 +402,3 @@ rem **************************************************************************** call :print_to_console $ %* call %* exit /b %ERRORLEVEL% - -:skip_failures -rem **************************************************************************** -rem Skip known failures -rem **************************************************************************** - IF /I [%TEST_ARCHITECTURE%] == [x86jit32] ( - IF /I "%~1" == "CscBench" ( - rem https://github.com/dotnet/coreclr/issues/11088 - exit /b 1 - ) - IF /I "%~1" == "SciMark2" ( - rem https://github.com/dotnet/coreclr/issues/11089 - exit /b 1 - ) - ) - exit /b 0 diff --git a/tests/scripts/run-xunit-perf.sh b/tests/scripts/run-xunit-perf.sh index 6f49bf6e0a..e6758e59fb 100755 --- a/tests/scripts/run-xunit-perf.sh +++ b/tests/scripts/run-xunit-perf.sh @@ -1,5 +1,13 @@ #!/usr/bin/env bash +function run_command { + echo "" + echo $USER@`hostname` "$PWD" + echo `date +"[%m/%d/%Y %H:%M:%S]"`" $ $@" + "$@" + return $? +} + function print_usage { echo '' echo 'CoreCLR perf test script on Linux.' @@ -14,29 +22,26 @@ function print_usage { echo ' --coreFxBinDir="corefx/bin/Linux.AnyCPU.Debug"' echo '' echo 'Required arguments:' - echo ' --testRootDir=<path> : Root directory of the test build (e.g. coreclr/bin/tests/Windows_NT.x64.Debug).' - echo ' --testNativeBinDir=<path> : Directory of the native CoreCLR test build (e.g. coreclr/bin/obj/Linux.x64.Debug/tests).' + echo ' --testRootDir=<path> : Root directory of the test build (e.g. coreclr/bin/tests/Windows_NT.x64.Debug).' + echo ' --testNativeBinDir=<path> : Directory of the native CoreCLR test build (e.g. coreclr/bin/obj/Linux.x64.Debug/tests).' echo ' (Also required: Either --coreOverlayDir, or all of the switches --coreOverlayDir overrides)' echo '' echo 'Optional arguments:' - echo ' --coreOverlayDir=<path> : Directory containing core binaries and test dependencies. If not specified, the' - echo ' default is testRootDir/Tests/coreoverlay. This switch overrides --coreClrBinDir,' - echo ' --mscorlibDir, and --coreFxBinDir.' - echo ' --coreClrBinDir=<path> : Directory of the CoreCLR build (e.g. coreclr/bin/Product/Linux.x64.Debug).' - echo ' --mscorlibDir=<path> : Directory containing the built mscorlib.dll. If not specified, it is expected to be' + echo ' --coreOverlayDir=<path> : Directory containing core binaries and test dependencies. If not specified, the' + echo ' default is testRootDir/Tests/coreoverlay. This switch overrides --coreClrBinDir,' + echo ' --mscorlibDir, and --coreFxBinDir.' + echo ' --coreClrBinDir=<path> : Directory of the CoreCLR build (e.g. coreclr/bin/Product/Linux.x64.Debug).' + echo ' --mscorlibDir=<path> : Directory containing the built mscorlib.dll. If not specified, it is expected to be' echo ' in the directory specified by --coreClrBinDir.' - echo ' --coreFxBinDir="<path>" : The path to the unpacked runtime folder that is produced as part of a CoreFX build' - echo ' --uploadToBenchview : Specify this flag in order to have the results of the run uploaded to Benchview.' - echo ' This also requires that the os flag and runtype flag to be set. Lastly you must' - echo ' also have the BV_UPLOAD_SAS_TOKEN set to a SAS token for the Benchview upload container' - echo ' --benchViewOS=<os> : Specify the os that will be used to insert data into Benchview.' - echo ' --runType=<private|rolling> : Specify the runType for Benchview.' + echo ' --coreFxBinDir="<path>" : The path to the unpacked runtime folder that is produced as part of a CoreFX build' + echo ' --generatebenchviewdata : BenchView tools directory.' + echo ' --uploadToBenchview : Specify this flag in order to have the results of the run uploaded to Benchview.' + echo ' This requires that the generatebenchviewdata, os and runtype flags to be set, and' + echo ' also have the BV_UPLOAD_SAS_TOKEN set to a SAS token for the Benchview upload container' + echo ' --benchViewOS=<os> : Specify the os that will be used to insert data into Benchview.' + echo ' --runType=<local|private|rolling> : Specify the runType for Benchview. [Default: local]' } -# Variables for xUnit-style XML output. XML format: https://xunit.github.io/docs/format-xml-v2.html -xunitOutputPath= -xunitTestOutputPath= - # libExtension determines extension for dynamic library files OSName=$(uname -s) libExtension= @@ -59,95 +64,6 @@ case $OSName in ;; esac -function xunit_output_end { - local errorSource=$1 - local errorMessage=$2 - - local errorCount - if [ -z "$errorSource" ]; then - ((errorCount = 0)) - else - ((errorCount = 1)) - fi - - echo '<?xml version="1.0" encoding="utf-8"?>' >>"$xunitOutputPath" - echo '<assemblies>' >>"$xunitOutputPath" - - local line - - # <assembly ...> - line=" " - line="${line}<assembly" - line="${line} name=\"CoreClrTestAssembly\"" - line="${line} total=\"${countTotalTests}\"" - line="${line} passed=\"${countPassedTests}\"" - line="${line} failed=\"${countFailedTests}\"" - line="${line} skipped=\"${countSkippedTests}\"" - line="${line} errors=\"${errorCount}\"" - line="${line}>" - echo "$line" >>"$xunitOutputPath" - - # <collection ...> - line=" " - line="${line}<collection" - line="${line} name=\"CoreClrTestCollection\"" - line="${line} total=\"${countTotalTests}\"" - line="${line} passed=\"${countPassedTests}\"" - line="${line} failed=\"${countFailedTests}\"" - line="${line} skipped=\"${countSkippedTests}\"" - line="${line}>" - echo "$line" >>"$xunitOutputPath" - - # <test .../> <test .../> ... - if [ -f "$xunitTestOutputPath" ]; then - cat "$xunitTestOutputPath" >>"$xunitOutputPath" - rm -f "$xunitTestOutputPath" - fi - - # </collection> - line=" " - line="${line}</collection>" - echo "$line" >>"$xunitOutputPath" - - if [ -n "$errorSource" ]; then - # <errors> - line=" " - line="${line}<errors>" - echo "$line" >>"$xunitOutputPath" - - # <error ...> - line=" " - line="${line}<error" - line="${line} type=\"TestHarnessError\"" - line="${line} name=\"${errorSource}\"" - line="${line}>" - echo "$line" >>"$xunitOutputPath" - - # <failure .../> - line=" " - line="${line}<failure>${errorMessage}</failure>" - echo "$line" >>"$xunitOutputPath" - - # </error> - line=" " - line="${line}</error>" - echo "$line" >>"$xunitOutputPath" - - # </errors> - line=" " - line="${line}</errors>" - echo "$line" >>"$xunitOutputPath" - fi - - # </assembly> - line=" " - line="${line}</assembly>" - echo "$line" >>"$xunitOutputPath" - - # </assemblies> - echo '</assemblies>' >>"$xunitOutputPath" -} - function exit_with_error { local errorSource=$1 local errorMessage=$2 @@ -158,10 +74,11 @@ function exit_with_error { fi echo "$errorMessage" - xunit_output_end "$errorSource" "$errorMessage" if ((printUsage != 0)); then print_usage fi + + echo "Exiting script with error code: $EXIT_CODE_EXCEPTION" exit $EXIT_CODE_EXCEPTION } @@ -185,11 +102,12 @@ function create_core_overlay { if [ -n "$coreOverlayDir" ]; then export CORE_ROOT="$coreOverlayDir" - return + return 0 fi - # Check inputs to make sure we have enough information to create the core layout. $testRootDir/Tests/Core_Root should - # already exist and contain test dependencies that are not built. + # Check inputs to make sure we have enough information to create the core + # layout. $testRootDir/Tests/Core_Root should already exist and contain test + # dependencies that are not built. local testDependenciesDir=$testRootDir/Tests/Core_Root if [ ! -d "$testDependenciesDir" ]; then exit_with_error "$errorSource" "Did not find the test dependencies directory: $testDependenciesDir" @@ -208,13 +126,30 @@ function create_core_overlay { coreOverlayDir=$testRootDir/Tests/coreoverlay export CORE_ROOT="$coreOverlayDir" if [ -e "$coreOverlayDir" ]; then - rm -f -r "$coreOverlayDir" + rm -rf "$coreOverlayDir" || exit 1 fi + mkdir "$coreOverlayDir" - cp -f -v "$coreFxBinDir"/* "$coreOverlayDir/" 2>/dev/null - cp -f -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null - cp -n -v "$testDependenciesDir"/* "$coreOverlayDir/" 2>/dev/null + cp -f -v "$coreFxBinDir/"* "$coreOverlayDir/" || exit 2 + cp -f -p -v "$coreClrBinDir/"* "$coreOverlayDir/" # || exit 3 + if [ -d "$mscorlibDir/bin" ]; then + cp -f -v "$mscorlibDir/bin/"* "$coreOverlayDir/" || exit 4 + fi + cp -f -v "$testDependenciesDir/"xunit* "$coreOverlayDir/" || exit 5 + cp -n -v "$testDependenciesDir/"* "$coreOverlayDir/" # || exit 6 + if [ -f "$coreOverlayDir/mscorlib.ni.dll" ]; then + # Test dependencies come from a Windows build, and mscorlib.ni.dll would be the one from Windows + rm -f "$coreOverlayDir/mscorlib.ni.dll" || exit 7 + fi + if [ -f "$coreOverlayDir/System.Private.CoreLib.ni.dll" ]; then + # Test dependencies come from a Windows build, and System.Private.CoreLib.ni.dll would be the one from Windows + rm -f "$coreOverlayDir/System.Private.CoreLib.ni.dll" || exit 8 + fi + + copy_test_native_bin_to_test_root || exit 9 + + return 0 } function precompile_overlay_assemblies { @@ -227,19 +162,19 @@ function precompile_overlay_assemblies { for fileToPrecompile in ${filesToPrecompile} do local filename=${fileToPrecompile} - echo Precompiling $filename + echo "Precompiling $filename" $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 2>/dev/null local exitCode=$? if [ $exitCode == -2146230517 ]; then - echo $filename is not a managed assembly. + echo "$filename is not a managed assembly." elif [ $exitCode != 0 ]; then - echo Unable to precompile $filename. + echo "Unable to precompile $filename." else - echo Successfully precompiled $filename + echo "Successfully precompiled $filename" fi done else - echo Skipping crossgen of FX assemblies. + echo "Skipping crossgen of FX assemblies." fi } @@ -279,8 +214,14 @@ coreClrBinDir= mscorlibDir= coreFxBinDir= uploadToBenchview= -benchViewOS= -runType= +benchViewOS=`lsb_release -i -s``lsb_release -r -s` +runType=local +BENCHVIEW_TOOLS_PATH= +benchViewGroup=CoreCLR +perfCollection= +collectionflags=stopwatch +hasWarmupRun=--drop-first-value +stabilityPrefix= for i in "$@" do @@ -307,12 +248,21 @@ do --coreFxBinDir=*) coreFxBinDir=${i#*=} ;; - --benchViewOS=*) + --benchViewOS=*) benchViewOS=${i#*=} ;; - --runType=*) + --runType=*) runType=${i#*=} ;; + --collectionflags=*) + collectionflags=${i#*=} + ;; + --generatebenchviewdata=*) + BENCHVIEW_TOOLS_PATH=${i#*=} + ;; + --stabilityPrefix=*) + stabilityPrefix=${i#*=} + ;; --uploadToBenchview) uploadToBenchview=TRUE ;; @@ -333,69 +283,101 @@ if [ ! -d "$testRootDir" ]; then echo "Directory specified by --testRootDir does not exist: $testRootDir" exit $EXIT_CODE_EXCEPTION fi - -# Copy native interop test libraries over to the mscorlib path in -# order for interop tests to run on linux. -if [ -z "$mscorlibDir" ]; then - mscorlibDir=$coreClrBinDir +if [ ! -z "$BENCHVIEW_TOOLS_PATH" ] && { [ ! -d "$BENCHVIEW_TOOLS_PATH" ]; }; then + echo BenchView path: "$BENCHVIEW_TOOLS_PATH" was specified, but it does not exist. + exit $EXIT_CODE_EXCEPTION fi -if [ -d "$mscorlibDir" ] && [ -d "$mscorlibDir/bin" ]; then - cp $mscorlibDir/bin/* $mscorlibDir +if [ "$collectionflags" == "stopwatch" ]; then + perfCollection=Off +else + perfCollection=On fi # Install xunit performance packages -export NUGET_PACKAGES=$testNativeBinDir/../../../../packages -echo "NUGET_PACKAGES = $NUGET_PACKAGES" +CORECLR_REPO=$testNativeBinDir/../../../.. +DOTNETCLI_PATH=$CORECLR_REPO/Tools/dotnetcli -pushd $testNativeBinDir/../../../../tests/scripts -$testNativeBinDir/../../../../Tools/dotnetcli/dotnet restore --fallbacksource https://dotnet.myget.org/F/dotnet-buildtools/ --fallbacksource https://dotnet.myget.org/F/dotnet-core/ -popd +export NUGET_PACKAGES=$CORECLR_REPO/packages # Creat coreoverlay dir which contains all dependent binaries -create_core_overlay -precompile_overlay_assemblies -copy_test_native_bin_to_test_root +create_core_overlay || { echo "Creating core overlay failed."; exit 1; } +precompile_overlay_assemblies || { echo "Precompiling overlay assemblies failed."; exit 1; } # Deploy xunit performance packages cd $CORE_ROOT -echo "CORE_ROOT dir = $CORE_ROOT" DO_SETUP=TRUE - if [ ${DO_SETUP} == "TRUE" ]; then -cp $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.runner.cli/1.0.0-alpha-build0040/lib/netstandard1.3/Microsoft.DotNet.xunit.performance.runner.cli.dll . -cp $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.analysis.cli/1.0.0-alpha-build0040/lib/netstandard1.3/Microsoft.DotNet.xunit.performance.analysis.cli.dll . -cp $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.run.core/1.0.0-alpha-build0040/lib/dotnet/*.dll . + $DOTNETCLI_PATH/dotnet restore $CORECLR_REPO/tests/src/Common/PerfHarness/PerfHarness.csproj || { echo "dotnet restore failed."; exit 1; } + $DOTNETCLI_PATH/dotnet publish $CORECLR_REPO/tests/src/Common/PerfHarness/PerfHarness.csproj -c Release -o "$coreOverlayDir" || { echo "dotnet publish failed."; exit 1; } fi # Run coreclr performance tests -echo "Test root dir is: $testRootDir" +echo "Test root dir: $testRootDir" tests=($(find $testRootDir/JIT/Performance/CodeQuality -name '*.exe') $(find $testRootDir/performance/perflab/PerfLab -name '*.dll')) -echo "current dir is $PWD" -rm measurement.json +if [ -f measurement.json ]; then + rm measurement.json || exit $EXIT_CODE_EXCEPTION; +fi + for testcase in ${tests[@]}; do + directory=$(dirname "$testcase") + filename=$(basename "$testcase") + filename="${filename%.*}" -test=$(basename $testcase) -testname=$(basename $testcase .exe) -echo "....Running $testname" -cp $testcase . -cp $testcase-*.txt . - -chmod u+x ./corerun -echo "./corerun Microsoft.DotNet.xunit.performance.runner.cli.dll $test -runner xunit.console.netcore.exe -runnerhost ./corerun -verbose -runid perf-$testname" -./corerun Microsoft.DotNet.xunit.performance.runner.cli.dll $test -runner xunit.console.netcore.exe -runnerhost ./corerun -verbose -runid perf-$testname -echo "./corerun Microsoft.DotNet.xunit.performance.analysis.cli.dll perf-$testname.xml -xml perf-$testname-summary.xml" -./corerun Microsoft.DotNet.xunit.performance.analysis.cli.dll perf-$testname.xml -xml perf-$testname-summary.xml -if [ "$uploadToBenchview" == "TRUE" ] - then - python3.5 ../../../../../tests/scripts/Microsoft.BenchView.JSONFormat/tools/measurement.py xunit perf-$testname.xml --better desc --drop-first-value --append -fi + test=$(basename $testcase) + testname=$(basename $testcase .exe) + + cp $testcase . || exit 1 + if [ stat -t "$directory/$filename"*.txt 1>/dev/null 2>&1 ]; then + cp "$directory/$filename"*.txt . || exit 1 + fi + + # TODO: Do we need this here. + chmod u+x ./corerun + + echo "" + echo "----------" + echo " Running $testname" + echo "----------" + run_command $stabilityPrefix ./corerun PerfHarness.dll $test --perf:runid Perf --perf:collect $collectionflags 1>"Perf-$filename.log" 2>&1 || exit 1 + if [ -d "$BENCHVIEW_TOOLS_PATH" ]; then + run_command python3.5 "$BENCHVIEW_TOOLS_PATH/measurement.py" xunit "Perf-$filename.xml" --better desc $hasWarmupRun --append || { + echo [ERROR] Failed to generate BenchView data; + exit 1; + } + fi + + # Rename file to be archived by Jenkins. + mv -f "Perf-$filename.log" "$CORECLR_REPO/Perf-$filename-$perfCollection.log" || { + echo [ERROR] Failed to move "Perf-$filename.log" to "$CORECLR_REPO". + exit 1; + } + mv -f "Perf-$filename.xml" "$CORECLR_REPO/Perf-$filename-$perfCollection.xml" || { + echo [ERROR] Failed to move "Perf-$filename.xml" to "$CORECLR_REPO". + exit 1; + } done -if [ "$uploadToBenchview" == "TRUE" ] - then - python3.5 ../../../../../tests/scripts/Microsoft.BenchView.JSONFormat/tools/submission.py measurement.json --build ../../../../../build.json --machine-data ../../../../../machinedata.json --metadata ../../../../../submission-metadata.json --group "CoreCLR" --type "$runType" --config-name "Release" --config Configuration "Release" --config OS "$benchViewOS" --arch "x64" --machinepool "Perfsnake" - python3.5 ../../../../../tests/scripts/Microsoft.BenchView.JSONFormat/tools/upload.py submission.json --container coreclr + +if [ -d "$BENCHVIEW_TOOLS_PATH" ]; then + args=measurement.json + args+=" --build ../../../../../build.json" + args+=" --machine-data ../../../../../machinedata.json" + args+=" --metadata ../../../../../submission-metadata.json" + args+=" --group $benchViewGroup" + args+=" --type $runType" + args+=" --config-name Release" + args+=" --config Configuration Release" + args+=" --config OS $benchViewOS" + args+=" --config Profile $perfCollection" + args+=" --arch x64" + args+=" --machinepool Perfsnake" + run_command python3.5 "$BENCHVIEW_TOOLS_PATH/submission.py" $args || { + echo [ERROR] Failed to generate BenchView submission data; + exit 1; + } +fi + +if [ -d "$BENCHVIEW_TOOLS_PATH" ] && { [ "$uploadToBenchview" == "TRUE" ]; }; then + run_command python3.5 "$BENCHVIEW_TOOLS_PATH/upload.py" submission.json --container coreclr fi -mkdir ../../../../../sandbox -cp *.xml ../../../../../sandbox diff --git a/tests/scripts/scripts.csproj b/tests/scripts/scripts.csproj new file mode 100644 index 0000000000..b1a1aab6e5 --- /dev/null +++ b/tests/scripts/scripts.csproj @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <ItemGroup> + <PackageReference Include="Microsoft.DotNet.xunit.performance.run.core"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.xunit.performance.analysis.cli"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.xunit.performance.runner.cli"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.xunit.performance"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite"> + <Version>1.0.0-prerelease-00629-04</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.3</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <Import Project="$(MSBuildThisFileDirectory)..\src\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/setup-runtime-dependencies.cmd b/tests/setup-runtime-dependencies.cmd deleted file mode 100755 index 0079d42f60..0000000000 --- a/tests/setup-runtime-dependencies.cmd +++ /dev/null @@ -1,145 +0,0 @@ -@if not defined _echo @echo off -setlocal - -set __ThisScriptShort=%0 -set __ThisScriptFull=%~f0 -set __ThisScriptPath=%~dp0 - -REM ========================================================================================= -REM === -REM === Parse arguments -REM === -REM ========================================================================================= - -set __OutputDir= -set __Arch= - -:Arg_Loop -if "%1" == "" goto ArgsDone - -if /i "%1" == "/?" goto Usage -if /i "%1" == "-?" goto Usage -if /i "%1" == "/h" goto Usage -if /i "%1" == "-h" goto Usage -if /i "%1" == "/help" goto Usage -if /i "%1" == "-help" goto Usage - -if /i "%1" == "/arch" (set __Arch=%2&shift&shift&goto Arg_Loop) -if /i "%1" == "/outputdir" (set __OutputDir=%2&shift&shift&goto Arg_Loop) - -echo Invalid command-line argument: %1 -goto Usage - -:ArgsDone - -if not defined __OutputDir goto Usage -if not defined __Arch goto Usage - -REM Check if the platform is supported -if /i %__Arch% == "arm" ( - echo No runtime dependencies for Arm32. - exit /b 0 - ) - -REM ========================================================================================= -REM === -REM === Check if dotnet CLI and necessary directories exist -REM === -REM ========================================================================================= - -set __DotNetToolDir=%__ThisScriptPath%..\Tools -set __DotNetCmd=%__DotNetToolDir%\dotnetcli\dotnet.exe -set __PackageDir=%__ThisScriptPath%..\Packages -set __TmpDir=%Temp%\coreclr_gcstress_%RANDOM% - -REM Check if dotnet cli exists -if not exist "%__DotNetToolDir%" ( - echo Directory containing dotnet CLI does not exist: %__DotNetToolDir% - goto Fail -) -if not exist "%__DotNetCmd%" ( - echo dotnet.exe does not exist: %__DotNetCmd% - goto Fail -) - -REM Create directories needed -if not exist "%__PackageDir%" md "%__PackageDir%" -if not exist "%__OutputDir%" md "%__OutputDir%" - -REM Check and create a temp directory -if exist "%__TmpDir%" ( - rmdir /S /Q %__TmpDir% -) -mkdir %__TmpDir% - -REM Project.json path -set __JsonFilePath=%__TmpDir%\project.json - -REM ========================================================================================= -REM === -REM === Download packages -REM === -REM ========================================================================================= - -REM Write dependency information to project.json -echo { ^ - "dependencies": { ^ - "runtime.win7-%__Arch%.Microsoft.NETCore.CoreDisTools": "1.0.1-prerelease-*" ^ - }, ^ - "frameworks": { "dnxcore50": { } } ^ - } > "%__JsonFilePath%" - -echo JSON file: %__JsonFilePath% -type "%__JsonFilePath%" - -REM Download the package -echo Downloading CoreDisTools package -set DOTNETCMD="%__DotNetCmd%" restore "%__JsonFilePath%" --source https://dotnet.myget.org/F/dotnet-core/ --packages "%__PackageDir%" -echo %DOTNETCMD% -call %DOTNETCMD% -if errorlevel 1 goto Fail - -REM Get downloaded dll path -echo Locating coredistools.dll -FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s ^| findstr /R "runtime.win[0-9]*-%__Arch%"') DO set __LibPath=%%i -echo CoreDisTools library path: %__LibPath% -if not exist "%__LibPath%" ( - echo Failed to locate the downloaded library: %__LibPath% - goto Fail -) - -REM Copy library to output directory -echo Copy library: %__LibPath% to %__OutputDir% -copy /y "%__LibPath%" "%__OutputDir%" -if errorlevel 1 ( - echo Failed to copy %__LibPath% to %__OutputDir% - goto Fail -) - -REM Delete temporary files -if exist "%__TmpDir%" ( - rmdir /S /Q "%__TmpDir%" -) - -exit /b 0 - -:Fail -if exist "%__TmpDir%" ( - rmdir /S /Q "%__TmpDir%" -) -exit /b 1 - -REM ========================================================================================= -REM === -REM === Helper routines -REM === -REM ========================================================================================= - -:Usage -echo. -echo Download coredistools for GC stress testing -echo. -echo Usage: -echo %__ThisScriptShort% /arch ^<TargetArch^> /outputdir ^<coredistools_lib_install_path^> -echo. -exit /b 1 diff --git a/tests/setup-runtime-dependencies.sh b/tests/setup-runtime-dependencies.sh deleted file mode 100755 index 4573e084bd..0000000000 --- a/tests/setup-runtime-dependencies.sh +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env bash -# set -x - -# -# Constants -# -readonly EXIT_CODE_SUCCESS=0 - -# -# This script should be located in coreclr/tests. -# - -function print_usage { - echo '' - echo 'Download coredistools for GC stress testing' - echo '' - echo 'Command line:' - echo '' - echo './setup-gcstress.sh --outputDir=<coredistools_lib_install_path>' - echo '' - echo 'Required arguments:' - echo ' --outputDir=<path> : Directory to install libcoredistools.so' - echo '' -} - -# temorary directory -tmpDirPath= - -function exit_with_error { - local errorCode=$1 - local errorMsg=$2 - - if [ ! -z "$2" ]; then - echo $2 - fi - - if [ -e $tmpDirPath ]; then - rm -rf $tmpDirPath - fi - - exit $errorCode -} - -function handle_ctrl_c { - exit_with_error 1 'Aborted by Ctrl+C' - } - -# Register the Ctrl-C handler -trap handle_ctrl_c INT - -# Argument variables -libInstallDir= - -# Handle arguments -verbose=0 -for i in "$@" -do - case $i in - -h|--help) - exit $EXIT_CODE_SUCCESS - ;; - -v|--verbose) - verbose=1 - ;; - --outputDir=*) - libInstallDir=${i#*=} - ;; - *) - echo "Unknown switch: $i" - print_usage - exit $EXIT_CODE_SUCCESS - ;; - esac -done - -if [ -z "$libInstallDir" ]; then - echo "--libInstallDir is required." - print_usage - exit_with_error 1 -fi - -# create temp directory -tmpDirPath=`mktemp -d` -if [ ! -e $tmpDirPath ]; then - exit_with_error 1 "Cannot create a temporary directory" -fi - -# This script must be located in coreclr/tests. -scriptDir=$(cd "$(dirname "$0")"; pwd -P) - -echo "Running init-tools.sh" -$scriptDir/../init-tools.sh - -dotnetToolsDir=$scriptDir/../Tools -dotnetCmd=${dotnetToolsDir}/dotnetcli/dotnet -packageDir=${scriptDir}/../packages -jsonFilePath=${tmpDirPath}/project.json - -# Check tool directory -if [ ! -e $dotnetToolsDir ]; then - exit_with_error 1 'Directory containing dotnet commandline does not exist:'$dotnetToolsDir -fi -if [ ! -e $dotnetCmd ]; then - exit_with_error 1 'dotnet commandline does not exist:'$dotnetCmd -fi - -# make package directory -if [ ! -e $packageDir ]; then - mkdir -p $packageDir -fi - -# make output directory -if [ ! -e $libInstallDir ]; then - mkdir -p $libInstallDir -fi - -# Query runtime Id -rid=`$dotnetCmd --info | grep 'RID:' | sed 's/^ *RID: *//g'` -if [ -z "$rid" ]; then - exit_with_error 1 "Failed to query runtime Id" -fi - -# Write dependency information to project.json -packageName='runtime.'$rid'.Microsoft.NETCore.CoreDisTools' -echo { \ - \"dependencies\": { \ - \"$packageName\": \"1.0.1-prerelease-*\" \ - }, \ - \"frameworks\": { \"dnxcore50\": { } } \ - } > $jsonFilePath - -# Download the package -echo Downloading CoreDisTools package -bash -c -x "$dotnetCmd restore $jsonFilePath --source https://dotnet.myget.org/F/dotnet-core/ --packages $packageDir" -if [ $? -ne 0 ] -then - exit_with_error 1 "Failed to restore the package" -fi - -# Get library path -libPath=`find $packageDir | grep $rid | grep -m 1 libcoredistools` -if [ ! -e $libPath ]; then - exit_with_error 1 'Failed to locate the downloaded library' -fi - -# Copy library to output directory -echo 'Copy library:' $libPath '-->' $libInstallDir/ -cp -f $libPath $libInstallDir -if [ $? -ne 0 ] -then - exit_with_error 1 "Failed to copy the library" -fi - -# Delete temporary files -rm -rf $tmpDirPath - -# Return success -exit $EXIT_CODE_SUCCESS - diff --git a/tests/skipCrossGenFiles.arm.txt b/tests/skipCrossGenFiles.arm.txt index df66983baa..2e12456c1b 100644 --- a/tests/skipCrossGenFiles.arm.txt +++ b/tests/skipCrossGenFiles.arm.txt @@ -1,2 +1,3 @@ mscorlib.dll System.Runtime.WindowsRuntime.UI.Xaml.dll +System.Private.CoreLib.dll diff --git a/tests/skipCrossGenFiles.arm64.txt b/tests/skipCrossGenFiles.arm64.txt index 53eec85069..ee3972bb75 100644 --- a/tests/skipCrossGenFiles.arm64.txt +++ b/tests/skipCrossGenFiles.arm64.txt @@ -3,3 +3,4 @@ Microsoft.CodeAnalysis.VisualBasic.dll System.Net.NameResolution.dll System.Net.Sockets.dll System.Net.Primitives.dll +System.Private.CoreLib.dll diff --git a/tests/skipCrossGenFiles.x64.txt b/tests/skipCrossGenFiles.x64.txt index df66983baa..2e12456c1b 100644 --- a/tests/skipCrossGenFiles.x64.txt +++ b/tests/skipCrossGenFiles.x64.txt @@ -1,2 +1,3 @@ mscorlib.dll System.Runtime.WindowsRuntime.UI.Xaml.dll +System.Private.CoreLib.dll diff --git a/tests/skipCrossGenFiles.x86.txt b/tests/skipCrossGenFiles.x86.txt index df66983baa..2e12456c1b 100644 --- a/tests/skipCrossGenFiles.x86.txt +++ b/tests/skipCrossGenFiles.x86.txt @@ -1,2 +1,3 @@ mscorlib.dll System.Runtime.WindowsRuntime.UI.Xaml.dll +System.Private.CoreLib.dll diff --git a/tests/src/CLRTest.CrossGen.targets b/tests/src/CLRTest.CrossGen.targets index d91bdcc7ea..6bb5cdb103 100644 --- a/tests/src/CLRTest.CrossGen.targets +++ b/tests/src/CLRTest.CrossGen.targets @@ -40,11 +40,14 @@ WARNING: When setting properties based on their current state (for example: if [ ! -z ${RunCrossGen+x} ]%3B then export COMPlus_ZapRequire=$(ZapRequire) export COMPlus_ZapRequireList=$(MSBuildProjectName) - if [ ! -f $(MSBuildProjectName).ni.exe ]%3B then + if [ ! -f $(MSBuildProjectName).org ]%3B then TakeLock - if [ ! -f $(MSBuildProjectName).ni.exe ]%3B then - echo $_DebuggerFullPath "$CORE_ROOT/crossgen" /Platform_Assemblies_Paths $CORE_ROOT%3A$PWD $(MSBuildProjectName).exe - $_DebuggerFullPath "$CORE_ROOT/crossgen" /Platform_Assemblies_Paths $CORE_ROOT%3A$PWD $(MSBuildProjectName).exe + if [ ! -f $(MSBuildProjectName).org ]%3B then + mkdir IL + cp $(MSBuildProjectName).exe IL/$(MSBuildProjectName).exe + mv $(MSBuildProjectName).exe $(MSBuildProjectName).org + echo $_DebuggerFullPath "$CORE_ROOT/crossgen" /Platform_Assemblies_Paths $CORE_ROOT%3A$PWD/IL%3A$PWD /in $(MSBuildProjectName).org /out $(MSBuildProjectName).exe + $_DebuggerFullPath "$CORE_ROOT/crossgen" /Platform_Assemblies_Paths $CORE_ROOT%3A$PWD/IL%3A$PWD /in $(MSBuildProjectName).org /out $(MSBuildProjectName).exe __cgExitCode=$? if [ $__cgExitCode -ne 0 ] then @@ -73,12 +76,15 @@ REM CrossGen Script if defined RunCrossGen ( set COMPlus_ZapRequire=$(ZapRequire) set COMPlus_ZapRequireList=$(MSBuildProjectName) - if not exist "$(MSBuildProjectName).ni.exe" ( + if not exist "$(MSBuildProjectName).org" ( call :TakeLock set CrossGenStatus=0 - if not exist "$(MSBuildProjectName).ni.exe" ( - echo "%_DebuggerFullPath% %CORE_ROOT%\crossgen.exe" /Platform_Assemblies_Paths %CORE_ROOT%%3B%25cd%25 $(MSBuildProjectName).exe - %_DebuggerFullPath% "%CORE_ROOT%\crossgen.exe" /Platform_Assemblies_Paths %CORE_ROOT%%3B%25cd%25 $(MSBuildProjectName).exe + if not exist "$(MSBuildProjectName).org" ( + mkdir IL + copy $(MSBuildProjectName).exe IL\$(MSBuildProjectName).exe + ren $(MSBuildProjectName).exe $(MSBuildProjectName).org + echo "%_DebuggerFullPath% %CORE_ROOT%\crossgen.exe" /Platform_Assemblies_Paths %CORE_ROOT%%3B%25cd%25\IL%3B%25cd%25 /in $(MSBuildProjectName).org /out $(MSBuildProjectName).exe + %_DebuggerFullPath% "%CORE_ROOT%\crossgen.exe" /Platform_Assemblies_Paths %CORE_ROOT%%3B%25cd%25\IL%3B%25cd%25 /in $(MSBuildProjectName).org /out $(MSBuildProjectName).exe set CrossGenStatus=!ERRORLEVEL! ) call :ReleaseLock diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets index f015cc710d..f95408f512 100644 --- a/tests/src/CLRTest.Execute.Bash.targets +++ b/tests/src/CLRTest.Execute.Bash.targets @@ -18,45 +18,6 @@ WARNING: When setting properties based on their current state (for example: --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target - Name="GetIlasmRoundTripBashScript" - Returns="$(IlasmRoundTripBashScript)"> - <PropertyGroup> - <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/"))</InputAssemblyName> - <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> - <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName> - <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName> - - <IlasmRoundTripBashScript Condition="'$(IlasmRoundTrip)'=='true'"> - <![CDATA[ -# Disable Ilasm round-tripping for Linker tests. -# Todo: Ilasm round-trip on linked binaries. - -if [ -z "$DoLink" ]; -then - echo "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName) - "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName) - ERRORLEVEL=$? - if [ $ERRORLEVEL -ne 0 ] - then - echo EXECUTION OF ILDASM - FAILED $ERRORLEVEL - exit 1 - fi - - echo "$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) - "$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) - ERRORLEVEL=$? - if [ $ERRORLEVEL -ne 0 ] - then - echo EXECUTION OF ILASM - FAILED $ERRORLEVEL - exit 1 - fi -fi - ]]> - </IlasmRoundTripBashScript> - </PropertyGroup> - </Target> - <!-- This is here because of this bug: http://blogs.msdn.com/b/msbuild/archive/2006/01/03/508629.aspx--> <Target Name="FetchExternalPropertiesForXpalt"> <!--Call GetExecuteShFullPath to get ToRunProject cmd file Path --> @@ -122,9 +83,9 @@ fi ]]></BashCLRTestEnvironmentCompatibilityCheck> <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[ $(BashCLRTestEnvironmentCompatibilityCheck) -if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) ] +if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) -o \( ! -z "$COMPlus_TailcallStress" \) ] then - echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts) IS SET" + echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts, COMPlus_TailcallStress) IS SET" exit $(GCBashScriptExitCode) fi ]]></BashCLRTestEnvironmentCompatibilityCheck> @@ -275,10 +236,11 @@ fi </PropertyGroup> <PropertyGroup> <_CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"$CORE_ROOT/corerun"</_CLRTestRunFile> - <BashCLRTestLaunchCmds Condition="'$(IlasmRoundTrip)'=='true'"><![CDATA[ -if [ -z "$DoLink" ]; then - echo $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments - $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments + <BashCLRTestLaunchCmds><![CDATA[ +if [ -z "$DoLink" -a ! -z "$RunningIlasmRoundTrip" ]; +then + echo $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments + $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments if [ $? -ne $CLRTestExpectedExitCode ] then echo END EXECUTION OF IL{D}ASM BINARY - FAILED $? vs $CLRTestExpectedExitCode @@ -408,7 +370,6 @@ $(BashCLRTestEnvironmentCompatibilityCheck) $(BashCLRTestArgPrep) $(BashCLRTestExitCodePrep) $(JitDisasmBashScript) -# IlasmRoundTrip Script $(IlasmRoundTripBashScript) # PreCommands $(BashCLRTestPreCommands) diff --git a/tests/src/CLRTest.Execute.Batch.targets b/tests/src/CLRTest.Execute.Batch.targets index db2a17425d..545fc72eb2 100644 --- a/tests/src/CLRTest.Execute.Batch.targets +++ b/tests/src/CLRTest.Execute.Batch.targets @@ -18,39 +18,6 @@ WARNING: When setting properties based on their current state (for example: --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target - Name="GetIlasmRoundTripBatchScript" - Returns="$(IlasmRoundTripBatchScript)"> - <PropertyGroup> - <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName> - <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> - <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName> - <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName> - - <!-- https://github.com/dotnet/coreclr/issues/2481. Delete /raweh to ildasm once it is resolved.--> - <IlasmRoundTripBatchScript Condition="'$(IlasmRoundTrip)'=='true'"> - <![CDATA[ -REM Disable Ilasm round-tripping for Linker tests. -REM Todo: Ilasm round-trip on linked binaries. -IF NOT DEFINED DoLink ( - ECHO %CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName) - %CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName) - IF NOT "!ERRORLEVEL!"=="0" ( - ECHO EXECUTION OF ILDASM - FAILED !ERRORLEVEL! - Exit /b 1 - ) - ECHO %CORE_ROOT%\ilasm.exe /output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) - %CORE_ROOT%\ilasm.exe /output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) - IF NOT "!ERRORLEVEL!"=="0" ( - ECHO EXECUTION OF ILASM - FAILED !ERRORLEVEL! - Exit /b 1 - ) -) - ]]> - </IlasmRoundTripBatchScript> - </PropertyGroup> - </Target> - <!-- This is here because of this bug: http://blogs.msdn.com/b/msbuild/archive/2006/01/03/508629.aspx--> <Target Name="FetchExternalProperties"> <!--Call GetExecuteCmdFullPath to get ToRunProject cmd file Path --> @@ -105,13 +72,15 @@ IF NOT DEFINED DoLink ( $(BatchCLRTestEnvironmentCompatibilityCheck) IF NOT "%COMPlus_GCStress%"=="" ( ECHO SKIPPING EXECUTION BECAUSE COMPlus_GCStress IS SET + popd Exit /b 0 ) ]]></BatchCLRTestEnvironmentCompatibilityCheck> <BatchCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[ $(BatchCLRTestEnvironmentCompatibilityCheck) -IF "%COMPlus_JitStress%"=="" IF "%COMPlus_JitStressRegs%"=="" IF "%COMPlus_JITMinOpts%"=="" goto :Compatible1 - ECHO SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts) IS SET +IF "%COMPlus_JitStress%"=="" IF "%COMPlus_JitStressRegs%"=="" IF "%COMPlus_JITMinOpts%"=="" IF "%COMPlus_TailcallStress%"=="" goto :Compatible1 + ECHO SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts, COMPlus_TailcallStress) IS SET + popd Exit /b 0 :Compatible1 ]]></BatchCLRTestEnvironmentCompatibilityCheck> @@ -119,6 +88,7 @@ IF "%COMPlus_JitStress%"=="" IF "%COMPlus_JitStressRegs%"=="" IF "%COMPlus_JITMi $(BatchCLRTestEnvironmentCompatibilityCheck) IF NOT "%COMPlus_HeapVerify%"=="" ( ECHO SKIPPING EXECUTION BECAUSE COMPlus_HeapVerify IS SET + popd Exit /b 0 ) ]]></BatchCLRTestEnvironmentCompatibilityCheck> @@ -141,10 +111,12 @@ ECHO Actual: %CLRTestExitCode% IF NOT "%CLRTestExitCode%"=="%CLRTestExpectedExitCode%" ( ECHO END EXECUTION - FAILED ECHO FAILED + popd Exit /b 1 ) ELSE ( ECHO END EXECUTION - PASSED ECHO PASSED + popd Exit /b 0 ) @@ -215,6 +187,7 @@ set Assemblies=-a System.Private.CoreLib IF defined DoLink ( IF NOT EXIST !ILLINK! ( ECHO ILLink executable [%ILLINK%] Invalid + popd Exit /b 1 ) @@ -241,6 +214,7 @@ IF defined DoLink ( IF NOT defined KeepLinkedBinaries ( IF EXIST %LinkBin% rmdir /s /q %LinkBin% ) + popd Exit /b 1 ) @@ -270,7 +244,7 @@ if defined DoLink ( ) ]]> </BatchLinkerTestCleanupCmds> - </PropertyGroup> + </PropertyGroup> <PropertyGroup> <_CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"%CORE_ROOT%\corerun.exe"</_CLRTestRunFile> <BatchCLRTestLaunchCmds><![CDATA[ @@ -279,19 +253,7 @@ IF NOT "%CLRCustomTestLauncher%"=="" ( ) ELSE ( set LAUNCHER=%_DebuggerFullPath% $(_CLRTestRunFile) ) - ]]></BatchCLRTestLaunchCmds> - <BatchCLRTestLaunchCmds Condition=" '$(IlasmRoundTrip)'=='true' "><![CDATA[ - $(BatchCLRTestLaunchCmds) -IF NOT DEFINED DoLink ( - ECHO %LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args% - %LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args% - - IF NOT "!ERRORLEVEL!"=="%CLRTestExpectedExitCode%" ( - ECHO END EXECUTION OF IL{D}ASM BINARY - FAILED !ERRORLEVEL! vs %CLRTestExpectedExitCode% - ECHO FAILED - Exit /b 1 - ) -) +$(BatchIlrtTestLaunchCmds) ]]></BatchCLRTestLaunchCmds> <BatchCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun'"> <![CDATA[ @@ -378,6 +340,7 @@ ECHO - OPTIONS - @(BatchCLRTestExecutionScriptArgument -> 'ECHO -%(Identity) %(ParamName) ECHO %(Description)', ' ') +popd Exit /b 1 :ArgsDone @@ -404,7 +367,6 @@ $(BatchCLRTestEnvironmentCompatibilityCheck) $(JitDisasmBatchScript) -REM IlasmRoundTrip Script $(IlasmRoundTripBatchScript) REM Precommands diff --git a/tests/src/CLRTest.Jit.targets b/tests/src/CLRTest.Jit.targets index 1a0b5e3fce..1dd872c4af 100644 --- a/tests/src/CLRTest.Jit.targets +++ b/tests/src/CLRTest.Jit.targets @@ -67,7 +67,99 @@ if defined RunningJitDisasm ( </JitDisasmBatchScript> </PropertyGroup> </Target> - + + <Target + Name="GetIlasmRoundTripBashScript" + Returns="$(IlasmRoundTripBashScript)"> + <PropertyGroup> + <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/"))</InputAssemblyName> + <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> + <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName> + <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName> + + <IlasmRoundTripBashScript> + <![CDATA[ +# IlasmRoundTrip Script + +# Disable Ilasm round-tripping for Linker tests. +# Todo: Ilasm round-trip on linked binaries. + +if [ -z "$DoLink" -a ! -z "$RunningIlasmRoundTrip" ]; +then + echo "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName) + "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName) + ERRORLEVEL=$? + if [ $ERRORLEVEL -ne 0 ] + then + echo EXECUTION OF ILDASM - FAILED $ERRORLEVEL + exit 1 + fi + + echo "$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) + "$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) + ERRORLEVEL=$? + if [ $ERRORLEVEL -ne 0 ] + then + echo EXECUTION OF ILASM - FAILED $ERRORLEVEL + exit 1 + fi +fi + ]]> + </IlasmRoundTripBashScript> + </PropertyGroup> + </Target> + + <Target Name="GetIlasmRoundTripBatchScript" + Returns="$(IlasmRoundTripBatchScript);$(BatchIlrtTestLaunchCmds)"> + <PropertyGroup> + <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName> + <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> + <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName> + <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName> + + <!-- https://github.com/dotnet/coreclr/issues/2481. Delete /raweh to ildasm once it is resolved.--> + <IlasmRoundTripBatchScript> + <![CDATA[ +REM IlasmRoundTrip Script + +REM Disable Ilasm round-tripping for Linker tests. +REM Todo: Ilasm round-trip on linked binaries. +IF NOT DEFINED DoLink ( + IF DEFINED RunningIlasmRoundTrip ( + echo %CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName) + %CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName) + IF NOT "!ERRORLEVEL!"=="0" ( + ECHO EXECUTION OF ILDASM - FAILED !ERRORLEVEL! + Exit /b 1 + ) + ECHO %CORE_ROOT%\ilasm.exe /output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) + %CORE_ROOT%\ilasm.exe /output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) + IF NOT "!ERRORLEVEL!"=="0" ( + ECHO EXECUTION OF ILASM - FAILED !ERRORLEVEL! + Exit /b 1 + ) + ) +) + ]]> + </IlasmRoundTripBatchScript> + <BatchIlrtTestLaunchCmds><![CDATA[ +IF NOT DEFINED DoLink ( + if defined RunningIlasmRoundTrip ( + ECHO %LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args% + %LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args% + + IF NOT "!ERRORLEVEL!"=="%CLRTestExpectedExitCode%" ( + ECHO END EXECUTION OF IL{D}ASM BINARY - FAILED !ERRORLEVEL! vs %CLRTestExpectedExitCode% + ECHO FAILED + Exit /b 1 + ) + ) +) +]]> + </BatchIlrtTestLaunchCmds> + </PropertyGroup> + </Target> + <PropertyGroup Condition="$(RunWithGcStress) != ''" > <CLRTestBatchPreCommands> <![CDATA[ diff --git a/tests/src/Common/PerfHarness/PerfHarness.cs b/tests/src/Common/PerfHarness/PerfHarness.cs index b3a0ea48c5..f78022517b 100644 --- a/tests/src/Common/PerfHarness/PerfHarness.cs +++ b/tests/src/Common/PerfHarness/PerfHarness.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; using System.Reflection; using System.Collections.Generic; using Microsoft.Xunit.Performance.Api; diff --git a/tests/src/Common/PerfHarness/PerfHarness.csproj b/tests/src/Common/PerfHarness/PerfHarness.csproj new file mode 100644 index 0000000000..39eff59c12 --- /dev/null +++ b/tests/src/Common/PerfHarness/PerfHarness.csproj @@ -0,0 +1,12 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <OutputType>exe</OutputType> + <TargetFramework>netcoreapp2.0</TargetFramework> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="xunit.performance.api" Version="1.0.0-beta-build0007" /> + </ItemGroup> + +</Project>
\ No newline at end of file diff --git a/tests/src/Common/PerfHarness/project.json b/tests/src/Common/PerfHarness/project.json deleted file mode 100644 index a1ecb2867e..0000000000 --- a/tests/src/Common/PerfHarness/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - }, - "xunit.performance.api": "1.0.0-beta-build0003" - } - } - } -} diff --git a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj index 63c54488f2..dc74f7d4ad 100644 --- a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj +++ b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj @@ -5,10 +5,33 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> - <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" /> + <PackageReference Include="Microsoft.NETCore.ILAsm"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.ILDAsm"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Jit"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.TestHost"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-x64;win-x86;win7-x86;win7-x64;win10-arm64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json deleted file mode 100644 index 327340f11d..0000000000 --- a/tests/src/Common/build_against_pkg_dependencies/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.ILAsm": "2.0.0-preview1-25221-01", - "Microsoft.NETCore.ILDAsm": "2.0.0-preview1-25221-01", - "Microsoft.NETCore.Jit": "2.0.0-preview1-25221-01", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25221-01", - "Microsoft.NETCore.TestHost": "2.0.0-preview1-25221-01" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win-x64": {}, - "win-x86": {}, - "win7-x86": {}, - "win7-x64": {}, - "win10-arm64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "osx-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {}, - "opensuse.42.1-x64": {}, - "linux-x64": {} - } -} diff --git a/tests/src/Common/empty/project.json b/tests/src/Common/empty/project.json deleted file mode 100644 index e1ec3bfd42..0000000000 --- a/tests/src/Common/empty/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/Common/external/external.csproj b/tests/src/Common/external/external.csproj deleted file mode 100644 index f7fa75ed32..0000000000 --- a/tests/src/Common/external/external.csproj +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <CLRTestKind>BuildOnly</CLRTestKind> - <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> - </PropertyGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <Target Name="Build" - DependsOnTargets="ResolveReferences" /> -</Project>
\ No newline at end of file diff --git a/tests/src/Common/external/external.depproj b/tests/src/Common/external/external.depproj index 5a16122cdb..51b36208b6 100644 --- a/tests/src/Common/external/external.depproj +++ b/tests/src/Common/external/external.depproj @@ -5,19 +5,55 @@ <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> - <ProjectJson>$(MSBuildThisFileDirectory)project.json</ProjectJson> - <ProjectLockJson>$(MSBuildThisFileDirectory)project.lock.json</ProjectLockJson> + <RestoreOutputPath>$(MSBuildThisFileDirectory)obj</RestoreOutputPath> <Language>C#</Language> <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp1.1</NugetTargetMonikerShort> <NugetRuntimeIdentifier>win7-x64</NugetRuntimeIdentifier> + <ContainsPackageReferences>true</ContainsPackageReferences> <OutputPath>$(TargetingPackPath)</OutputPath> <XUnitRunnerPackageId Condition="'$(TargetGroup)' != 'netfx'">xunit.console.netcore</XUnitRunnerPackageId> <XUnitRunnerPackageId Condition="'$(TargetGroup)' == 'netfx'">xunit.runner.console</XUnitRunnerPackageId> <CLRTestKind>SharedLibrary</CLRTestKind> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> - <None Include="project.json" /> + <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> + <Version>1.1.1</Version> + </PackageReference> + <PackageReference Include="xunit.performance.api"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>$(MicrosoftDiagnosticsTracingLibraryVersion)</Version> + </PackageReference> + <PackageReference Include="Newtonsoft.Json"> + <Version>9.0.1</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XUnitConsoleNetCoreVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <PackageToInclude Include="xunit.abstractions"/> <PackageToInclude Include="xunit.assert"/> @@ -40,6 +76,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup> + <ProjectAssetsFile>$(SourceDir)Common\external\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> + <Target Name="AddXunitConsoleRunner" BeforeTargets="ResolveReferences" Condition="'$(TargetGroup)' == 'netfx'"> <Error Condition="!Exists('$(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion)\tools\xunit.console.exe')" Text="Error: looks the package $(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion) not restored or missing xunit.console.exe." diff --git a/tests/src/Common/external/project.json b/tests/src/Common/external/project.json deleted file mode 100644 index 12c986a98b..0000000000 --- a/tests/src/Common/external/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "dependencies": { - "Microsoft.CodeAnalysis.Compilers": "1.1.1", - "xunit.performance.api": "1.0.0-beta-build0003", - "xunit.performance.core": "1.0.0-beta-build0003", - "xunit.performance.execution": "1.0.0-beta-build0003", - "xunit.performance.metrics": "1.0.0-beta-build0003", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Newtonsoft.Json": "9.0.1", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {} - } -} diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json deleted file mode 100644 index ca40b18d1e..0000000000 --- a/tests/src/Common/netcoreapp/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": "2.0.0-beta-001494-00", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01" - }, - "frameworks": { - "netcoreapp2.0": {} - } -} diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json deleted file mode 100644 index 0754b74690..0000000000 --- a/tests/src/Common/targeting_pack_ref/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview1-25221-01" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj index 65e37c03c3..620a447779 100644 --- a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj +++ b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj @@ -5,6 +5,20 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.TargetingPack.Private.CoreCLR"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json deleted file mode 100644 index 4477c687e0..0000000000 --- a/tests/src/Common/test_dependencies/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25221-01", - "System.Memory": "4.4.0-preview1-25221-01", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01", - "System.Security.Permissions": "4.4.0-preview1-25221-01" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ - "dnxcore50", - "netcoreapp1.1", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win-x64": {}, - "win-x86": {}, - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "osx-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {}, - "linux-x64": {} - } -} diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj index 0b0f5b82bf..f5b1b319c7 100644 --- a/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -6,8 +6,35 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.CoreDisTools"> + <Version>1.0.1-prerelease-*</Version> + </PackageReference> + <PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="System.Memory"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="System.Security.Permissions"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-x64;win-x86;win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" - DependsOnTargets="ResolveReferences" /> -</Project> + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json deleted file mode 100644 index 575d75d089..0000000000 --- a/tests/src/Common/test_runtime/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", - "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease", - "jit-dasm": "0.0.1.4", - "cijobs": "0.0.1.2", - "jit-analyze": "0.0.1.1" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win-x64": {}, - "win-x86": {}, - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "osx-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {}, - "linux-x64": {} - } -} diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj index 3b55297f3d..0212b05274 100644 --- a/tests/src/Common/test_runtime/test_runtime.csproj +++ b/tests/src/Common/test_runtime/test_runtime.csproj @@ -5,14 +5,35 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> - <!-- Reset the Default project.json--> - <ProjectJson></ProjectJson> - <ProjectLockJson></ProjectLockJson> <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> - <None Include="project.json" /> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.CoreCLR.TestDependencies"> + <Version>1.0.0-prerelease</Version> + </PackageReference> + <PackageReference Include="jit-dasm"> + <Version>0.0.1.4</Version> + </PackageReference> + <PackageReference Include="cijobs"> + <Version>0.0.1.2</Version> + </PackageReference> + <PackageReference Include="jit-analyze"> + <Version>0.0.1.1</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-x64;win-x86;win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> diff --git a/tests/src/GC/API/GCHandleCollector/Usage.cs b/tests/src/GC/API/GCHandleCollector/Usage.cs index b78271b243..f346966a6b 100644 --- a/tests/src/GC/API/GCHandleCollector/Usage.cs +++ b/tests/src/GC/API/GCHandleCollector/Usage.cs @@ -146,9 +146,16 @@ public class Usage // ensure threshold is increasing if (!CheckPercentageIncrease(handleCount, prevHandleCount)) { - // see github#4093 for the rationale for fail-fast in this test. - Environment.FailFast(string.Empty); - return false; + Console.WriteLine("Percentage not increasing, performing Collect/WFPF/Collect cycle"); + GC.Collect(); + GC.WaitForPendingFinalizers(); + GC.Collect(); + + if (handleCount == HandleCollectorTest.Count) + { + Console.WriteLine("No handles finalized in Collect/WFPF/Collect cycle"); + return false; + } } prevHandleCount = handleCount; } diff --git a/tests/src/GC/Features/HeapExpansion/pluggaps.csproj b/tests/src/GC/Features/HeapExpansion/pluggaps.csproj index 8a1f7a47e2..0250cab230 100644 --- a/tests/src/GC/Features/HeapExpansion/pluggaps.csproj +++ b/tests/src/GC/Features/HeapExpansion/pluggaps.csproj @@ -10,7 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <GCStressIncompatible>true</GCStressIncompatible> - <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible> + <HeapVerifyIncompatible>true</HeapVerifyIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/tests/src/GC/Scenarios/DoublinkList/dlcollect.cs b/tests/src/GC/Scenarios/DoublinkList/dlcollect.cs index a17e95a270..f7aa10dccb 100644 --- a/tests/src/GC/Scenarios/DoublinkList/dlcollect.cs +++ b/tests/src/GC/Scenarios/DoublinkList/dlcollect.cs @@ -11,6 +11,7 @@ namespace DoubLink { using System; using System.Collections.Generic; + using System.Runtime.CompilerServices; public class DLCollect { @@ -63,11 +64,38 @@ namespace DoubLink { } + [MethodImpl(MethodImplOptions.NoInlining)] + public bool DrainFinalizerQueue(int iRep, int iObj) + { + int lastValue = DLinkNode.FinalCount; + while (true) + { + GC.Collect(); + GC.WaitForPendingFinalizers(); + GC.Collect(); + + if (DLinkNode.FinalCount == iRep * iObj * 10) + { + return true; + } + + if (DLinkNode.FinalCount != lastValue) + { + Console.WriteLine(" Performing Collect/Wait/Collect cycle again"); + lastValue = DLinkNode.FinalCount; + continue; + } + + Console.WriteLine(" Finalized number stable at " + lastValue); + return false; + } + } public bool runTest(int iRep, int iObj) { Mv_Collect = new List<DoubLink>(iRep); + bool success = false; for(int i=0; i <10; i++) { SetLink(iRep, iObj); @@ -75,16 +103,13 @@ namespace DoubLink { GC.Collect(); } - GC.WaitForPendingFinalizers(); - - if (DLinkNode.FinalCount != iRep * iObj * 10) + if (DrainFinalizerQueue(iRep, iObj)) { - // see github#4093 for the rationale for fail-fast in this test. - Environment.FailFast(string.Empty); + success = true; } Console.WriteLine("{0} DLinkNodes finalized", DLinkNode.FinalCount); - return (DLinkNode.FinalCount==iRep*iObj*10); + return success; } diff --git a/tests/src/GC/Scenarios/DoublinkList/dlstack.cs b/tests/src/GC/Scenarios/DoublinkList/dlstack.cs index 5e207bec52..8fa63bf8fd 100644 --- a/tests/src/GC/Scenarios/DoublinkList/dlstack.cs +++ b/tests/src/GC/Scenarios/DoublinkList/dlstack.cs @@ -13,6 +13,7 @@ namespace DoubLink { using System; + using System.Runtime.CompilerServices; public class DLStack { @@ -63,36 +64,50 @@ namespace DoubLink { } + [MethodImpl(MethodImplOptions.NoInlining)] + public bool DrainFinalizerQueue(int iRep, int iObj) + { + int lastValue = DLinkNode.FinalCount; + while (true) + { + GC.Collect(); + GC.WaitForPendingFinalizers(); + GC.Collect(); + + if (DLinkNode.FinalCount == iRep * iObj * 10) + { + return true; + } + + if (DLinkNode.FinalCount != lastValue) + { + Console.WriteLine(" Performing Collect/Wait/Collect cycle again"); + lastValue = DLinkNode.FinalCount; + continue; + } + + Console.WriteLine(" Finalized number stable at " + lastValue); + return false; + } + } + public bool runTest(int iRep, int iObj) { - + bool success = false; for(int i=0; i <10; i++) { SetLink(iRep, iObj); MakeLeak(iRep); } - long lastTotalMemory = long.MaxValue; - long curTotalMemory = GC.GetTotalMemory(false); - - while (lastTotalMemory != curTotalMemory) - { - GC.Collect(); - GC.WaitForPendingFinalizers(); - - lastTotalMemory = curTotalMemory; - curTotalMemory = GC.GetTotalMemory(false); - } - - if (DLinkNode.FinalCount != iRep * iObj * 10) + if (DrainFinalizerQueue(iRep, iObj)) { - // see github#4093 for the rationale for fail-fast in this test. - Environment.FailFast(string.Empty); + success = true; } Console.WriteLine("{0} DLinkNodes finalized", DLinkNode.FinalCount); - return (DLinkNode.FinalCount==iRep*iObj*10); + return success; } diff --git a/tests/src/GC/Scenarios/DoublinkList/doublinkgen.cs b/tests/src/GC/Scenarios/DoublinkList/doublinkgen.cs index 76436ea7fe..0f1016c3d0 100644 --- a/tests/src/GC/Scenarios/DoublinkList/doublinkgen.cs +++ b/tests/src/GC/Scenarios/DoublinkList/doublinkgen.cs @@ -11,6 +11,7 @@ namespace DoubLink { using System; + using System.Runtime.CompilerServices; public class DoubLinkGen { @@ -61,25 +62,47 @@ namespace DoubLink { return 1; } + [MethodImpl(MethodImplOptions.NoInlining)] + public bool DrainFinalizerQueue(int iRep, int iObj) + { + int lastValue = DLinkNode.FinalCount; + while (true) + { + GC.Collect(); + GC.WaitForPendingFinalizers(); + GC.Collect(); + + if (DLinkNode.FinalCount == iRep * iObj) + { + return true; + } + + if (DLinkNode.FinalCount != lastValue) + { + Console.WriteLine(" Performing Collect/Wait/Collect cycle again"); + lastValue = DLinkNode.FinalCount; + continue; + } + + Console.WriteLine(" Finalized number stable at " + lastValue); + return false; + } + } public bool runTest(int iRep, int iObj) { SetLink(iRep, iObj); Mv_Doub = null; + bool success = false; - GC.Collect(); - GC.WaitForPendingFinalizers(); - GC.Collect(); - - if (DLinkNode.FinalCount != iRep * iObj) + if (DrainFinalizerQueue(iRep, iObj)) { - // see github#4093 for the rationale for fail-fast in this test. - Environment.FailFast(string.Empty); + success = true; } Console.Write(DLinkNode.FinalCount); Console.WriteLine(" DLinkNodes finalized"); - return (DLinkNode.FinalCount==iRep*iObj); + return success; } diff --git a/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj b/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj index 7b42bd1b34..91921abba7 100644 --- a/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj +++ b/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj @@ -10,9 +10,9 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <CLRTestKind>BuildAndRun</CLRTestKind> + <CLRTestKind>BuildOnly</CLRTestKind> + <GenerateRunScript>false</GenerateRunScript> <CLRTestPriority>1</CLRTestPriority> - <CLRTestExecutionArguments>testmix_gc.config /maximumExecutionTime:-1</CLRTestExecutionArguments> <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> diff --git a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteObject.cs b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteObject.cs new file mode 100644 index 0000000000..a11c10b01b --- /dev/null +++ b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteObject.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +using CoreFXTestLibrary; + +internal struct BlittableStruct +{ + internal int a; + internal int b; + internal byte c; + internal short d; + internal IntPtr p; +} + +internal struct StructWithReferenceTypes +{ + internal IntPtr ptr; + internal string str; + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)] + internal int[] byValArr; +} + +class Test +{ + static int Main(string[] args) + { + TestNegativeCases(); + TestBlittableStruct(); + TestStructWithReferenceType(); + + return 100; + } + + static void TestNegativeCases() + { + Assert.Throws<ArgumentNullException>(() => { Marshal.WriteByte(null, 0, 0); }); + Assert.Throws<ArgumentNullException>(() => { Marshal.WriteInt16(null, 0, 0); }); + Assert.Throws<ArgumentNullException>(() => { Marshal.WriteInt32(null, 0, 0); }); + Assert.Throws<ArgumentNullException>(() => { Marshal.WriteInt64(null, 0, 0); }); + Assert.Throws<ArgumentNullException>(() => { Marshal.WriteIntPtr(null, 0, IntPtr.Zero); }); + Assert.Throws<ArgumentNullException>(() => { Marshal.ReadByte(null, 0); }); + Assert.Throws<ArgumentNullException>(() => { Marshal.ReadInt16(null, 0); }); + Assert.Throws<ArgumentNullException>(() => { Marshal.ReadInt32(null, 0); }); + Assert.Throws<ArgumentNullException>(() => { Marshal.ReadIntPtr(null, 0); }); + } + + static void TestBlittableStruct() + { + Console.WriteLine("TestBlittableStruct"); + + BlittableStruct blittableStruct = new BlittableStruct(); + blittableStruct.a = 200; + blittableStruct.b = 300; + blittableStruct.c = 10; + blittableStruct.d = 123; + blittableStruct.p = new IntPtr(100); + + object boxedBlittableStruct = (object)blittableStruct; + + int offsetOfB = Marshal.OffsetOf<BlittableStruct>("b").ToInt32(); + int offsetOfC = Marshal.OffsetOf<BlittableStruct>("c").ToInt32(); + int offsetOfD = Marshal.OffsetOf<BlittableStruct>("d").ToInt32(); + int offsetOfP = Marshal.OffsetOf<BlittableStruct>("p").ToInt32(); + + Assert.AreEqual(Marshal.ReadInt32(boxedBlittableStruct, 0), 200); + Assert.AreEqual(Marshal.ReadInt32(boxedBlittableStruct, offsetOfB), 300); + Assert.AreEqual(Marshal.ReadByte(boxedBlittableStruct, offsetOfC), 10); + Assert.AreEqual(Marshal.ReadInt16(boxedBlittableStruct, offsetOfD), 123); + Assert.AreEqual(Marshal.ReadIntPtr(boxedBlittableStruct, offsetOfP), new IntPtr(100)); + + Marshal.WriteInt32(boxedBlittableStruct, 0, 300); + Marshal.WriteInt32(boxedBlittableStruct, offsetOfB, 400); + Marshal.WriteByte(boxedBlittableStruct, offsetOfC, 20); + Marshal.WriteInt16(boxedBlittableStruct, offsetOfD, 144); + + Marshal.WriteIntPtr(boxedBlittableStruct, offsetOfP, new IntPtr(500)); + + Assert.AreEqual(((BlittableStruct)boxedBlittableStruct).a, 300); + Assert.AreEqual(((BlittableStruct)boxedBlittableStruct).b, 400); + Assert.AreEqual(((BlittableStruct)boxedBlittableStruct).c, 20); + Assert.AreEqual(((BlittableStruct)boxedBlittableStruct).d, 144); + Assert.AreEqual(((BlittableStruct)boxedBlittableStruct).p, new IntPtr(500)); + } + + static void TestStructWithReferenceType() + { + Console.WriteLine("TestStructWithReferenceType"); + + StructWithReferenceTypes structWithReferenceTypes = new StructWithReferenceTypes(); + structWithReferenceTypes.ptr = new IntPtr(100); + structWithReferenceTypes.str = "ABC"; + structWithReferenceTypes.byValArr = new int[10] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; + + object boxedStruct = (object)structWithReferenceTypes; + + int offsetOfStr = Marshal.OffsetOf<StructWithReferenceTypes>("str").ToInt32(); + int offsetOfByValArr = Marshal.OffsetOf<StructWithReferenceTypes>("byValArr").ToInt32(); + + Assert.AreEqual(Marshal.ReadInt32(boxedStruct, 0), 100); + Assert.AreNotEqual(Marshal.ReadIntPtr(boxedStruct, offsetOfStr), IntPtr.Zero); + Assert.AreEqual(Marshal.ReadInt32(boxedStruct, offsetOfByValArr + sizeof(int) * 2), 3); + + Marshal.WriteInt32(boxedStruct, 0, 200); + Marshal.WriteInt32(boxedStruct, offsetOfByValArr + sizeof(int) * 9, 100); + + Assert.AreEqual(((StructWithReferenceTypes)boxedStruct).ptr, new IntPtr(200)); + Assert.AreEqual(((StructWithReferenceTypes)boxedStruct).byValArr[9], 100); + Assert.AreEqual(((StructWithReferenceTypes)boxedStruct).byValArr[8], 9); + Assert.AreEqual(((StructWithReferenceTypes)boxedStruct).str, "ABC"); + } +} + diff --git a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteObject.csproj b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteObject.csproj new file mode 100644 index 0000000000..14fcd2c97d --- /dev/null +++ b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteObject.csproj @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <AssemblyName>ReadWriteObject</AssemblyName> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid> + <OutputType>Exe</OutputType> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + + <DefineConstants>$(DefineConstants);STATIC</DefineConstants> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> + </PropertyGroup> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <ItemGroup> + <Compile Include="ReadWriteObject.cs" /> + <Compile Include="..\..\common\Assertion.cs" /> + </ItemGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj"> + <Project>{c8c0dc74-fac4-45b1-81fe-70c4808366e0}</Project> + <Name>CoreCLRTestLibrary</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/tests/src/Interop/MarshalAPI/String/StringMarshalingTest.cs b/tests/src/Interop/MarshalAPI/String/StringMarshalingTest.cs index 714dac83e4..29ee83a8c0 100644 --- a/tests/src/Interop/MarshalAPI/String/StringMarshalingTest.cs +++ b/tests/src/Interop/MarshalAPI/String/StringMarshalingTest.cs @@ -52,6 +52,39 @@ public class StringMarshalingTest } } + private unsafe void SecureStringToBSTRToString() + { + foreach (String ts in TestStrings) + { + SecureString secureString = new SecureString(); + foreach (char character in ts) + { + secureString.AppendChar(character); + } + + IntPtr BStr = IntPtr.Zero; + String str; + + try + { + BStr = Marshal.SecureStringToBSTR(secureString); + str = Marshal.PtrToStringBSTR(BStr); + } + finally + { + if (BStr != IntPtr.Zero) + { + Marshal.ZeroFreeBSTR(BStr); + } + } + + if (!str.Equals(ts)) + { + throw new Exception(); + } + } + } + private void StringToCoTaskMemAnsiToString() { foreach (String ts in TestStrings) @@ -201,6 +234,7 @@ public class StringMarshalingTest public bool RunTests() { StringToBStrToString(); + SecureStringToBSTRToString(); StringToCoTaskMemAnsiToString(); StringToCoTaskMemUniToString(); StringToHGlobalAnsiToString(); diff --git a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.cs b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.cs index 12cff70438..74a2087eca 100644 --- a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.cs +++ b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.cs @@ -31,6 +31,25 @@ class Test } #endregion + #region "Helper" + // ************************************************************ + // Returns the appropriate exit code + // ************************************************************* + static int ExitTest() + { + if (fails == 0) + { + Console.WriteLine("PASS"); + return 100; + } + else + { + Console.WriteLine("FAIL - " + fails + " failure(s) occurred"); + return 101; + } + } + #endregion + #region ReversePInvoke public static string Call_DelMarshal_InOut(string s) @@ -219,6 +238,6 @@ class Test ReportFailure("Method ReverseP_MarshalStrB_InOut[Managed Side],return value is false"); } #endregion - return 100; + return ExitTest(); } } diff --git a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp index b440c52ef5..485d949abb 100644 --- a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp +++ b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp @@ -123,16 +123,16 @@ extern "C" DLL_EXPORT int __cdecl Writeline(char * pFormat, int i, char c, doubl } -typedef LPCTSTR (__stdcall * Test_DelMarshal_InOut)(/*[in]*/ LPCSTR s); +typedef LPCWSTR (__stdcall * Test_DelMarshal_InOut)(/*[in]*/ LPCSTR s); extern "C" DLL_EXPORT BOOL __cdecl RPinvoke_DelMarshal_InOut(Test_DelMarshal_InOut d, /*[in]*/ LPCSTR s) { - LPCTSTR str = d(s); - const char *ret = "Return"; + LPCWSTR str = d(s); + LPCWSTR ret = W("Return"); - size_t lenstr = _tcslen(str); - size_t lenret = _tcslen(ret); + size_t lenstr = wcslen(str); + size_t lenret = wcslen(ret); - if((lenret != lenstr)||(_tcsncmp(str,ret,lenstr)!=0)) + if((lenret != lenstr)||(wcsncmp(str,ret,lenstr)!=0)) { printf("Error in RPinvoke_DelMarshal_InOut, Returned value didn't match\n"); return FALSE; diff --git a/tests/src/JIT/CheckProjects/CheckProjects.cs b/tests/src/JIT/CheckProjects/CheckProjects.cs index be42ab9cfe..28cc10d174 100644 --- a/tests/src/JIT/CheckProjects/CheckProjects.cs +++ b/tests/src/JIT/CheckProjects/CheckProjects.cs @@ -86,7 +86,11 @@ internal class ScanProjectFiles foreach (FileInfo f in projectRootDir.GetFiles("*.*proj", SearchOption.AllDirectories)) { - ParseAndUpdateProj(f.FullName, s_tryAndFix); + if (!f.FullName.Contains("JIT\\config") && !f.FullName.Contains("JIT/config")) + { + ParseAndUpdateProj(f.FullName, s_tryAndFix); + } + } Console.WriteLine("{0} projects, {1} needed fixes, {2} fixes deferred, {3} were fixed", diff --git a/tests/src/JIT/CheckProjects/CheckProjects.csproj b/tests/src/JIT/CheckProjects/CheckProjects.csproj index 3bc83992bb..02d073a3fb 100644 --- a/tests/src/JIT/CheckProjects/CheckProjects.csproj +++ b/tests/src/JIT/CheckProjects/CheckProjects.csproj @@ -9,6 +9,7 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -28,10 +29,9 @@ <ItemGroup> <Compile Include="CheckProjects.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> -</Project>
\ No newline at end of file + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> +</Project> diff --git a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj index 36cd9b760b..13a728059d 100644 --- a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj +++ b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="TypedReference.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj index 953edac964..dcef420e0a 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj index 829c62c4c4..84ef3caf97 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj index 3c5f1cc245..22e4d5e32d 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj index a41f31a39d..1b0800a1af 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj b/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj index 9cd1843162..2271820bbd 100644 --- a/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj +++ b/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj @@ -33,4 +33,4 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj b/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj index c5f459d9aa..6311f4eb47 100644 --- a/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj +++ b/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj @@ -10,6 +10,7 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -34,4 +35,4 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj index d8ec34de75..0ae44d99ef 100644 --- a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj +++ b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj index afe15bbe2d..2edd488ce0 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj index 33039679f7..3579d2647e 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj index 7ec8612274..2638322546 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj index b0b398de80..0298dde5d2 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj index 2b1acc4a5c..d3849b1a14 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj index 97be5fecbd..4a165d377d 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj index 592c20a7b8..694363a0ce 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj index 817c22f9c3..ca5a53abba 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj index f858d0f6bd..9601e61e1e 100644 --- a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/nested.csproj b/tests/src/JIT/Methodical/VT/etc/nested.csproj index 11babc3182..c2ba77845c 100644 --- a/tests/src/JIT/Methodical/VT/etc/nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj index 3d7729f5e7..cfbf44f7b0 100644 --- a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj +++ b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Methodical/refany/_dbggcreport.csproj b/tests/src/JIT/Methodical/refany/_dbggcreport.csproj index c8dd1da34c..0e77a28947 100644 --- a/tests/src/JIT/Methodical/refany/_dbggcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_dbggcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_dbgnative.csproj index 1ffea88844..e8edef3a7c 100644 --- a/tests/src/JIT/Methodical/refany/_dbgnative.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj index eb5c6626f3..9704560fab 100644 --- a/tests/src/JIT/Methodical/refany/_dbgstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj index c41462c110..540ee3c8dc 100644 --- a/tests/src/JIT/Methodical/refany/_dbgstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj index f1b1b10a24..50a1e714c2 100644 --- a/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_relgcreport.csproj index 8781f33cdb..da3914fcdb 100644 --- a/tests/src/JIT/Methodical/refany/_relgcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_relgcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relnative.csproj b/tests/src/JIT/Methodical/refany/_relnative.csproj index 50bccd2c9d..88e840991c 100644 --- a/tests/src/JIT/Methodical/refany/_relnative.csproj +++ b/tests/src/JIT/Methodical/refany/_relnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relstress1.csproj b/tests/src/JIT/Methodical/refany/_relstress1.csproj index 08cfb0238f..19a9a55226 100644 --- a/tests/src/JIT/Methodical/refany/_relstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_relstress1.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relstress3.csproj b/tests/src/JIT/Methodical/refany/_relstress3.csproj index 03c37ce533..65da5b03e3 100644 --- a/tests/src/JIT/Methodical/refany/_relstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_relstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj index 459da7d647..d1e9e6767c 100644 --- a/tests/src/JIT/Methodical/refany/_relvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj index 21e1dfb876..2e39368075 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj index f7fde093de..8757d50b1a 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj index 10d26819f4..10a8cd5f6a 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj index cfd702ecae..124554ed79 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj index 531b47a9bc..45aad43acc 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj index 3fb0a8d27f..a0bc8fff61 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relnative.csproj b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj index 11e2afd4be..30045fba82 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relnative.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj index f300ebc4aa..0e484466b1 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj index fd6a9aedb9..6e160e6e01 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj index ecae4158e9..ab78d753e8 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/array1.csproj b/tests/src/JIT/Methodical/refany/array1.csproj index 83c8927f2d..8c713ad864 100644 --- a/tests/src/JIT/Methodical/refany/array1.csproj +++ b/tests/src/JIT/Methodical/refany/array1.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="array1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/array2.csproj b/tests/src/JIT/Methodical/refany/array2.csproj index 1890a9c9d0..1d57843df2 100644 --- a/tests/src/JIT/Methodical/refany/array2.csproj +++ b/tests/src/JIT/Methodical/refany/array2.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="array2.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/format.csproj b/tests/src/JIT/Methodical/refany/format.csproj index 18b8fa8e87..008ec5fad3 100644 --- a/tests/src/JIT/Methodical/refany/format.csproj +++ b/tests/src/JIT/Methodical/refany/format.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="format.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/gcreport.csproj b/tests/src/JIT/Methodical/refany/gcreport.csproj index 04d0fffb01..c40ea0504b 100644 --- a/tests/src/JIT/Methodical/refany/gcreport.csproj +++ b/tests/src/JIT/Methodical/refany/gcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/lcs.csproj b/tests/src/JIT/Methodical/refany/lcs.csproj index 122a161b4a..187948b805 100644 --- a/tests/src/JIT/Methodical/refany/lcs.csproj +++ b/tests/src/JIT/Methodical/refany/lcs.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="lcs.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/native.csproj b/tests/src/JIT/Methodical/refany/native.csproj index db30722d05..a100b56c0d 100644 --- a/tests/src/JIT/Methodical/refany/native.csproj +++ b/tests/src/JIT/Methodical/refany/native.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/virtcall.csproj b/tests/src/JIT/Methodical/refany/virtcall.csproj index fecf6cc43e..1f7727308c 100644 --- a/tests/src/JIT/Methodical/refany/virtcall.csproj +++ b/tests/src/JIT/Methodical/refany/virtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/tailcall_v4/smallFrame.il b/tests/src/JIT/Methodical/tailcall_v4/smallFrame.il index dad77eadf2..eb2ac39bf2 100644 --- a/tests/src/JIT/Methodical/tailcall_v4/smallFrame.il +++ b/tests/src/JIT/Methodical/tailcall_v4/smallFrame.il @@ -358,7 +358,8 @@ // Code size 7 (0x7) .maxstack 8 //.line 114,114 : 3,16 '' - IL_0000: tail. call valuetype RetBuff RetBufferBug::TailCallee() +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_0000: call valuetype RetBuff RetBufferBug::TailCallee() IL_0005: pop //.line 115,115 : 2,3 '' IL_0006: ret diff --git a/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj index 0225a059b7..b15027176f 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj index faf18d60df..10128517d2 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj index 82d5593bcd..7ff0df3280 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj index f7e7aafbeb..7089fece10 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj index 8f35c4bb65..fa8199743a 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.cs index 431d857f16..3f21d9cd4c 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.cs @@ -15,7 +15,6 @@ using Microsoft.Xunit.Performance; #if XUNIT_PERF [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] #endif // XUNIT_PERF namespace Benchstone.BenchF diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj index 80afc6699a..9d5cf5d0e6 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Adams.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.cs index c4cfc0b217..5c616a5b6c 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj index 174ee76e18..c42c73625c 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BenchMk2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.cs index f342b2d84e..ec70102f27 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj index 1594ae0a45..e26289d3f4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BenchMrk.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.cs index 724416a626..cd44b1c83e 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj index 70fdb06897..345ee32477 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Bisect.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.cs index 47c5e20285..dbce024099 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj index bd1b084df5..9eb733599a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="DMath.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.cs index 8881eae6c6..3ddd75491d 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.cs @@ -11,7 +11,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj index 10f39efd08..28b1fa42a7 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="FFT.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.cs index 26096b736e..08665a8950 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj index 975bf96f92..0d3d9d324a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="InProd.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.cs index 6ecfb62d91..ee0af77b59 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj index 417f1c5631..8971e8aa78 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="InvMt.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.cs index 73ec09aa04..d7d7eb8259 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.cs @@ -58,7 +58,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj index 6751cc2492..2b4d20a5c3 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="LLoops.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.cs index 5819446bf0..5fe7ef34e4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj index 1ab94d40c8..0a309d0b35 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Lorenz.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.cs index a00c29b843..02588e18ed 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.cs @@ -8,7 +8,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj index 09454d9218..2c43dba6cd 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="MatInv4.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.cs index 47f90d8616..cc698f44dd 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.cs @@ -11,7 +11,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj index 1213cae10a..a0978c2c6a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="NewtE.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.cs index c590f6e570..bfb6546a38 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj index a6f11c0f06..3fffb1b1b8 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="NewtR.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.cs index 0011288e55..c2978914b2 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj index 37fa54eda8..b674da9031 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Regula.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.cs index a4d56f7b0f..1e7c6879ad 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj index ca2c525458..147ae342a4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Romber.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.cs index 060fb5b0a4..9dcc1feb3f 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj index 27e3773834..9bc41d95aa 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Secant.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.cs index 5b2df292af..34c6c56230 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj index d7b09af860..b63153a388 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Simpsn.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.cs index b22aad88b7..8ea7556d56 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj index 90d780e258..daf711df07 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="SqMtx.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.cs index 3a0de102ed..33895ccc0c 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj index e9f704cf6b..97909f61d0 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Trap.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.cs b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.cs index ffe3fa5d8b..d72e58789d 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchF { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj index 02eaf525e9..c08f3ff969 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Whetsto.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.cs index e641ee0a74..d499441822 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj index a4c3de5674..5db8e820ac 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="8Queens.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.cs index 5bfa196527..5188571c91 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj index 8f72e1c87e..08dfa01a1a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Ackermann.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.cs index d38e6b4475..16da08250d 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj index ffadd54595..9c260fe837 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="AddArray.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.cs index a6004f0309..3ce1a98f9f 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj index 2619b38c0c..265b099233 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="AddArray2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.cs index 780b7ce66f..5e383ace66 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.cs @@ -16,7 +16,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj index cb1ed7b648..3bbd8afc30 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Array1.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.cs index dac100c5a7..45a4a9765b 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj index b368d85bda..9a3f889660 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Array2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.cs index b16c48280b..5d9a7f10cb 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj index 6d58dc402f..05e511d32b 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BenchE.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.cs index 558484d3d6..a2fbbcee30 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj index 776afa72c0..674e4f687a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BubbleSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.cs index 8c2e63a954..2dba59a793 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj index 448892e8eb..d5870cd244 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BubbleSort2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.cs index aca263711d..67544bae59 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj index edbab6006b..85a1aea481 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="CSieve.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.cs index ee028db20f..3dd897db0f 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj index ff30f8ccf7..91763f28fa 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Fib.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.cs index 64b5c8f33b..b33087bd8e 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj index 270e55060f..7aed611204 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="HeapSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.cs index 268af7b779..ff878d6127 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj index bcf7b40d72..15e50078ac 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="IniArray.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.cs index c5b4e3b0d8..c82b1e1e8b 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj index 669a0efdd5..3ab835d461 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="LogicArray.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.cs index 9146874358..f04fa9ff60 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj index 666ba47ce2..76d2a5a391 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Midpoint.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.cs index a45c012984..202ed3c052 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj index 78573f88cc..4c73bd6564 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="MulMatrix.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.cs index 33effcbf40..7a28c97cf7 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.cs @@ -14,7 +14,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj index 5622ad71d2..b8eb815e06 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="NDhrystone.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.cs index 43fc28b370..5dda2631b2 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj index 63339c8903..76d7b9ded5 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Permutate.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.cs index 2fe0918784..7a6bed7dd7 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj index 5228f957ba..c2368e0d35 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Pi.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.cs index 2271e02455..220b5c7023 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj index ea10a44d83..66d9b49550 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Puzzle.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.cs index 7cdac96a69..b5bbc47913 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj index f16d1d38b1..87408cd0b4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="QuickSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.cs index 2867abc4d4..76d04d607a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj index caa2de7720..a768a01d95 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="TreeInsert.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.cs index e0971346cf..07c7c29877 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj index 9d253e28b4..770b495ac5 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="TreeSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.cs b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.cs index de8b486049..47fbf3730a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Benchstone.BenchI { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj index a234c09352..a18aa8811a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="XposMatrix.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csharp.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csharp.cs index 05dbe94f09..6e44629499 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csharp.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csharp.cs @@ -15,7 +15,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] [assembly: MeasureGCCounts] namespace BenchmarksGame diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csharp3.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csharp3.cs index 6dcf48a422..0cc239274b 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csharp3.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csharp3.cs @@ -16,7 +16,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] [assembly: MeasureGCCounts] namespace BenchmarksGame diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj index 3cbf952833..d10772f2af 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -32,11 +33,9 @@ <ItemGroup> <Compile Include="binarytrees.csharp.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj index a7c8f2daf3..3dffd5e4bf 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -32,11 +33,9 @@ <ItemGroup> <Compile Include="binarytrees.csharp3.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csharp-2.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csharp-2.cs index 92fbceb692..3e97d64429 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csharp-2.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csharp-2.cs @@ -16,7 +16,6 @@ using System.IO; using System.Text; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace BenchmarksGame { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj index 259d5e8ff3..5d5c7f72c6 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="fasta.csharp-2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csharp.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csharp.cs index df8999a2de..c7a786a77e 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csharp.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csharp.cs @@ -16,7 +16,6 @@ using System.IO; using System.Text; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace BenchmarksGame { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj index 8d77905de9..30c542ee27 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="fastaredux.csharp.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.cs index 54bd10702c..3325a61926 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.cs @@ -2,7 +2,7 @@ http://benchmarksgame.alioth.debian.org/ * * submitted by Josh Goldfoot - * + * */ using System; @@ -14,7 +14,6 @@ using Microsoft.Xunit.Performance; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] [assembly: MeasureGCCounts] namespace BenchmarksGame @@ -24,13 +23,13 @@ public class knucleotide { #if DEBUG const int Iterations = 1; - const string InputFile = "knucleotide-input.txt"; + const string InputFile = "knucleotide-input.txt"; static int[] expectedCountLetter = new int[] { 1480, 974, 970, 1576 }; static int[] expectedCountPairs = new int[] { 420, 272, 292, 496, 273, 202, 201, 298, 316, 185, 167, 302, 470, 315, 310, 480 }; static int[] expectedCountFragments = new int[] { 54, 24, 4, 0, 0 }; #else const int Iterations = 10; - const string InputFile = "knucleotide-input-big.txt"; + const string InputFile = "knucleotide-input-big.txt"; static int[] expectedCountLetter = new int[] { 302923, 198136, 197566, 301375 }; static int[] expectedCountPairs = new int[] { 91779, 60030, 59889, 91225, 60096, 39203, 39081, 59756, 59795, 39190, 39023, 59557, 91253, 59713, 59572, 90837 }; static int[] expectedCountFragments = new int[] { 11765, 3572, 380, 7, 7 }; @@ -90,7 +89,7 @@ public class knucleotide public static int Main(string[] args) { int iterations = Iterations; - + string inputFile = FindInput(InputFile); if (inputFile == null) { @@ -258,7 +257,7 @@ public class knucleotide { throw new Exception("unable to find input"); } - foreach (var iteration in Benchmark.Iterations) + foreach (var iteration in Benchmark.Iterations) { using (iteration.StartMeasurement()) { @@ -284,7 +283,7 @@ public class knucleotide { throw new Exception("unable to find input"); } - foreach (var iteration in Benchmark.Iterations) + foreach (var iteration in Benchmark.Iterations) { using (iteration.StartMeasurement()) { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj index 097a3a2534..89c8ad5c47 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -39,11 +40,9 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csharp-3.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csharp-3.cs index 2124cf4d9e..60e083ad11 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csharp-3.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csharp-3.cs @@ -13,7 +13,6 @@ using Microsoft.Xunit.Performance; using System; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace BenchmarksGame { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj index f8c3785f54..be7e66e2a3 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="nbody.csharp-3.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.cs index 7e36f0e424..3c79a89edc 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.cs @@ -18,7 +18,6 @@ using System.Numerics; using System.Text; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace BenchmarksGame { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj index 7396e3b00f..003871e447 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="pi-digits.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csharp-6.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csharp-6.cs index 19928012ba..882bfd23f9 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csharp-6.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csharp-6.cs @@ -19,7 +19,6 @@ using System.Text.RegularExpressions; using System.Threading; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace BenchmarksGame { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj index 6f334e9afb..e7b9d42bd0 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -39,11 +40,9 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csharp-1.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csharp-1.cs index 4e875742e8..bca63bd00e 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csharp-1.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csharp-1.cs @@ -16,7 +16,6 @@ using System.Diagnostics; using System.IO; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace BenchmarksGame { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj index 69d39df429..00789ed3a5 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -39,11 +40,9 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.cs index 01eeea07bf..5f2b1aed5f 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.cs @@ -13,7 +13,6 @@ using Microsoft.Xunit.Performance; using System; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace BenchmarksGame { diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj index e12feab89a..3cbd6d32db 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="spectralnorm.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.cs b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.cs index 02dafa2dda..9880ee511f 100644 --- a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.cs +++ b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.cs @@ -4,7 +4,7 @@ // // .NET SIMD to solve Burgers' equation // -// Benchmark based on +// Benchmark based on // https://github.com/taumuon/SIMD-Vectorisation-Burgers-Equation-CSharp // http://www.taumuon.co.uk/2014/10/net-simd-to-solve-burgers-equation.html @@ -15,7 +15,6 @@ using System.Numerics; using System.Runtime.CompilerServices; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] public class Burgers { @@ -192,7 +191,7 @@ public class Burgers double[] x = linspace(0.0, 2.0 * Math.PI, nx); double[] initial = GetAnalytical(x, 0.0, nu); - // Warmup + // Warmup GetCalculated0(1, nx, dx, dt, nu, initial); GetCalculated1(1, nx, dx, dt, nu, initial); diff --git a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj index 0f57308962..bb0aca7f14 100644 --- a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Burgers.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs index 280744bf5b..79e7c5e709 100644 --- a/tests/src/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs +++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. /* ** This program was translated to C# and adapted for xunit-performance. -** New variants of several tests were added to compare class versus +** New variants of several tests were added to compare class versus ** struct and to compare jagged arrays vs multi-dimensional arrays. */ @@ -24,7 +24,7 @@ ** are error-free. Consequently, McGraw-HIll and BYTE Magazine make ** no claims in regard to the fitness of the source code, executable ** code, and documentation of the BYTEmark. -** +** ** Furthermore, BYTE Magazine, McGraw-Hill, and all employees ** of McGraw-Hill cannot be held responsible for any damages resulting ** from the use of this code or the results obtained from using @@ -36,7 +36,6 @@ using System; using System.IO; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] internal class global { @@ -1273,7 +1272,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < NumericSortJaggedIterations; i++) + for (int i = 0; i < NumericSortJaggedIterations; i++) { t.Run(); } @@ -1295,7 +1294,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < NumericSortRectangularIterations; i++) + for (int i = 0; i < NumericSortRectangularIterations; i++) { t.Run(); } @@ -1317,7 +1316,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < StringSortIterations; i++) + for (int i = 0; i < StringSortIterations; i++) { t.Run(); } @@ -1338,7 +1337,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < BitOpsIterations; i++) + for (int i = 0; i < BitOpsIterations; i++) { t.Run(); } @@ -1360,7 +1359,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < EmFloatIterations; i++) + for (int i = 0; i < EmFloatIterations; i++) { t.Run(); } @@ -1382,7 +1381,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < EmFloatClassIterations; i++) + for (int i = 0; i < EmFloatClassIterations; i++) { t.Run(); } @@ -1403,7 +1402,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < FourierIterations; i++) + for (int i = 0; i < FourierIterations; i++) { t.Run(); } @@ -1425,7 +1424,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < AssignJaggedIterations; i++) + for (int i = 0; i < AssignJaggedIterations; i++) { t.Run(); } @@ -1447,7 +1446,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < AssignRectangularIterations; i++) + for (int i = 0; i < AssignRectangularIterations; i++) { t.Run(); } @@ -1469,7 +1468,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < IDEAEncryptionIterations; i++) + for (int i = 0; i < IDEAEncryptionIterations; i++) { t.Run(); } @@ -1491,7 +1490,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < NeuralJaggedIterations; i++) + for (int i = 0; i < NeuralJaggedIterations; i++) { t.Run(); } @@ -1513,7 +1512,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < NeuralIterations; i++) + for (int i = 0; i < NeuralIterations; i++) { t.Run(); } @@ -1535,7 +1534,7 @@ public class ByteMark { using (iteration.StartMeasurement()) { - for (int i = 0; i < LUDecompIterations; i++) + for (int i = 0; i < LUDecompIterations; i++) { t.Run(); } diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj index 26a64c6e89..a293c23987 100644 --- a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -45,10 +46,9 @@ <Compile Include="numericsort.cs" /> <Compile Include="utility.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.cs b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.cs index cbaad45df5..d5761da4c2 100644 --- a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.cs +++ b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.cs @@ -13,7 +13,6 @@ using System.Threading.Tasks; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace FractalPerf { @@ -103,11 +102,11 @@ namespace FractalPerf // set the Julia Set constant complex seed = new complex(Real, Imaginary); - // run through every point on the screen, setting + // run through every point on the screen, setting // m and n to the coordinates for (double m = XB; m < XE; m += XS) { for (double n = YB; n < YE; n += YS) { - // the initial z value is the current pixel, + // the initial z value is the current pixel, // so x and y have to be set to m and n complex accum = new complex(m, n); // perform the iteration @@ -120,8 +119,8 @@ namespace FractalPerf accum = accum.square() + seed; } // determine the color using the number of - // iterations it took for the number to become too big - // char color = num % number_of_colors; + // iterations it took for the number to become too big + // char color = num % number_of_colors; // plot the point result += num; } @@ -168,7 +167,7 @@ namespace FractalPerf } return result; } - + public static int Main() { bool result = TestBase(); return (result ? 100 : -1); diff --git a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj index af7ce3b4c9..7bac1f4bdf 100644 --- a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj +++ b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="FractalPerf.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.cs index 660627cc72..1439c77dd9 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.cs +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.cs @@ -20,7 +20,6 @@ using System.Runtime.CompilerServices; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Inlining { diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj index 7ecdbab687..7d26fcb734 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj @@ -30,11 +30,9 @@ <ItemGroup> <Compile Include="InlineGCStruct.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.cs index dc05f44b33..f28d4caf81 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.cs +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.cs @@ -11,7 +11,6 @@ using System.Collections.Generic; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Inlining { diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj index 34b42c389f..965618d15d 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -31,11 +32,9 @@ <ItemGroup> <Compile Include="NoThrowInline.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.cs b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.cs index 58ea46a0c9..2a0fd27890 100644 --- a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.cs +++ b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Linq; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] public class Product { diff --git a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj index 2fc6cb0419..6fac3b034a 100644 --- a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Linq.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AbsDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AbsDouble.cs index 6429a39ce4..f5650ab2c7 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AbsDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AbsDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {absDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {absDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AcosDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AcosDouble.cs index 3ba2867a8e..4df08bd063 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AcosDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AcosDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {acosDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {acosDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AsinDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AsinDouble.cs index 030756ce44..e20b65c422 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AsinDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AsinDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {asinDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {asinDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/Atan2Double.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/Atan2Double.cs index 82831e6412..1fcde440af 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/Atan2Double.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/Atan2Double.cs @@ -41,7 +41,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {atan2DoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {atan2DoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AtanDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AtanDouble.cs index ec2ebe389e..28619e8527 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AtanDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/AtanDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {atanDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {atanDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CeilingDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CeilingDouble.cs index f822aae256..e28e9e67a5 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CeilingDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CeilingDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {ceilingDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {ceilingDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CosDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CosDouble.cs index e95ab5c241..faf69b0439 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CosDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CosDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {cosDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {cosDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CoshDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CoshDouble.cs index c8b7fb68cc..3a7e36d107 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CoshDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/CoshDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {coshDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {coshDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/ExpDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/ExpDouble.cs index 64be83972f..9af1cb8e8b 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/ExpDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/ExpDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {expDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {expDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/FloorDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/FloorDouble.cs index 4d4b4f2f1b..158cc490df 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/FloorDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/FloorDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {floorDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {floorDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/Log10Double.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/Log10Double.cs index 330d8a726b..32cd2163a5 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/Log10Double.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/Log10Double.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {log10DoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {log10DoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/LogDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/LogDouble.cs index bddb84b59c..38edbfbbd9 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/LogDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/LogDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {logDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {logDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/PowDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/PowDouble.cs index c8248072b7..f36d84e179 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/PowDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/PowDouble.cs @@ -41,7 +41,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {powDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {powDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/RoundDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/RoundDouble.cs index 9c5dcc9141..6c7a46992a 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/RoundDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/RoundDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {roundDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {roundDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SinDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SinDouble.cs index 73886aaa3a..c684b9530b 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SinDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SinDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {sinDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {sinDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SinhDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SinhDouble.cs index 8f79cc9576..69d1cb80da 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SinhDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SinhDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {sinhDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {sinhDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SqrtDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SqrtDouble.cs index 5d9e554684..59e73b3fcb 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SqrtDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/SqrtDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {sqrtDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {sqrtDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/TanDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/TanDouble.cs index 6988c675dc..123948419f 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/TanDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/TanDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {tanDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {tanDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/TanhDouble.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/TanhDouble.cs index c4809e53a3..526a428069 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/TanhDouble.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Double/TanhDouble.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > doubleEpsilon) { - throw new Exception($"Expected Result {tanhDoubleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {tanhDoubleExpectedResult,20:g17}; Actual Result {result,20:g17}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.cs index 8ddc6ad73b..aff91ba844 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.cs @@ -8,7 +8,6 @@ using System.Diagnostics; using Microsoft.Xunit.Performance; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Functions { @@ -24,23 +23,41 @@ namespace Functions ["absdouble"] = MathTests.AbsDoubleTest, ["abssingle"] = MathTests.AbsSingleTest, ["acosdouble"] = MathTests.AcosDoubleTest, + ["acossingle"] = MathTests.AcosSingleTest, ["asindouble"] = MathTests.AsinDoubleTest, + ["asinsingle"] = MathTests.AsinSingleTest, ["atandouble"] = MathTests.AtanDoubleTest, + ["atansingle"] = MathTests.AtanSingleTest, ["atan2double"] = MathTests.Atan2DoubleTest, + ["atan2single"] = MathTests.Atan2SingleTest, ["ceilingdouble"] = MathTests.CeilingDoubleTest, + ["ceilingsingle"] = MathTests.CeilingSingleTest, ["cosdouble"] = MathTests.CosDoubleTest, + ["cossingle"] = MathTests.CosSingleTest, ["coshdouble"] = MathTests.CoshDoubleTest, + ["coshsingle"] = MathTests.CoshSingleTest, ["expdouble"] = MathTests.ExpDoubleTest, + ["expsingle"] = MathTests.ExpSingleTest, ["floordouble"] = MathTests.FloorDoubleTest, + ["floorsingle"] = MathTests.FloorSingleTest, ["logdouble"] = MathTests.LogDoubleTest, + ["logsingle"] = MathTests.LogSingleTest, ["log10double"] = MathTests.Log10DoubleTest, + ["log10single"] = MathTests.Log10SingleTest, ["powdouble"] = MathTests.PowDoubleTest, + ["powsingle"] = MathTests.PowSingleTest, ["rounddouble"] = MathTests.RoundDoubleTest, + ["roundsingle"] = MathTests.RoundSingleTest, ["sindouble"] = MathTests.SinDoubleTest, + ["sinsingle"] = MathTests.SinSingleTest, ["sinhdouble"] = MathTests.SinhDoubleTest, + ["sinhsingle"] = MathTests.SinhSingleTest, ["sqrtdouble"] = MathTests.SqrtDoubleTest, + ["sqrtsingle"] = MathTests.SqrtSingleTest, ["tandouble"] = MathTests.TanDoubleTest, - ["tanhdouble"] = MathTests.TanhDoubleTest + ["tansingle"] = MathTests.TanSingleTest, + ["tanhdouble"] = MathTests.TanhDoubleTest, + ["tanhsingle"] = MathTests.TanhSingleTest }; private static int Main(string[] args) diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj index 773472d4a4..067ea9f7e0 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj @@ -9,7 +9,8 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netcoreapp1.1</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -29,8 +30,9 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <ItemGroup> + <Compile Include="Functions.cs" /> + <Compile Include="MathTests.cs" /> <Compile Include="Double\AbsDouble.cs" /> - <Compile Include="Single\AbsSingle.cs" /> <Compile Include="Double\AcosDouble.cs" /> <Compile Include="Double\AsinDouble.cs" /> <Compile Include="Double\AtanDouble.cs" /> @@ -40,10 +42,8 @@ <Compile Include="Double\CoshDouble.cs" /> <Compile Include="Double\ExpDouble.cs" /> <Compile Include="Double\FloorDouble.cs" /> - <Compile Include="Functions.cs" /> <Compile Include="Double\LogDouble.cs" /> <Compile Include="Double\Log10Double.cs" /> - <Compile Include="MathTests.cs" /> <Compile Include="Double\PowDouble.cs" /> <Compile Include="Double\RoundDouble.cs" /> <Compile Include="Double\SinDouble.cs" /> @@ -51,12 +51,27 @@ <Compile Include="Double\SqrtDouble.cs" /> <Compile Include="Double\TanDouble.cs" /> <Compile Include="Double\TanhDouble.cs" /> + <Compile Include="Single\AbsSingle.cs" /> + <Compile Include="Single\AcosSingle.cs" /> + <Compile Include="Single\AsinSingle.cs" /> + <Compile Include="Single\AtanSingle.cs" /> + <Compile Include="Single\Atan2Single.cs" /> + <Compile Include="Single\CeilingSingle.cs" /> + <Compile Include="Single\CosSingle.cs" /> + <Compile Include="Single\CoshSingle.cs" /> + <Compile Include="Single\ExpSingle.cs" /> + <Compile Include="Single\FloorSingle.cs" /> + <Compile Include="Single\LogSingle.cs" /> + <Compile Include="Single\Log10Single.cs" /> + <Compile Include="Single\PowSingle.cs" /> + <Compile Include="Single\RoundSingle.cs" /> + <Compile Include="Single\SinSingle.cs" /> + <Compile Include="Single\SinhSingle.cs" /> + <Compile Include="Single\SqrtSingle.cs" /> + <Compile Include="Single\TanSingle.cs" /> + <Compile Include="Single\TanhSingle.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AbsSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AbsSingle.cs index 6168991297..8100c37e1d 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AbsSingle.cs +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AbsSingle.cs @@ -40,7 +40,7 @@ namespace Functions if (diff > singleEpsilon) { - throw new Exception($"Expected Result {absSingleExpectedResult}; Actual Result {result}"); + throw new Exception($"Expected Result {absSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); } } } diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AcosSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AcosSingle.cs new file mode 100644 index 0000000000..b958cc1bb4 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AcosSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Acos(float) over 5000 iterations for the domain -1, +1 + + private const float acosSingleDelta = 0.0004f; + private const float acosSingleExpectedResult = 7852.41084f; + + [Benchmark] + public static void AcosSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + AcosSingleTest(); + } + } + } + + public static void AcosSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += acosSingleDelta; + result += MathF.Acos(value); + } + + var diff = MathF.Abs(acosSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {acosSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AsinSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AsinSingle.cs new file mode 100644 index 0000000000..917c49288f --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AsinSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Asin(float) over 5000 iterations for the domain -1, +1 + + private const float asinSingleDelta = 0.0004f; + private const float asinSingleExpectedResult = 1.57079590f; + + [Benchmark] + public static void AsinSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + AsinSingleTest(); + } + } + } + + public static void AsinSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += asinSingleDelta; + result += MathF.Asin(value); + } + + var diff = MathF.Abs(asinSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {asinSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/Atan2Single.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/Atan2Single.cs new file mode 100644 index 0000000000..a3a4577947 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/Atan2Single.cs @@ -0,0 +1,48 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Atan2(float, float) over 5000 iterations for the domain y: -1, +1; x: +1, -1 + + private const float atan2SingleDeltaX = -0.0004f; + private const float atan2SingleDeltaY = 0.0004f; + private const float atan2SingleExpectedResult = 3930.14282f; + + [Benchmark] + public static void Atan2SingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Atan2SingleTest(); + } + } + } + + public static void Atan2SingleTest() + { + var result = 0.0f; var valueX = 1.0f; var valueY = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + valueX += atan2SingleDeltaX; valueY += atan2SingleDeltaY; + result += MathF.Atan2(valueY, valueX); + } + + var diff = MathF.Abs(atan2SingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {atan2SingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AtanSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AtanSingle.cs new file mode 100644 index 0000000000..95cc0e226e --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/AtanSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Atan(float) over 5000 iterations for the domain -1, +1 + + private const float atanSingleDelta = 0.0004f; + private const float atanSingleExpectedResult = 0.841940999f; + + [Benchmark] + public static void AtanSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + AtanSingleTest(); + } + } + } + + public static void AtanSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += atanSingleDelta; + result += MathF.Atan(value); + } + + var diff = MathF.Abs(atanSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {atanSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/CeilingSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/CeilingSingle.cs new file mode 100644 index 0000000000..85454f1cc8 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/CeilingSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Ceiling(float) over 5000 iterations for the domain -1, +1 + + private const float ceilingSingleDelta = 0.0004f; + private const float ceilingSingleExpectedResult = 2502.0f; + + [Benchmark] + public static void CeilingSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + CeilingSingleTest(); + } + } + } + + public static void CeilingSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += ceilingSingleDelta; + result += MathF.Ceiling(value); + } + + var diff = MathF.Abs(ceilingSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {ceilingSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/CosSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/CosSingle.cs new file mode 100644 index 0000000000..3d1d6a3b58 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/CosSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Cos(float) over 5000 iterations for the domain 0, PI + + private const float cosSingleDelta = 0.000628318531f; + private const float cosSingleExpectedResult = -0.993487537f; + + [Benchmark] + public static void CosSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + CosSingleTest(); + } + } + } + + public static void CosSingleTest() + { + var result = 0.0f; var value = 0.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += cosSingleDelta; + result += MathF.Cos(value); + } + + var diff = MathF.Abs(cosSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {cosSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/CoshSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/CoshSingle.cs new file mode 100644 index 0000000000..072a0dcf66 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/CoshSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Cosh(float) over 5000 iterations for the domain -1, +1 + + private const float coshSingleDelta = 0.0004f; + private const float coshSingleExpectedResult = 5876.02588f; + + [Benchmark] + public static void CoshSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + CoshSingleTest(); + } + } + } + + public static void CoshSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += coshSingleDelta; + result += MathF.Cosh(value); + } + + var diff = MathF.Abs(coshSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {coshSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/ExpSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/ExpSingle.cs new file mode 100644 index 0000000000..e9d61c9f5d --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/ExpSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Exp(float) over 5000 iterations for the domain -1, +1 + + private const float expSingleDelta = 0.0004f; + private const float expSingleExpectedResult = 5877.28564f; + + [Benchmark] + public static void ExpSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + ExpSingleTest(); + } + } + } + + public static void ExpSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += expSingleDelta; + result += MathF.Exp(value); + } + + var diff = MathF.Abs(expSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {expSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/FloorSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/FloorSingle.cs new file mode 100644 index 0000000000..ce1febb178 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/FloorSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Floor(float) over 5000 iterations for the domain -1, +1 + + private const float floorSingleDelta = 0.0004f; + private const float floorSingleExpectedResult = -2498.0f; + + [Benchmark] + public static void FloorSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + FloorSingleTest(); + } + } + } + + public static void FloorSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += floorSingleDelta; + result += MathF.Floor(value); + } + + var diff = MathF.Abs(floorSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {floorSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/Log10Single.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/Log10Single.cs new file mode 100644 index 0000000000..80f00b3ec8 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/Log10Single.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Log10(float) over 5000 iterations for the domain -1, +1 + + private const float log10SingleDelta = 0.0004f; + private const float log10SingleExpectedResult = -664.094971f; + + [Benchmark] + public static void Log10SingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + Log10SingleTest(); + } + } + } + + public static void Log10SingleTest() + { + var result = 0.0f; var value = 0.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += log10SingleDelta; + result += MathF.Log10(value); + } + + var diff = MathF.Abs(log10SingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {log10SingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/LogSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/LogSingle.cs new file mode 100644 index 0000000000..3f07ef16ab --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/LogSingle.cs @@ -0,0 +1,48 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Log(float) over 5000 iterations for the domain -1, +1 + + private const float logSingleDelta = 0.0004f; + private const float logSingleExpectedResult = -1529.14014f; + + [Benchmark] + public static void LogSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + LogSingleTest(); + } + } + } + + public static void LogSingleTest() + { + var result = 0.0f; var value = 0.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += logSingleDelta; + result += MathF.Log(value); + } + + var diff = MathF.Abs(logSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {logSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } + +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/PowSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/PowSingle.cs new file mode 100644 index 0000000000..49de8a0101 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/PowSingle.cs @@ -0,0 +1,48 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Pow(float, float) over 5000 iterations for the domain x: +2, +1; y: -2, -1 + + private const float powSingleDeltaX = -0.0004f; + private const float powSingleDeltaY = 0.0004f; + private const float powSingleExpectedResult = 4659.30762f; + + [Benchmark] + public static void PowSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + PowSingleTest(); + } + } + } + + public static void PowSingleTest() + { + var result = 0.0f; var valueX = 2.0f; var valueY = -2.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + valueX += powSingleDeltaX; valueY += powSingleDeltaY; + result += MathF.Pow(valueX, valueY); + } + + var diff = MathF.Abs(powSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {powSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/RoundSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/RoundSingle.cs new file mode 100644 index 0000000000..b494a2a985 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/RoundSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Round(float) over 5000 iterations for the domain -PI/2, +PI/2 + + private const float roundSingleDelta = 0.000628318531f; + private const float roundSingleExpectedResult = 2.0f; + + [Benchmark] + public static void RoundSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + RoundSingleTest(); + } + } + } + + public static void RoundSingleTest() + { + var result = 0.0f; var value = -1.57079633f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += roundSingleDelta; + result += MathF.Round(value); + } + + var diff = MathF.Abs(roundSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {roundSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/SinSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/SinSingle.cs new file mode 100644 index 0000000000..4d6228361e --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/SinSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Sin(float) over 5000 iterations for the domain -PI/2, +PI/2 + + private const float sinSingleDelta = 0.000628318531f; + private const float sinSingleExpectedResult = 1.03592682f; + + [Benchmark] + public static void SinSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SinSingleTest(); + } + } + } + + public static void SinSingleTest() + { + var result = 0.0f; var value = -1.57079633f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += sinSingleDelta; + result += MathF.Sin(value); + } + + var diff = MathF.Abs(sinSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {sinSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/SinhSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/SinhSingle.cs new file mode 100644 index 0000000000..9ed01e4f55 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/SinhSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Sinh(float) over 5000 iterations for the domain -1, +1 + + private const float sinhSingleDelta = 0.0004f; + private const float sinhSingleExpectedResult = 1.26028216f; + + [Benchmark] + public static void SinhSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SinhSingleTest(); + } + } + } + + public static void SinhSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += sinhSingleDelta; + result += MathF.Sinh(value); + } + + var diff = MathF.Abs(sinhSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {sinhSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/SqrtSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/SqrtSingle.cs new file mode 100644 index 0000000000..f7349c1a5f --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/SqrtSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Sqrt(float) over 5000 iterations for the domain 0, PI + + private const float sqrtSingleDelta = 0.000628318531f; + private const float sqrtSingleExpectedResult = 5909.03027f; + + [Benchmark] + public static void SqrtSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + SqrtSingleTest(); + } + } + } + + public static void SqrtSingleTest() + { + var result = 0.0f; var value = 0.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += sqrtSingleDelta; + result += MathF.Sqrt(value); + } + + var diff = MathF.Abs(sqrtSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {sqrtSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/TanSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/TanSingle.cs new file mode 100644 index 0000000000..b81050bfa3 --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/TanSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Tan(float) over 5000 iterations for the domain -PI/2, +PI/2 + + private const float tanSingleDelta = 0.0004f; + private const float tanSingleExpectedResult = 1.66717815f; + + [Benchmark] + public static void TanSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + TanSingleTest(); + } + } + } + + public static void TanSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += tanSingleDelta; + result += MathF.Tan(value); + } + + var diff = MathF.Abs(tanSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {tanSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/TanhSingle.cs b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/TanhSingle.cs new file mode 100644 index 0000000000..160e1135bf --- /dev/null +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Single/TanhSingle.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.Xunit.Performance; + +namespace Functions +{ + public static partial class MathTests + { + // Tests MathF.Tanh(float) over 5000 iterations for the domain -1, +1 + + private const float tanhSingleDelta = 0.0004f; + private const float tanhSingleExpectedResult = 0.816701353f; + + [Benchmark] + public static void TanhSingleBenchmark() + { + foreach (var iteration in Benchmark.Iterations) + { + using (iteration.StartMeasurement()) + { + TanhSingleTest(); + } + } + } + + public static void TanhSingleTest() + { + var result = 0.0f; var value = -1.0f; + + for (var iteration = 0; iteration < iterations; iteration++) + { + value += tanhSingleDelta; + result += MathF.Tanh(value); + } + + var diff = MathF.Abs(tanhSingleExpectedResult - result); + + if (diff > singleEpsilon) + { + throw new Exception($"Expected Result {tanhSingleExpectedResult,10:g9}; Actual Result {result,10:g9}"); + } + } + } +} diff --git a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.cs b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.cs index e3337d115b..704e728c55 100644 --- a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.cs +++ b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.cs @@ -13,7 +13,6 @@ using System.Linq; using System.Runtime.CompilerServices; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] public static class CscBench { diff --git a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj index baea313f2c..bb5226e58c 100644 --- a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -30,10 +31,9 @@ <ItemGroup> <Compile Include="CscBench.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark+roslyn\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+roslyn\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+roslyn\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs index 5ab08202b6..c5058dcfac 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.cs @@ -9,7 +9,6 @@ using System.Diagnostics; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace SIMD { diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj index b6224770fa..dc256858fa 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -38,10 +39,9 @@ <Compile Include="VectorFloatStrict.cs" /> <Compile Include="VectorHelpers.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj index 0b1e5be0ae..ea19938bd5 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -44,10 +45,9 @@ <Compile Include="Surfaces.cs" /> <Compile Include="Vector.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracerBench.cs b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracerBench.cs index 254672b462..715e0e2a89 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracerBench.cs +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracerBench.cs @@ -14,7 +14,6 @@ using System.Threading.Tasks; using System.Collections.Concurrent; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace SIMD { diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs index 81d9c0952f..bfa1f43a5f 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using Xunit; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] public static class SeekUnroll { diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj index d5c72559ec..dc31f186a2 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj @@ -30,11 +30,9 @@ <ItemGroup> <Compile Include="SeekUnroll.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj index 917d749d41..65726fce85 100644 --- a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <AssemblyName>SciMark</AssemblyName> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -39,10 +40,9 @@ <Compile Include="SparseCompRow.cs" /> <Compile Include="Stopwatch.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/SciMark/kernel.cs b/tests/src/JIT/Performance/CodeQuality/SciMark/kernel.cs index 3cba0c16c8..e06d7ff093 100644 --- a/tests/src/JIT/Performance/CodeQuality/SciMark/kernel.cs +++ b/tests/src/JIT/Performance/CodeQuality/SciMark/kernel.cs @@ -4,9 +4,9 @@ /// <license> /// This is a port of the SciMark2a Java Benchmark to C# by /// Chris Re (cmr28@cornell.edu) and Werner Vogels (vogels@cs.cornell.edu) -/// +/// /// For details on the original authors see http://math.nist.gov/scimark2 -/// +/// /// This software is likely to burn your processor, bitflip your memory chips /// anihilate your screen and corrupt all your disks, so you it at your /// own risk. @@ -17,7 +17,6 @@ using Microsoft.Xunit.Performance; using System; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace SciMark2 { @@ -217,7 +216,7 @@ namespace SciMark2 // +** * * + // +* * * * + // +* * * * + - // +* * * * + + // +* * * * + // +-----------------+ // // (as best reproducible with integer artihmetic) diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.cs b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.cs index 56fc2665ad..5658161644 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.cs +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.cs @@ -13,7 +13,6 @@ using Newtonsoft.Json.Bson; using Microsoft.Xunit.Performance; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Serialization { diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj index c08d1cd14b..e28565bb52 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Deserialize.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.cs b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.cs index 39ab5876c9..6e2c41a6d1 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.cs +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.cs @@ -12,7 +12,6 @@ using Newtonsoft.Json.Bson; using Microsoft.Xunit.Performance; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Serialization { diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj index 04798526f9..235de76463 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Serialize.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.cs b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.cs index 4a7264ba92..c7f4846548 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.cs +++ b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.cs @@ -14,7 +14,6 @@ using Xunit; using Microsoft.Xunit.Performance; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Span { @@ -526,7 +525,7 @@ namespace Span Invoke((int innerIterationCount) => { byte result = TestKnownSizeArray(innerIterationCount); - return result; + return result; }, "KnownSizeArray({0})", length); } @@ -1014,7 +1013,7 @@ namespace Span Console.WriteLine("Some tests failed validation"); return -1; } - + return 100; } } diff --git a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj index a871713d1d..0427657cf5 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj @@ -12,6 +12,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -34,11 +35,9 @@ <ItemGroup> <Compile Include="Indexer.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.cs b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.cs index d84152132d..ef694421ef 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.cs +++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.cs @@ -14,7 +14,6 @@ using Xunit; using Microsoft.Xunit.Performance; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace Span { @@ -1109,7 +1108,7 @@ namespace Span #endregion #region TestSpanAsSpanStringChar<T> - + [Benchmark(InnerIterationCount = BaseIterations)] [InlineData(1)] [InlineData(10)] @@ -1146,7 +1145,7 @@ namespace Span } } - #endregion + #endregion #endregion // TestSpanAPIs @@ -1186,7 +1185,7 @@ namespace Span } } } - + // The only failure modes are crash/exception. return 100; } diff --git a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj index 7404828bcd..f3bcfa2ed9 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj @@ -12,6 +12,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -33,11 +34,9 @@ <ItemGroup> <Compile Include="SpanBench.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs index 620e012848..f49f92f8db 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs +++ b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs @@ -44,7 +44,6 @@ using System.Collections.Generic; using System.Globalization; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] namespace V8.Crypto { diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj index ec9e4e1bbf..ff54fab733 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj +++ b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Crypto.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.cs b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.cs index 5095d22ad7..33f00ad8aa 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.cs +++ b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.cs @@ -15,7 +15,6 @@ using System; using System.Collections.Generic; [assembly: OptimizeForBenchmarks] -[assembly: MeasureInstructionsRetired] // using System.Diagnostics; // using System.Text.RegularExpressions; diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj index f81039d693..50c8420691 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj +++ b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Richards.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj index 0489b0a8b0..6932f71cae 100644 --- a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj +++ b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj @@ -28,10 +28,9 @@ <ItemGroup> <Compile Include="RunBenchmarks.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj index 46b4b8e24f..949136259b 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b51817.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj index fb24d78107..bb1bf4d139 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b52593.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj index 2358d4970f..68a40de4bd 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b52733.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj index 26cd0e80c3..509a6628ea 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b52840.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj index 3c046ea754..99cdb6ebbb 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b53226a.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj index 9acb19163a..3bd0fa0fa7 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b53226b.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj index 1067ba1e42..390448cfd3 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b66533.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.cs b/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.cs new file mode 100644 index 0000000000..7b69838a3a --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.cs @@ -0,0 +1,52 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +// Repro case for a bug involving hoisting of static field loads out of +// loops and (illegally) above the corresponding type initializer calls. + +using System.Runtime.CompilerServices; + +namespace N +{ + public struct Pair + { + public int Left; + public int Right; + + public static Pair TenFour = new Pair() { Left = 10, Right = 4 }; + } + + static class C + { + static int Sum; + static int Two; + + // Bug repro requires a use of a Pair value; this is a small fn that takes + // a Pair by value to serve as that use. Inline it aggressively so that + // we won't think the call might kill the static field. + [MethodImpl(MethodImplOptions.AggressiveInlining)] + static void Accumulate(Pair pair) + { + Sum += pair.Left + pair.Right; + } + + + [MethodImpl(MethodImplOptions.NoInlining)] + static void SumNFourteens(int n) + { + for (int i = 0; i < n; ++i) + { + Two = 2; // Store to C.Two here is a global side-effect above which we won't hoist the static initializer (since it may throw). + Accumulate(Pair.TenFour); // Hoisting the load of Pair.TenFour above the static init call is incorrect. + } + } + + public static int Main(string[] args) + { + Sum = 0; + SumNFourteens(7); // Now Sum = 14 * 7 = 98 (and Two = 2) + return Sum + Two; // 98 + 2 = 100 on success + } + } +} diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.csproj new file mode 100644 index 0000000000..6223cb9edd --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.csproj @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <AssemblyName>$(MSBuildProjectName)</AssemblyName> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{1D93D1C3-458A-44ED-ABCC-7D0739B28C92}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <PropertyGroup> + <DebugType></DebugType> + <Optimize>True</Optimize> + <AllowUnsafeBlocks>True</AllowUnsafeBlocks> + </PropertyGroup> + <ItemGroup> + <Compile Include="GitHub_10780.cs" /> + </ItemGroup> + <PropertyGroup> + <!-- NOTE: tailcall stress should be reenabled under zapdisable when #11408 is fixed --> + <CLRTestBatchPreCommands><![CDATA[ +$(CLRTestBatchPreCommands) +if "%COMPlus_ZapDisable%"=="" set COMPlus_TailcallStress=1 +]]></CLRTestBatchPreCommands> + <BashCLRTestPreCommands><![CDATA[ +$(BashCLRTestPreCommands) +if [ -z $COMPlus_ZapDisable ]; then + export COMPlus_TailcallStress=1 +fi +]]></BashCLRTestPreCommands> + </PropertyGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + </PropertyGroup> +</Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11343/GitHub_11343.cs b/tests/src/JIT/Regression/JitBlue/GitHub_11343/GitHub_11343.cs new file mode 100644 index 0000000000..e23d9fc76c --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11343/GitHub_11343.cs @@ -0,0 +1,33 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Runtime.CompilerServices; + +class GitHub_11343 +{ + const int Passed = 100; + const int Failed = 0; + + [MethodImpl(MethodImplOptions.NoInlining)] + static void Test() + { + string s = null; + // Should throw NullReferenceException even if the result is not used + int unused = s.Length; + } + + static int Main() + { + try + { + Test(); + return Failed; + } + catch (NullReferenceException) + { + return Passed; + } + } +} diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11343/GitHub_11343.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_11343/GitHub_11343.csproj new file mode 100644 index 0000000000..c493c4ed35 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11343/GitHub_11343.csproj @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <AssemblyName>$(MSBuildProjectName)</AssemblyName> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <PropertyGroup> + <DebugType></DebugType> + <Optimize>True</Optimize> + </PropertyGroup> + <ItemGroup> + <Compile Include="GitHub_11343.cs" /> + </ItemGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + </PropertyGroup> +</Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11408/GitHub_11408.cs b/tests/src/JIT/Regression/JitBlue/GitHub_11408/GitHub_11408.cs new file mode 100644 index 0000000000..715cd5f0cf --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11408/GitHub_11408.cs @@ -0,0 +1,45 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Runtime.CompilerServices; + +class GitHub_11408 +{ + const int Pass = 100; + const int Fail = -1; + + unsafe class Program + { + static int save = 7; + + static void foo(IntPtr x) + { + save = *(int*)x; + Console.WriteLine(*(int*)x); + } + + static void bar() + { + int x = 42; + foo((IntPtr)(&x)); + } + + public static int Main(string[] args) + { + bar(); + + if (save == 42) + { + Console.WriteLine("Pass"); + return Pass; + } + else + { + Console.WriteLine("Fail"); + return Fail; + } + } + } +} diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11408/GitHub_11408.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_11408/GitHub_11408.csproj new file mode 100644 index 0000000000..251856c956 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11408/GitHub_11408.csproj @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <AssemblyName>$(MSBuildProjectName)</AssemblyName> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <PropertyGroup> + <DebugType></DebugType> + <Optimize>True</Optimize> + <AllowUnsafeBlocks>True</AllowUnsafeBlocks> + </PropertyGroup> + <ItemGroup> + <Compile Include="GitHub_11408.cs" /> + </ItemGroup> + <PropertyGroup> + <CLRTestBatchPreCommands><![CDATA[ +$(CLRTestBatchPreCommands) +set COMPlus_TailcallStress=1 +]]></CLRTestBatchPreCommands> + <BashCLRTestPreCommands><![CDATA[ +$(BashCLRTestPreCommands) +export COMPlus_TailcallStress=1 +]]></BashCLRTestPreCommands> + </PropertyGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + </PropertyGroup> +</Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11508/GitHub_11508.cs b/tests/src/JIT/Regression/JitBlue/GitHub_11508/GitHub_11508.cs new file mode 100644 index 0000000000..11081ba9ae --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11508/GitHub_11508.cs @@ -0,0 +1,56 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.Runtime.CompilerServices; + +namespace TestApp +{ + public struct StructWithValue : IEquatable<StructWithValue> + { + private ushort value; + + public StructWithValue(ushort v) + { + value = v; + } + + + public bool Equals(StructWithValue other) + { + if (value.Equals (other.value)) + return true; + else + return false; + } + } + + class Program + { + [MethodImpl(MethodImplOptions.NoOptimization)] + static int Main(string[] args) + { + var comparer = EqualityComparer<StructWithValue>.Default; + + for (ushort i = 0; ; i++) + { + var a = new StructWithValue(i); + var b = new StructWithValue(i); + + if (!comparer.Equals(a, b)) + { + return 0; + } + + if (i == ushort.MaxValue) + { + break; + } + } + + return 100; + } + } +} diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11508/GitHub_11508.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_11508/GitHub_11508.csproj new file mode 100644 index 0000000000..4c38b3e92c --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11508/GitHub_11508.csproj @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> + <OutputType>Exe</OutputType> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <PropertyGroup> + <DebugType>None</DebugType> + <Optimize>True</Optimize> + </PropertyGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <ItemGroup> + <Compile Include="GitHub_11508.cs" /> + </ItemGroup> + <!-- <PropertyGroup> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> + </PropertyGroup>--> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> +</Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11574/GitHub_11574.cs b/tests/src/JIT/Regression/JitBlue/GitHub_11574/GitHub_11574.cs new file mode 100644 index 0000000000..9e6e5d94cd --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11574/GitHub_11574.cs @@ -0,0 +1,44 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.Runtime.CompilerServices; + +class Program +{ + static byte[] s_arr2; + static byte[] s_arr3; + + static void Init() + { + s_arr2 = new byte[] { 0x11, 0x12, 0x13 }; + s_arr3 = new byte[] { 0x21, 0x22, 0x33 }; + } + + [MethodImpl(MethodImplOptions.NoInlining)] + static int Check(int actual, int added, int expected, int rv) + { + return (actual == expected) ? rv : 0; + } + + static int Main(string[] args) + { + Init(); + + byte[] arr1 = new byte[] { 2 }; + byte[] arr2 = s_arr2; + byte[] arr3 = s_arr3; + + int rv = 100; + int len = arr1.Length + arr2.Length + arr3.Length; + int cur = 0; + rv = Check(cur, 0, 0, rv); + cur += arr1.Length; + rv = Check(cur, arr1.Length, 1, rv); + cur += arr2.Length; + rv = Check(cur, arr2.Length, 4, rv); + cur += arr3.Length; + rv = Check(cur, arr3.Length, 7, rv); + return Check(cur, 0, len, rv); + } +} diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11574/GitHub_11574.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_11574/GitHub_11574.csproj new file mode 100644 index 0000000000..e5e41eab5a --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11574/GitHub_11574.csproj @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> + <OutputType>Exe</OutputType> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <PropertyGroup> + <DebugType>None</DebugType> + <Optimize>True</Optimize> + </PropertyGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <ItemGroup> + <Compile Include="GitHub_11574.cs" /> + </ItemGroup> + <!-- <PropertyGroup> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> + </PropertyGroup>--> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> +</Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.cs b/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.cs new file mode 100644 index 0000000000..3d8428c928 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.cs @@ -0,0 +1,39 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +// Repro case for a bug involving hoisting of static field loads out of +// loops and (illegally) above the corresponding type initializer calls. + +using System.Runtime.CompilerServices; + +namespace N +{ + struct WrappedInt + { + public int Value; + + public static WrappedInt Twenty = new WrappedInt() { Value = 20 }; + } + public static class C + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + static int unwrap(WrappedInt wi) => wi.Value; + + [MethodImpl(MethodImplOptions.NoInlining)] + static int foo(int s, int n) + { + for (int i = 0; i < n; ++i) + { + s += unwrap(WrappedInt.Twenty); // Loading WrappedInt.Twenty must happen after calling the cctor + } + + return s; + } + + public static int Main(string[] args) + { + return foo(20, 4); + } + } +} diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.csproj new file mode 100644 index 0000000000..63b9927c67 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.csproj @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <AssemblyName>$(MSBuildProjectName)</AssemblyName> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{A04B4F1F-62D3-4799-94AB-ABFB220415BE}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <PropertyGroup> + <DebugType></DebugType> + <Optimize>True</Optimize> + <AllowUnsafeBlocks>True</AllowUnsafeBlocks> + </PropertyGroup> + <ItemGroup> + <Compile Include="GitHub_11689.cs" /> + </ItemGroup> + <PropertyGroup> + <!-- NOTE: tailcall stress should be reenabled under zapdisable when #11408 is fixed --> + <CLRTestBatchPreCommands><![CDATA[ +$(CLRTestBatchPreCommands) +if "%COMPlus_ZapDisable%"=="" set COMPlus_TailcallStress=1 +]]></CLRTestBatchPreCommands> + <BashCLRTestPreCommands><![CDATA[ +$(BashCLRTestPreCommands) +if [ -z $COMPlus_ZapDisable ]; then + export COMPlus_TailcallStress=1 +fi +]]></BashCLRTestPreCommands> + </PropertyGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + </PropertyGroup> +</Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11733/GitHub_11733.cs b/tests/src/JIT/Regression/JitBlue/GitHub_11733/GitHub_11733.cs new file mode 100644 index 0000000000..2c49d298d8 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11733/GitHub_11733.cs @@ -0,0 +1,26 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Runtime.CompilerServices; + +class C +{ + [MethodImpl(MethodImplOptions.NoInlining)] + static float L(float a) + { + return M(float.NegativeInfinity, a); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + static float M(float a, float b) + { + return (float)Math.Pow(a, (float)Math.Pow(b, a)); + } + + static int Main() + { + return L(0) == M(float.NegativeInfinity, 0) ? 100 : 0; + } +} diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11733/GitHub_11733.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_11733/GitHub_11733.csproj new file mode 100644 index 0000000000..4caef234a1 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11733/GitHub_11733.csproj @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <AssemblyName>$(MSBuildProjectName)</AssemblyName> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <PropertyGroup> + <DebugType></DebugType> + <Optimize>True</Optimize> + </PropertyGroup> + <ItemGroup> + <Compile Include="GitHub_11733.cs" /> + </ItemGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + </PropertyGroup> +</Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.il b/tests/src/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.il new file mode 100644 index 0000000000..50d89734d9 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.il @@ -0,0 +1,85 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +.assembly extern System.Private.CoreLib +{ + .publickeytoken = (7C EC 85 D7 BE A7 79 8E ) // |.....y. + .ver 4:0:0:0 +} +.assembly extern System.Numerics.Vectors +{ + .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: + .ver 4:1:3:0 +} +.assembly extern System.Runtime.CompilerServices.Unsafe +{ + .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: + .ver 4:0:3:0 +} +.assembly GitHub_11804 +{ + .custom instance void [System.Private.CoreLib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) + .custom instance void [System.Private.CoreLib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx + 63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows. + + .hash algorithm 0x00008004 + .ver 0:0:0:0 +} +.module GitHub_11804.exe +// MVID: {9CC2AC15-DDA3-4ADF-9566-89AB25A8CF63} +.imagebase 0x00400000 +.file alignment 0x00000200 +.stackreserve 0x00100000 +.subsystem 0x0003 // WINDOWS_CUI +.corflags 0x00000001 // ILONLY +// Image base: 0x01590000 + + +.class private abstract auto ansi sealed beforefieldinit C + extends [System.Private.CoreLib]System.Object +{ + .method private hidebysig static int32 + UnsafeGrab() cil managed noinlining + { + // Code size 18 (0x12) + .maxstack 2 + .locals init (valuetype [System.Numerics.Vectors]System.Numerics.Vector`1<int32> V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.s 50 + IL_0004: call instance void valuetype [System.Numerics.Vectors]System.Numerics.Vector`1<int32>::.ctor(!0) + IL_0009: ldloca.s V_0 + IL_000b: call !!1& [System.Runtime.CompilerServices.Unsafe]System.Runtime.CompilerServices.Unsafe::As<valuetype [System.Numerics.Vectors]System.Numerics.Vector`1<int32>,int32>(!!0&) + IL_0010: ldind.i4 + IL_0011: ret + } // end of method C::UnsafeGrab + + .method private hidebysig static int32 + IndexerGrab() cil managed noinlining + { + // Code size 18 (0x12) + .maxstack 2 + .locals init (valuetype [System.Numerics.Vectors]System.Numerics.Vector`1<int32> V_0) + IL_0000: ldloca.s V_0 + IL_0002: ldc.i4.s 50 + IL_0004: call instance void valuetype [System.Numerics.Vectors]System.Numerics.Vector`1<int32>::.ctor(!0) + IL_0009: ldloca.s V_0 + IL_000b: ldc.i4.0 + IL_000c: call instance !0 valuetype [System.Numerics.Vectors]System.Numerics.Vector`1<int32>::get_Item(int32) + IL_0011: ret + } // end of method C::IndexerGrab + + .method private hidebysig static int32 + Main() cil managed + { + .entrypoint + // Code size 20 (0x14) + .maxstack 8 + + IL_0008: call int32 C::IndexerGrab() + IL_000d: call int32 C::UnsafeGrab() + IL_0012: add + IL_0013: ret + } // end of method C::Main + +} // end of class C diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.ilproj b/tests/src/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.ilproj new file mode 100644 index 0000000000..93c281624b --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.ilproj @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <AssemblyName>$(MSBuildProjectName)</AssemblyName> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> + <OutputType>Exe</OutputType> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <PropertyGroup> + <DebugType>None</DebugType> + <Optimize>True</Optimize> + </PropertyGroup> + <ItemGroup> + <Compile Include="GitHub_11804.il" /> + </ItemGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + </PropertyGroup> +</Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj index 2d330449a1..d6d753abaa 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj index 1d20f00012..1b7f8a70b5 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj @@ -33,11 +33,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj index 6107b7f18d..7bdd3d7238 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj @@ -28,10 +28,9 @@ <ItemGroup> <Compile Include="GitHub_8231.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj index 238a9b609a..db2490dda9 100644 --- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj +++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="_5mvazhg.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj index 30b8c4b97e..a3fbd8a948 100644 --- a/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj +++ b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj @@ -20,9 +20,10 @@ <ItemGroup> <Compile Include="DoWhileBndChk.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj new file mode 100644 index 0000000000..9155703cd3 --- /dev/null +++ b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> + <Version>1.1.1</Version> + </PackageReference> + <PackageReference Include="xunit.performance.api"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>$(MicrosoftDiagnosticsTracingLibraryVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Dynamic.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Numerics.Vectors"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Numerics"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Security.Cryptography.Algorithms"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XUnitConsoleNetCoreVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.4</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/JIT/config/benchmark+roslyn/project.json b/tests/src/JIT/config/benchmark+roslyn/project.json deleted file mode 100644 index 18907a1214..0000000000 --- a/tests/src/JIT/config/benchmark+roslyn/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "dependencies": { - "Microsoft.CodeAnalysis.Compilers": "1.1.1", - "xunit.performance.api": "1.0.0-beta-build0003", - "xunit.performance.core": "1.0.0-beta-build0003", - "xunit.performance.execution": "1.0.0-beta-build0003", - "xunit.performance.metrics": "1.0.0-beta-build0003", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", - "System.Console": "4.4.0-beta-24913-02", - "System.Dynamic.Runtime": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Numerics.Vectors": "4.4.0-preview1-25221-01", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.Numerics": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.Tasks": "4.4.0-beta-24913-02", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj new file mode 100644 index 0000000000..36181432d2 --- /dev/null +++ b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>$(MicrosoftDiagnosticsTracingLibraryVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="Newtonsoft.Json"> + <Version>7.0.1</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.ObjectModel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Dynamic.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Serialization.Json"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Serialization.Primitives"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Serialization.Xml"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlSerializer"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XUnitConsoleNetCoreVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.4</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project> diff --git a/tests/src/JIT/config/benchmark+serialize/project.json b/tests/src/JIT/config/benchmark+serialize/project.json deleted file mode 100644 index b71701f9ef..0000000000 --- a/tests/src/JIT/config/benchmark+serialize/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "dependencies": { - "xunit.performance.api": "1.0.0-beta-build0003", - "xunit.performance.core": "1.0.0-beta-build0003", - "xunit.performance.execution": "1.0.0-beta-build0003", - "xunit.performance.metrics": "1.0.0-beta-build0003", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", - "Newtonsoft.Json": "7.0.1", - "System.Console": "4.4.0-beta-24913-02", - "System.IO": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.ObjectModel": "4.4.0-beta-24913-02", - "System.Dynamic.Runtime": "4.4.0-beta-24913-02", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.Serialization.Json": "4.4.0-beta-24913-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24913-02", - "System.Runtime.Serialization.Xml": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Xml.XmlDocument": "4.4.0-beta-24913-02", - "System.Xml.XmlSerializer": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/src/JIT/config/benchmark/benchmark.csproj b/tests/src/JIT/config/benchmark/benchmark.csproj new file mode 100644 index 0000000000..f739151181 --- /dev/null +++ b/tests/src/JIT/config/benchmark/benchmark.csproj @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>$(MicrosoftDiagnosticsTracingLibraryVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Collections.NonGeneric"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq.Expressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Memory"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Numerics.Vectors"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Numerics"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.ThreadPool"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Diagnostics.Process"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XUnitConsoleNetCoreVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.4</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/JIT/config/benchmark/project.json b/tests/src/JIT/config/benchmark/project.json deleted file mode 100644 index aac92ecc0b..0000000000 --- a/tests/src/JIT/config/benchmark/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "dependencies": { - "xunit.performance.api": "1.0.0-beta-build0003", - "xunit.performance.core": "1.0.0-beta-build0003", - "xunit.performance.execution": "1.0.0-beta-build0003", - "xunit.performance.metrics": "1.0.0-beta-build0003", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", - "System.Collections.NonGeneric": "4.4.0-beta-24913-02", - "System.Console": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.Linq.Parallel": "4.4.0-beta-24913-02", - "System.Linq.Expressions": "4.4.0-beta-24913-02", - "System.Memory": "4.4.0-preview1-25221-01", - "System.Numerics.Vectors": "4.4.0-preview1-25221-01", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01", - "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.Numerics": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.Tasks": "4.4.0-beta-24913-02", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", - "System.Threading.ThreadPool": "4.4.0-beta-24913-02", - "System.Diagnostics.Process": "4.4.0-beta-24913-02", - "System.Xml.XmlDocument": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj index f71ad15a05..8be1cb04bf 100644 --- a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj +++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/opt/Devirtualization/override.ilproj b/tests/src/JIT/opt/Devirtualization/override.ilproj index 0bfc25ff45..75da709ced 100644 --- a/tests/src/JIT/opt/Devirtualization/override.ilproj +++ b/tests/src/JIT/opt/Devirtualization/override.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/opt/Tailcall/TailcallVerifyTransparentLibraryWithPrefix.il b/tests/src/JIT/opt/Tailcall/TailcallVerifyTransparentLibraryWithPrefix.il index e295a99a01..ca789a673f 100644 --- a/tests/src/JIT/opt/Tailcall/TailcallVerifyTransparentLibraryWithPrefix.il +++ b/tests/src/JIT/opt/Tailcall/TailcallVerifyTransparentLibraryWithPrefix.il @@ -198,7 +198,8 @@ IL_0022: call void [mscorlib]System.Console::WriteLine(string) IL_0027: ldc.i4.s 101 IL_0029: stsfld int32 TailcallVerify.Condition22::Result - IL_002e: tail. call int32 TailcallVerify.Condition22::Callee2() +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_002e: call int32 TailcallVerify.Condition22::Callee2() IL_0033: pop IL_0034: ret } // end of method Condition22::Caller2 @@ -307,7 +308,8 @@ IL_0027: ldc.i4.s 101 IL_0029: stsfld int32 TailcallVerify.Condition22::Result IL_002e: ldarg.0 - IL_002f: tail. callvirt instance int32 TailcallVerify.Condition22::Callee3() +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_002f: callvirt instance int32 TailcallVerify.Condition22::Callee3() IL_0034: pop IL_0035: ret } // end of method Condition22::Caller3 diff --git a/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il b/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il index 1c354b7cdb..565451803b 100644 --- a/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il +++ b/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il @@ -13,6 +13,11 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern System.Threading.Thread +{ + .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) + .ver 4:0:0:0 +} .assembly extern System.Linq { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) @@ -2786,21 +2791,22 @@ .entrypoint .maxstack 1 - ldstr "Condition1.Test1" - call int32 TailcallVerify.Program::Run(string) - pop - ldstr "Condition1.Test2" - call int32 TailcallVerify.Program::Run(string) - pop - ldstr "Condition1.Test3" - call int32 TailcallVerify.Program::Run(string) - pop - ldstr "Condition2.Test1" - call int32 TailcallVerify.Program::Run(string) - pop - ldstr "Condition2.Test2" - call int32 TailcallVerify.Program::Run(string) - pop + // Disable tests intending to test tail.call,pop,ret sequence. + //ldstr "Condition1.Test1" + //call int32 TailcallVerify.Program::Run(string) + //pop + //ldstr "Condition1.Test2" + //call int32 TailcallVerify.Program::Run(string) + //pop + //ldstr "Condition1.Test3" + //call int32 TailcallVerify.Program::Run(string) + //pop + //ldstr "Condition2.Test1" + //call int32 TailcallVerify.Program::Run(string) + //pop + //ldstr "Condition2.Test2" + //call int32 TailcallVerify.Program::Run(string) + //pop ldstr "Condition3.Test1" call int32 TailcallVerify.Program::Run(string) pop @@ -2935,12 +2941,13 @@ ldstr "Condition20.Test1" call int32 TailcallVerify.Program::Run(string) pop - ldstr "Condition21.Test1" - call int32 TailcallVerify.Program::Run(string) - pop - ldstr "Condition21.Test2" - call int32 TailcallVerify.Program::Run(string) - pop + // Disable tests intending to test tail.call,pop,ret sequence. + //ldstr "Condition21.Test1" + //call int32 TailcallVerify.Program::Run(string) + //pop + //ldstr "Condition21.Test2" + //call int32 TailcallVerify.Program::Run(string) + //pop ldstr "Condition21.Test3" call int32 TailcallVerify.Program::Run(string) pop @@ -2950,9 +2957,10 @@ ldstr "Condition21.Test7" call int32 TailcallVerify.Program::Run(string) pop - ldstr "Condition22.Test2" - call int32 TailcallVerify.Program::Run(string) - pop + // Disable tests intending to test tail.call,pop,ret sequence. + //ldstr "Condition22.Test2" + //call int32 TailcallVerify.Program::Run(string) + //pop ldstr "Condition22.Test4" call int32 TailcallVerify.Program::Run(string) ret @@ -3561,7 +3569,8 @@ IL_0056: ldc.i4.3 IL_0057: ldc.i4.4 IL_0058: ldloc.0 - IL_0059: tail. call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeIsOdd1(int32, +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_0059: call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeIsOdd1(int32, int32, int32, int32, @@ -3940,7 +3949,8 @@ IL_0032: ldloca.s CS$0$0000 IL_0034: initobj TailcallVerify.ValueType3Bytes IL_003a: ldloc.0 - IL_003b: tail. call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeIsEven2(int32, +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_003b: call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeIsEven2(int32, int32, int32, valuetype TailcallVerify.ValueType3Bytes) @@ -4610,7 +4620,8 @@ IL_0037: ldloca.s CS$0$0000 IL_0039: initobj TailcallVerify.ValueType3Bytes IL_003f: ldloc.0 - IL_0040: tail. call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeE4(int32, +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_0040: call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeE4(int32, int32, int32, int32, @@ -9265,7 +9276,8 @@ IL_0022: call void [System.Console]System.Console::WriteLine(string) IL_0027: ldc.i4.s 101 IL_0029: stsfld int32 TailcallVerify.Condition2::Result - IL_002e: tail. call int32 TailcallVerify.Condition2::Callee1() +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_002e: call int32 TailcallVerify.Condition2::Callee1() IL_0033: pop IL_0034: ret } // end of method Condition2::Caller1 @@ -9366,7 +9378,8 @@ IL_0027: ldc.i4.s 101 IL_0029: stsfld int32 TailcallVerify.Condition2::Result IL_002e: ldc.i4.0 - IL_002f: tail. call string TailcallVerify.Condition2::Callee2(int32) +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_002f: call string TailcallVerify.Condition2::Callee2(int32) IL_0034: pop IL_0035: ret } // end of method Condition2::Caller2 @@ -9501,7 +9514,8 @@ IL_0022: call void [System.Console]System.Console::WriteLine(string) IL_0027: ldc.i4.s 101 IL_0029: stsfld int32 TailcallVerify.Condition1::Result - IL_002e: tail. call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee1() +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_002e: call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee1() IL_0033: pop IL_0034: ret } // end of method Condition1::Caller1 @@ -9607,7 +9621,8 @@ IL_0027: ldc.i4.s 101 IL_0029: stsfld int32 TailcallVerify.Condition1::Result IL_002e: ldc.i4.0 - IL_002f: tail. call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee2(int32) +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_002f: call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee2(int32) IL_0034: pop IL_0035: ret } // end of method Condition1::Caller2 @@ -9720,7 +9735,8 @@ IL_0047: ldc.i4 0x7fffffff IL_004c: ldc.i4 0x80000000 IL_0051: ldc.i4 0x7fffffff - IL_0056: tail. call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee3(int32, +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_0056: call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee3(int32, int32, int32, int32, @@ -9914,7 +9930,8 @@ IL_0099: ldc.r8 -1.7976931348623157e+308 IL_00a2: ldc.r4 3.4028235e+038 IL_00a7: ldloc.1 - IL_00a8: tail. call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee4(int32, +// tail. // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64) + IL_00a8: call valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee4(int32, int64, valuetype TailcallVerify.ValueType3Bytes, int16, diff --git a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj index 79560c536a..db9b40619d 100644 --- a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj +++ b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj @@ -12,7 +12,7 @@ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible --> - <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible> + <GCStressIncompatible>true</GCStressIncompatible> <HeapVerifyIncompatible>true</HeapVerifyIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> diff --git a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj index df11c8210e..8316681204 100644 --- a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj +++ b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj @@ -12,7 +12,7 @@ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible --> - <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible> + <GCStressIncompatible>true</GCStressIncompatible> <HeapVerifyIncompatible>true</HeapVerifyIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> diff --git a/tests/src/JIT/superpmi/superpmicollect.csproj b/tests/src/JIT/superpmi/superpmicollect.csproj index 18d15ed9df..f9e8bb1313 100644 --- a/tests/src/JIT/superpmi/superpmicollect.csproj +++ b/tests/src/JIT/superpmi/superpmicollect.csproj @@ -10,6 +10,7 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj index d050b73331..695c21365a 100644 --- a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj +++ b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj @@ -27,6 +27,7 @@ <ItemGroup> <ProjectReference Include="Test6_forwarder.ilproj" /> + <ProjectReference Include="Test6_supplier.ilproj" /> <ProjectReference Include="Test6_FriendPriInterface.ilproj" /> </ItemGroup> diff --git a/tests/src/Loader/classloader/regressions/440935/Test.ilproj b/tests/src/Loader/classloader/regressions/440935/Test.ilproj index 221ac0d672..89396c2dc4 100644 --- a/tests/src/Loader/classloader/regressions/440935/Test.ilproj +++ b/tests/src/Loader/classloader/regressions/440935/Test.ilproj @@ -27,6 +27,7 @@ <ItemGroup> <ProjectReference Include="Foo.ilproj" /> + <ProjectReference Include="Bar.ilproj" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/Regressions/coreclr/9414/readonlyPrefix.cs b/tests/src/Regressions/coreclr/9414/readonlyPrefix.cs new file mode 100644 index 0000000000..05148a1800 --- /dev/null +++ b/tests/src/Regressions/coreclr/9414/readonlyPrefix.cs @@ -0,0 +1,36 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +class Program +{ + interface IFrobber + { + void Frob(); + } + + class Frobber : IFrobber + { + public void Frob() + { + } + } + + class Foo<T> where T : IFrobber + { + public static void FrobAll(T[,] arr) + { + for (int i = 0; i < arr.Length; i++) + { + // 'readonly' prefix on call to array's Address method must be respected, and the type check bypassed + arr[0, i].Frob(); + } + } + } + + private static int Main() + { + Foo<IFrobber>.FrobAll(new Frobber[,] { { new Frobber() } }); + return 100; + } +} diff --git a/tests/src/Regressions/coreclr/9414/readonlyPrefix.csproj b/tests/src/Regressions/coreclr/9414/readonlyPrefix.csproj new file mode 100644 index 0000000000..560073c0d1 --- /dev/null +++ b/tests/src/Regressions/coreclr/9414/readonlyPrefix.csproj @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{CBD0D777-3583-49CC-8538-DD84447F6522}</ProjectGuid> + <OutputType>Exe</OutputType> + <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <CLRTestKind>BuildAndRun</CLRTestKind> + <CLRTestPriority>0</CLRTestPriority> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <ItemGroup> + <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> + <Visible>False</Visible> + </CodeAnalysisDependentAssemblyPaths> + </ItemGroup> + <ItemGroup> + <!-- Add Compile Object Here --> + <Compile Include="readonlyPrefix.cs" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/tests/src/TestWrappersConfig/TestWrappersConfig.csproj b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj new file mode 100644 index 0000000000..b108d48de7 --- /dev/null +++ b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <CLRTestKind>BuildOnly</CLRTestKind> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.assert"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.core"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.msbuild"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFrameworks>netcoreapp1.1;net45</TargetFrameworks> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/TestWrappersConfig/project.json b/tests/src/TestWrappersConfig/project.json deleted file mode 100644 index 56585e12b7..0000000000 --- a/tests/src/TestWrappersConfig/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", - "xunit": "2.2.0-beta2-build3300", - "xunit.assert": "2.2.0-beta2-build3300", - "xunit.core": "2.2.0-beta2-build3300", - "xunit.runner.msbuild": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - }, - "net45": { - "imports": "portable-net45+win8" - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.cs b/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.cs index 29fb347ae1..00f1db420c 100644 --- a/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.cs +++ b/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.cs @@ -25,27 +25,12 @@ class Test { // Console.WriteLine("Incorrect exception and/or message. Expected RuntimeWrappedException: An object that does not derive "+ // "from System.Exception has been wrapped in a RuntimeWrappedException.\n But actually got: " + ex.InnerException); - retVal = -1; + return -1; } StreamingContext ctx; - -// TODO: Expose once we have access to FormatterConverter -// var info = new SerializationInfo(typeof(RuntimeWrappedException), new FormatterConverter()); -// ex.GetObjectData(info,ctx); -// - try - { - ex.GetObjectData(null,ctx); - } - catch (ArgumentNullException ex1) - { - retVal = 100; - } - catch (Exception ex1) - { - retVal = -1; - } + + retVal = 100; } diff --git a/tests/src/dir.props b/tests/src/dir.props index cb976cc081..245e9f7982 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -13,6 +13,7 @@ <SkipSigning Condition="'$(CrossGen)' == 'true'">true</SkipSigning> <!-- Set the project.json directory for generated TestWrappers. --> <TestWrappersPackagesConfigFileDirectory>$(MSBuildThisFileDirectory)TestWrappersConfig\</TestWrappersPackagesConfigFileDirectory> + <AssemblyKey>Test</AssemblyKey> </PropertyGroup> <!-- Expose the target OS in a more convenient fashion --> @@ -75,16 +76,23 @@ <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> </PropertyGroup> + <!-- Don't reference the mscorlib facade --> + <PropertyGroup> + <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade> + </PropertyGroup> + <!-- Set default ZapRequire level (used only when CrossGen is enabled) --> <PropertyGroup> <ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire> </PropertyGroup> <PropertyGroup> - <ProjectJson>$(SourceDir)Common\test_dependencies\project.json</ProjectJson> - <ProjectLockJson>$(SourceDir)Common\test_dependencies\project.lock.json</ProjectLockJson> + <RestoreOutputPath>$(MSBuildProjectDirectory)\obj</RestoreOutputPath> <!-- Specify the target framework of the common test dependency project.json. --> <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netcoreapp2.0</NuGetTargetMonikerShort> + <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages> </PropertyGroup> + </Project> diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 08c77df7cf..4e6c618021 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -50,11 +50,6 @@ <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun> </PropertyGroup> - <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"> - <ProjectJson>$(SourceDir)Common/empty/project.json</ProjectJson> - <ProjectLockJson>$(SourceDir)Common/empty/project.lock.json</ProjectLockJson> - </PropertyGroup> - <!-- If it needs ProjectToRun, turn the project into a ProjectReference so it gets built --> @@ -189,4 +184,13 @@ DestinationFolder="$(OutputPath)" Condition="Exists('$(AssemblyName).reflect.xml')"/> </Target> + + <PropertyGroup> + <ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> + + <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"> + <ProjectAssetsFile></ProjectAssetsFile > + </PropertyGroup> + </Project> diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj index e49ab945a7..6ae2b7c09e 100644 --- a/tests/src/dirs.proj +++ b/tests/src/dirs.proj @@ -23,9 +23,11 @@ <DisabledProjects Include="Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> <DisabledProjects Include="Common\targeting_pack_ref\targeting_pack_ref.csproj" /> <DisabledProjects Include="Common\external\external.csproj" /> - <DisabledProjects Include="Common\external\external.depproj" /> + <DisabledProjects Include="Common\PerfHarness\PerfHarness.csproj" /> <DisabledProjects Include="GC\Performance\Framework\GCPerfTestFramework.csproj" /> <DisabledProjects Include="JIT\superpmi\superpmicollect.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" /> + <DisabledProjects Include="JIT\config\**" /> + <DisabledProjects Include="Performance\performance.csproj" /> <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" /> <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 --> </ItemGroup> diff --git a/tests/src/performance/linkbench/assets/MusicStore/Get-Crossgen.ps1 b/tests/src/performance/linkbench/assets/MusicStore/Get-Crossgen.ps1 new file mode 100644 index 0000000000..9a7cdf9802 --- /dev/null +++ b/tests/src/performance/linkbench/assets/MusicStore/Get-Crossgen.ps1 @@ -0,0 +1,77 @@ +# Gets crossgen.exe +# +# Downloads NuGet.exe +# Installs crossgen.exe and clrjit.dll using NuGet +# Copies the files to $path + +param([string]$path = ".") + +$ErrorActionPreference = "Stop" + +Write-Host -ForegroundColor Green "Installing crossgen.exe to $path" + +if (-not (Test-Path $path)) +{ + New-Item -Path $path -ItemType Directory -Force | Out-Null +} + +$path = Get-Item $path + +function Get-NETCoreAppVersion() +{ + if (-not (Test-Path $PSScriptRoot\obj\project.assets.json)) + { + Write-Error "project.assets.json is missing. do a dotnet restore." + exit + } + + # ConvertFrom-Json can't be used here as it has an arbitrary size limit. + [void][System.Reflection.Assembly]::LoadWithPartialName("System.Web.Extensions") + $serializer = New-Object -TypeName System.Web.Script.Serialization.JavaScriptSerializer + $serializer.MaxJsonLength = 67108864 + + $json = $serializer.DeserializeObject((Get-Content $PSScriptRoot\obj\project.assets.json -Raw)) + + foreach ($name in $json["libraries"].Keys) + { + if ($name.StartsWith("Microsoft.NETCore.App/")) + { + $version = $name.SubString("Microsoft.NETCore.App/".Length) + break + } + } + + return $version +} + +$version = Get-NETCoreAppVersion +Write-Host -ForegroundColor Green "autodetected shared framework version $version" + +$platform = "win-x64" + +$netcoreapppackage = "runtime.$platform.microsoft.netcore.app" +$netcoreappversion = $version + +Write-Host -ForegroundColor Green "Getting NuGet.exe" + +$nugeturl = "https://dist.nuget.org/win-x86-commandline/v3.4.4/NuGet.exe" +$nugetfeed = "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" +$nugetexepath = "$path\NuGet.exe" +$wc = New-Object System.Net.WebClient +$wc.DownloadFile($nugeturl, $nugetexepath) + + +Write-Host -ForegroundColor Green "Getting $netcoreapppackage $netcoreappversion" + +& "$nugetexepath" "install", "$netcoreapppackage", "-Source", "$nugetfeed", "-Version", "$netcoreappversion", "-OutputDirectory", "$path" +if ($LastExitCode -ne 0) { + throw "NuGet install of $netcoreapppackage failed." +} + +Copy-Item "$path\$netcoreapppackage.$netcoreappversion\tools\crossgen.exe" "$path\crossgen.exe" -Force +Copy-Item "$path\$netcoreapppackage.$netcoreappversion\runtimes\$platform\native\clrjit.dll" "$path\clrjit.dll" -Force +Remove-Item "$path\$netcoreapppackage.$netcoreappversion\" -recurse + +Remove-Item "$path\NuGet.exe" + +Write-Host -ForegroundColor Green "Success" diff --git a/tests/src/performance/linkbench/assets/Roslyn/illinkcsproj b/tests/src/performance/linkbench/assets/Roslyn/illinkcsproj index 1247c5e715..c8549e2d47 100644 --- a/tests/src/performance/linkbench/assets/Roslyn/illinkcsproj +++ b/tests/src/performance/linkbench/assets/Roslyn/illinkcsproj @@ -1,9 +1,10 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>netcoreapp2.0</TargetFramework> - <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp1.1</TargetFramework> </PropertyGroup> <ItemGroup> - <PackageReference Include="ILLink.Tasks" Version="0.1.0-preview" /> + <PackageReference Include="Microsoft.NETCore.ILLink" Version="0.1.9-preview" /> </ItemGroup> </Project> + diff --git a/tests/src/performance/linkbench/linkbench.cs b/tests/src/performance/linkbench/linkbench.cs index 3d29957f90..ad0f83ef0e 100644 --- a/tests/src/performance/linkbench/linkbench.cs +++ b/tests/src/performance/linkbench/linkbench.cs @@ -1,3 +1,5 @@ +using Microsoft.Xunit.Performance; +using Microsoft.Xunit.Performance.Api; using System; using System.Diagnostics; using System.Collections.Generic; @@ -8,8 +10,6 @@ using System.Text; using System.Globalization; using System.Linq; using System.Xml.Linq; -using Microsoft.Xunit.Performance; -using Microsoft.Xunit.Performance.Api; using Xunit; using Xunit.Abstractions; @@ -18,7 +18,8 @@ namespace LinkBench public class Benchmark { public string Name; - + public bool ShouldRun; + public string ProjFile; public string UnlinkedDir; public string LinkedDir; public double UnlinkedMsilSize; @@ -28,18 +29,29 @@ namespace LinkBench public double MsilSizeReduction; public double DirSizeReduction; + public delegate void SetupDelegate(); + public SetupDelegate Setup; + private DirectoryInfo unlinkedDirInfo; private DirectoryInfo linkedDirInfo; private double certDiff; const double MB = 1024 * 1024; - public Benchmark(string _Name, string _UnlinkedDir, string _LinkedDir) + public Benchmark(string _Name, string _UnlinkedDir, string _LinkedDir, SetupDelegate _setup = null, bool _shouldRun = false) { Name = _Name; UnlinkedDir = _UnlinkedDir; LinkedDir = _LinkedDir; unlinkedDirInfo = new DirectoryInfo(UnlinkedDir); linkedDirInfo = new DirectoryInfo(LinkedDir); + ShouldRun = _shouldRun; + Setup = _setup; + } + + public void SetToRun() + { + ShouldRun = true; + Environment.SetEnvironmentVariable("__test_" + Name, "true"); } public void Compute() @@ -50,8 +62,8 @@ namespace LinkBench UnlinkedDirSize = GetDirSize(unlinkedDirInfo); LinkedDirSize = GetDirSize(linkedDirInfo); - MsilSizeReduction = (UnlinkedMsilSize - LinkedMsilSize) / UnlinkedMsilSize * 100; - DirSizeReduction = (UnlinkedDirSize - LinkedDirSize) / UnlinkedDirSize * 100; + MsilSizeReduction = LinkedMsilSize / UnlinkedMsilSize; + DirSizeReduction = LinkedDirSize / UnlinkedDirSize; } // Compute total size of a directory, in MegaBytes @@ -82,20 +94,10 @@ namespace LinkBench foreach (string file in files) { - if (file.EndsWith(".ni.dll") || file.EndsWith(".ni.exe")) + if (IsMSIL(file)) { - continue; + msilSize += new FileInfo(file).Length; } - try - { - AssemblyLoadContext.GetAssemblyName(file); - } - catch (BadImageFormatException) - { - continue; - } - - msilSize += new FileInfo(file).Length; } return msilSize / MB; @@ -126,22 +128,104 @@ namespace LinkBench foreach (string file in files) { - try + if (IsMSIL(file)) { - AssemblyLoadContext.GetAssemblyName(file); + FileInfo fileInfo = new FileInfo(file); + long linkedCert = GetCertSize(file); + long unlinkedCert = GetCertSize(UnlinkedDir + "\\" + fileInfo.Name); + totalDiff += (unlinkedCert - linkedCert); } - catch (BadImageFormatException) + } + + return totalDiff / MB; + } + + //Use AssemblyLoadContext.GetAssemblyName(file); + private bool IsMSIL(string file) + { + if (file.EndsWith(".ni.dll") || file.EndsWith(".ni.exe")) + { + // Likely Native Image. + return false; + } + + try + { + AssemblyLoadContext.GetAssemblyName(file); + } + catch (Exception) + { + // We should check only for BadImageFormatException. + // But Checking for any exception until the following + // issue is fixed: + // https://github.com/dotnet/coreclr/issues/11499 + + return false; + } + + return true; + } + + public static void AddLinkerReference(string csproj) + { + var xdoc = XDocument.Load(csproj); + var ns = xdoc.Root.GetDefaultNamespace(); + bool added = false; + foreach (var el in xdoc.Root.Elements(ns + "ItemGroup")) + { + if (el.Elements(ns + "PackageReference").Any()) { - continue; + el.Add(new XElement(ns + "PackageReference", + new XAttribute("Include", "ILLink.Tasks"), + new XAttribute("Version", "0.1.4-preview"))); + added = true; + break; } + } + if (!added) + { + xdoc.Root.Add(new XElement(ns + "ItemGroup", + new XElement(ns + "PackageReference", + new XAttribute("Include", "ILLink.Tasks"), + new XAttribute("Version", "0.1.4-preview")))); + added = true; + } + using (var fs = new FileStream(csproj, FileMode.Create)) + { + xdoc.Save(fs); + } + } - FileInfo fileInfo = new FileInfo(file); - long linkedCert = GetCertSize(file); - long unlinkedCert = GetCertSize(UnlinkedDir + "\\" + fileInfo.Name); - totalDiff += (unlinkedCert - linkedCert); + // TODO: remove this once the linker is able to handle + // ready-to-run assembies + public static void SetRuntimeFrameworkVersion(string csproj) + { + var xdoc = XDocument.Load(csproj); + var ns = xdoc.Root.GetDefaultNamespace(); + var versionElement = xdoc.Root.Descendants(ns + "RuntimeFrameworkVersion").First(); + string runtimeFrameworkVersion = "2.0.0-preview2-002093-00"; + versionElement.Value = runtimeFrameworkVersion; + using (var fs = new FileStream(csproj, FileMode.Create)) + { + xdoc.Save(fs); } + } - return totalDiff / MB; + // TODO: Remove this once we figure out what to do about apps + // that have the publish output filtered by a manifest + // file. It looks like aspnet has made this the default. See + // the bug at https://github.com/dotnet/sdk/issues/1160. + public static void PreventPublishFiltering(string csproj) + { + var xdoc = XDocument.Load(csproj); + var ns = xdoc.Root.GetDefaultNamespace(); + var propertygroup = xdoc.Root.Element(ns + "PropertyGroup"); + propertygroup.Add(new XElement(ns + "PublishWithAspNetCoreTargetManifest", + "false")); + using (var fs = new FileStream(csproj, FileMode.Create)) + { + xdoc.Save(fs); + } } } @@ -149,42 +233,132 @@ namespace LinkBench { private static ScenarioConfiguration scenarioConfiguration = new ScenarioConfiguration(new TimeSpan(2000000)); private static MetricModel SizeMetric = new MetricModel { Name = "Size", DisplayName = "File Size", Unit = "MB" }; - private static MetricModel PercMetric = new MetricModel { Name = "Perc", DisplayName = "% Reduction", Unit = "%" }; + private static MetricModel PercMetric = new MetricModel { Name = "Ratio", DisplayName = "Reduction", Unit = "Linked/Unlinked" }; public static string Workspace; + public static string LinkBenchRoot; public static string ScriptDir; public static string AssetsDir; private static Benchmark CurrentBenchmark; + private static Benchmark[] Benchmarks = + { + new Benchmark("HelloWorld", + "HelloWorld\\bin\\release\\netcoreapp2.0\\win10-x64\\unlinked", + "HelloWorld\\bin\\release\\netcoreapp2.0\\win10-x64\\linked", + () => Benchmark.AddLinkerReference("HelloWorld\\HelloWorld.csproj")), + new Benchmark("WebAPI", + "WebAPI\\bin\\release\\netcoreapp2.0\\win10-x64\\unlinked", + "WebAPI\\bin\\release\\netcoreapp2.0\\win10-x64\\linked", + () => { Benchmark.AddLinkerReference("WebAPI\\WebAPI.csproj"); + Benchmark.PreventPublishFiltering("WebAPI\\WebAPI.csproj"); }), + //Remove the MusicStore from the run as the scenario is currently flaky and breaking performance runs + /*new Benchmark("MusicStore", + "JitBench\\src\\MusicStore\\bin\\release\\netcoreapp2.0\\win10-x64\\unlinked", + "JitBench\\src\\MusicStore\\bin\\release\\netcoreapp2.0\\win10-x64\\linked", + () => { Benchmark.AddLinkerReference("JitBench\\src\\MusicStore\\MusicStore.csproj"); + Benchmark.SetRuntimeFrameworkVersion("JitBench\\src\\MusicStore\\MusicStore.csproj"); }), + new Benchmark("MusicStore_R2R", + "JitBench\\src\\MusicStore\\bin\\release\\netcoreapp2.0\\win10-x64\\R2R\\unlinked", + "JitBench\\src\\MusicStore\\bin\\release\\netcoreapp2.0\\win10-x64\\R2R\\linked"),*/ + new Benchmark("Corefx", + "corefx\\bin\\ILLinkTrimAssembly\\netcoreapp-Windows_NT-Release-x64\\pretrimmed", + "corefx\\bin\\ILLinkTrimAssembly\\netcoreapp-Windows_NT-Release-x64\\trimmed"), + /*new Benchmark("Roslyn", + "roslyn\\Binaries\\Release\\Exes\\CscCore\\win7-x64\\publish", + "roslyn\\Binaries\\Release\\Exes\\CscCore\\win7-x64\\Linked") */ + }; + + static int UsageError() + { + Console.WriteLine("Usage: LinkBench [--nosetup] [--nobuild] [--perf:runid <id>] [<benchmarks>]"); + Console.WriteLine(" --nosetup: Don't clone and fixup benchmark repositories"); + Console.WriteLine(" --nosetup: Don't build and link benchmarks"); + Console.WriteLine(" --perf:runid: Specify the ID to append to benchmark result files"); + Console.WriteLine(" Benchmarks: HelloWorld, WebAPI, MusicStore, MusicStore_R2R, CoreFX, Roslyn"); + Console.WriteLine(" Default is to run all the above benchmarks."); + return -4; + } + public static int Main(String [] args) { - // Workspace is the ROOT of the coreclr tree. - // If CORECLR_REPO is not set, the script assumes that the location of sandbox - // is <path>\coreclr\sandbox. - bool doClone = true; + bool doSetup = true; bool doBuild = true; + string runId = ""; + string runOne = null; + bool benchmarkSpecified = false; - for(int i=0; i < args.Length; i++) + for (int i = 0; i < args.Length; i++) { - if (String.Compare(args[i], "noclone", true) == 0) + if (String.Compare(args[i], "--nosetup", true) == 0) { - doClone = false; + doSetup = false; } - else if (String.Compare(args[i], "nobuild", true) == 0) + else if (String.Compare(args[i], "--nobuild", true) == 0) { - doClone = false; + doSetup = false; doBuild = false; } + else if (String.Compare(args[i], "--perf:runid", true) == 0) + { + if (i + 1 < args.Length) + { + runId = args[++i] + "-"; + } + else + { + Console.WriteLine("Missing runID "); + return UsageError(); + } + } + else if (args[i][0] == '-') + { + Console.WriteLine("Unknown Option {0}", args[i]); + return UsageError(); + } else { - Console.WriteLine("Unknown argument"); - return -4; + foreach (Benchmark benchmark in Benchmarks) + { + if (String.Compare(args[i], benchmark.Name, true) == 0) + { + benchmark.SetToRun(); + benchmarkSpecified = true; + break; + } + } + + if (!benchmarkSpecified) + { + Console.WriteLine("Unknown Benchmark {0}", args[i]); + } } } + // If benchmarks are not explicitly specified, run all benchmarks + if (!benchmarkSpecified) + { + foreach (Benchmark benchmark in Benchmarks) + { + if (String.Compare(benchmark.Name, "CoreFX", true) == 0) + { + // CoreFX is not enabled by default, because the lab cannot run it yet. + // Jenkins runs on an older OS with path-length limit, which causes + // CoreFX build to fail. + continue; + } + + benchmark.SetToRun(); + } + } + + // Workspace is the ROOT of the coreclr tree. + // If CORECLR_REPO is not set, the script assumes that the location of sandbox + // is <path>\coreclr\sandbox. + LinkBenchRoot = Directory.GetCurrentDirectory(); Workspace = Environment.GetEnvironmentVariable("CORECLR_REPO"); if (Workspace == null) { - Workspace = Directory.GetParent(Directory.GetCurrentDirectory()).FullName; + Workspace = Directory.GetParent(LinkBenchRoot).FullName; } if (Workspace == null) { @@ -192,38 +366,38 @@ namespace LinkBench return -1; } - string LinkBenchDir = Workspace + "\\tests\\src\\performance\\linkbench\\"; - ScriptDir = LinkBenchDir + "scripts\\"; - AssetsDir = LinkBenchDir + "assets\\"; + string linkBenchSrcDir = Workspace + "\\tests\\src\\performance\\linkbench\\"; + ScriptDir = linkBenchSrcDir + "scripts\\"; + AssetsDir = linkBenchSrcDir + "assets\\"; - Benchmark[] Benchmarks = - { - new Benchmark("HelloWorld", - "LinkBench\\HelloWorld\\bin\\release\\netcoreapp2.0\\win10-x64\\publish", - "LinkBench\\HelloWorld\\bin\\release\\netcoreapp2.0\\win10-x64\\linked"), - new Benchmark("WebAPI", - "LinkBench\\WebAPI\\bin\\release\\netcoreapp2.0\\win10-x64\\publish", - "LinkBench\\WebAPI\\bin\\release\\netcoreapp2.0\\win10-x64\\linked"), - new Benchmark("MusicStore", - "LinkBench\\JitBench\\src\\MusicStore\\bin\\release\\netcoreapp2.0\\win10-x64\\publish", - "LinkBench\\JitBench\\src\\MusicStore\\bin\\release\\netcoreapp2.0\\win10-x64\\linked"), - new Benchmark("MusicStore_R2R", - "LinkBench\\JitBench\\src\\MusicStore\\bin\\release\\netcoreapp2.0\\win10-x64\\publish_r2r", - "LinkBench\\JitBench\\src\\MusicStore\\bin\\release\\netcoreapp2.0\\win10-x64\\linked_r2r"), - new Benchmark("Corefx", - "LinkBench\\corefx\\bin\\ILLinkTrimAssembly\\netcoreapp-Windows_NT-Release-x64\\pretrimmed", - "LinkBench\\corefx\\bin\\ILLinkTrimAssembly\\netcoreapp-Windows_NT-Release-x64\\trimmed"), - new Benchmark("Roslyn", - "LinkBench\\roslyn\\Binaries\\Release\\Exes\\CscCore", - "LinkBench\\roslyn\\Binaries\\Release\\Exes\\Linked"), - }; + Environment.SetEnvironmentVariable("LinkBenchRoot", LinkBenchRoot); + Environment.SetEnvironmentVariable("__dotnet1", LinkBenchRoot + "\\.Net1\\dotnet.exe"); + Environment.SetEnvironmentVariable("__dotnet2", LinkBenchRoot + "\\.Net2\\dotnet.exe"); // Update the build files to facilitate the link step - if(doClone) + if (doSetup) { - if(!Setup()) + // Clone the benchmarks + using (var setup = new Process()) { - return -2; + setup.StartInfo.FileName = ScriptDir + "clone.cmd"; + setup.Start(); + setup.WaitForExit(); + if (setup.ExitCode != 0) + { + Console.WriteLine("Benchmark Setup failed"); + return -2; + } + } + + // Setup the benchmarks + + foreach (Benchmark benchmark in Benchmarks) + { + if (benchmark.ShouldRun && benchmark.Setup != null) + { + benchmark.Setup(); + } } } @@ -238,7 +412,7 @@ namespace LinkBench setup.WaitForExit(); if (setup.ExitCode != 0) { - Console.WriteLine("Setup failed"); + Console.WriteLine("Benchmark build failed"); return -3; } } @@ -255,8 +429,12 @@ namespace LinkBench for (int i = 0; i < Benchmarks.Length; i++) { CurrentBenchmark = Benchmarks[i]; - string[] scriptArgs = { "--perf:runid", CurrentBenchmark.Name }; + if (!CurrentBenchmark.ShouldRun) + { + continue; + } + string[] scriptArgs = { "--perf:runid", runId + CurrentBenchmark.Name }; using (var h = new XunitPerformanceHarness(scriptArgs)) { h.RunScenario(emptyCmd, null, null, PostRun, scenarioConfiguration); @@ -280,81 +458,14 @@ namespace LinkBench addMeasurement(ref scenario, "MSIL Unlinked", SizeMetric, CurrentBenchmark.UnlinkedMsilSize); addMeasurement(ref scenario, "MSIL Linked", SizeMetric, CurrentBenchmark.LinkedMsilSize); - addMeasurement(ref scenario, "MSIL %Reduction", PercMetric, CurrentBenchmark.MsilSizeReduction); + addMeasurement(ref scenario, "MSIL Reduction", PercMetric, CurrentBenchmark.MsilSizeReduction); addMeasurement(ref scenario, "Total Uninked", SizeMetric, CurrentBenchmark.UnlinkedDirSize); addMeasurement(ref scenario, "Total Linked", SizeMetric, CurrentBenchmark.LinkedDirSize); - addMeasurement(ref scenario, "Total %Reduction", PercMetric, CurrentBenchmark.DirSizeReduction); + addMeasurement(ref scenario, "Total Reduction", PercMetric, CurrentBenchmark.DirSizeReduction); return scenario; } - private static bool Setup() - { - // Clone the benchmarks - using (var setup = new Process()) - { - setup.StartInfo.FileName = ScriptDir + "clone.cmd"; - Console.WriteLine("Run {0}", setup.StartInfo.FileName); - setup.Start(); - setup.WaitForExit(); - if (setup.ExitCode != 0) - { - Console.WriteLine("clone failed"); - return false; - } - } - - //Update the project files - AddLinkerReference("LinkBench\\HelloWorld\\HelloWorld.csproj"); - AddLinkerReference("LinkBench\\WebAPI\\WebAPI.csproj"); - AddLinkerReference("LinkBench\\JitBench\\src\\MusicStore\\MusicStore.csproj"); - RemoveCrossgenTarget("LinkBench\\JitBench\\src\\MusicStore\\MusicStore.csproj"); - - return true; - } - - private static void AddLinkerReference(string csproj) - { - var xdoc = XDocument.Load(csproj); - var ns = xdoc.Root.GetDefaultNamespace(); - bool added = false; - foreach (var el in xdoc.Root.Elements(ns + "ItemGroup")) - { - if (el.Elements(ns + "PackageReference").Any()) - { - el.Add(new XElement(ns + "PackageReference", - new XAttribute("Include", "ILLink.Tasks"), - new XAttribute("Version", "0.1.0-preview"))); - added = true; - break; - } - } - if (!added) - { - xdoc.Root.Add(new XElement(ns + "ItemGroup", - new XElement(ns + "PackageReference", - new XAttribute("Include", "ILLink.Tasks"), - new XAttribute("Version", "0.1.0-preview")))); - added = true; - } - using (var fs = new FileStream(csproj, FileMode.Create)) - { - xdoc.Save(fs); - } - } - - private static void RemoveCrossgenTarget(string csproj) - { - var xdoc = XDocument.Load(csproj); - var ns = xdoc.Root.GetDefaultNamespace(); - var target = xdoc.Root.Element(ns + "Target"); - target.Remove(); - using (var fs = new FileStream(csproj, FileMode.Create)) - { - xdoc.Save(fs); - } - } - private static void addMeasurement(ref ScenarioBenchmark scenario, string name, MetricModel metric, double value) { var iteration = new IterationModel diff --git a/tests/src/performance/linkbench/linkbench.csproj b/tests/src/performance/linkbench/linkbench.csproj index 2a3048ab21..46c79ff039 100644 --- a/tests/src/performance/linkbench/linkbench.csproj +++ b/tests/src/performance/linkbench/linkbench.csproj @@ -16,6 +16,7 @@ <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> <DefineConstants>$(DefineConstants);STATIC</DefineConstants> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> @@ -23,8 +24,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> </PropertyGroup> <PropertyGroup> - <ProjectJson>..\project.json</ProjectJson> - <ProjectLockJson>..\project.lock.json</ProjectLockJson> + <RestoreOutputPath>..\obj</RestoreOutputPath> </PropertyGroup> <ItemGroup> <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> diff --git a/tests/src/performance/linkbench/scripts/build.cmd b/tests/src/performance/linkbench/scripts/build.cmd index 88b7eb139e..12f9f3f951 100644 --- a/tests/src/performance/linkbench/scripts/build.cmd +++ b/tests/src/performance/linkbench/scripts/build.cmd @@ -1,103 +1,141 @@ +setlocal ENABLEDELAYEDEXPANSION @echo off REM Usage: Build.cmd <LinkBench assets directory> setlocal -call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat" -set ROOT=%cd%\LinkBench set AssetDir=%1 set ExitCode=0 -mkdir LinkBench 2> nul -pushd %ROOT% +pushd %LinkBenchRoot% +set __CORFLAGS="%VS140COMNTOOLS%\..\..\..\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\CorFlags.exe" +if not exist %__CORFLAGS% ( + echo corflags.exe not found + exit /b -1 +) + +if defined __test_HelloWorld call :HelloWorld +if defined __test_WebAPI call :WebAPI +if defined __test_MusicStore call :MusicStore +if defined __test_MusicStore_R2R call :MusicStore_R2R +if defined __test_CoreFx call :CoreFx +if defined __test_Roslyn call :Roslyn + +popd +exit /b %ExitCode% + +:HelloWorld echo Build ** HelloWorld ** -cd %ROOT%\HelloWorld -dotnet restore -r win10-x64 -dotnet publish -c release -r win10-x64 -dotnet msbuild /t:Link /p:LinkerMode=sdk /p:RuntimeIdentifier=win10-x64 /v:n /p:Configuration=release +pushd %LinkBenchRoot%\HelloWorld +call %__dotnet2% restore -r win10-x64 +call %__dotnet2% publish -c release -r win10-x64 /p:LinkDuringPublish=false --output bin\release\netcoreapp2.0\win10-x64\Unlinked +call %__dotnet2% publish -c release -r win10-x64 --output bin\release\netcoreapp2.0\win10-x64\Linked if errorlevel 1 set ExitCode=1 -echo -- Done -- +popd +exit /b +:WebAPI echo Build ** WebAPI ** -cd %ROOT%\WebAPI -dotnet restore -r win10-x64 -dotnet publish -c release -r win10-x64 -dotnet msbuild /t:Link /p:LinkerMode=sdk /p:RuntimeIdentifier=win10-x64 /v:n /p:Configuration=release +pushd %LinkBenchRoot%\WebAPI +call %__dotnet2% restore -r win10-x64 +call %__dotnet2% publish -c release -r win10-x64 /p:LinkDuringPublish=false --output bin\release\netcoreapp2.0\win10-x64\unlinked +call %__dotnet2% publish -c release -r win10-x64 --output bin\release\netcoreapp2.0\win10-x64\linked if errorlevel 1 set ExitCode=1 -echo -- Done -- +popd +exit /b +:MusicStore echo Build ** MusicStore ** -cd %ROOT%\JitBench\src\MusicStore +pushd %LinkBenchRoot%\JitBench\src\MusicStore copy %AssetDir%\MusicStore\MusicStoreReflection.xml . -dotnet restore -r win10-x64 -dotnet publish -c release -r win10-x64 -dotnet msbuild /t:Link /p:LinkerMode=sdk /p:RuntimeIdentifier=win10-x64 /v:n /p:LinkerRootFiles=MusicStoreReflection.xml /p:Configuration=release +call %__dotnet2% restore -r win10-x64 +call %__dotnet2% publish -c release -r win10-x64 /p:LinkerRootDescriptors=MusicStoreReflection.xml /p:LinkDuringPublish=false --output bin\release\netcoreapp2.0\win10-x64\unlinked +call %__dotnet2% publish -c release -r win10-x64 /p:LinkerRootDescriptors=MusicStoreReflection.xml --output bin\release\netcoreapp2.0\win10-x64\linked if errorlevel 1 set ExitCode=1 -echo -- Done -- +popd +exit /b +:MusicStore_R2R +REM Since the musicstore benchmark has a workaround to use an old framework (to get non-crossgen'd packages), +REM we need to run crossgen on these assemblies manually for now. +REM Even once we have the linker running on R2R assemblies and remove this workaround, +REM we'll need a way to get the pre-crossgen assemblies for the size comparison. +REM We need to use it to crossgen the linked assemblies for the size comparison, +REM since the linker targets don't yet include a way to crossgen the linked assemblies. echo Build ** MusicStore Ready2Run ** -cd %ROOT%\JitBench\src\MusicStore +pushd %LinkBenchRoot%\JitBench\src\MusicStore +copy %AssetDir%\MusicStore\Get-Crossgen.ps1 powershell -noprofile -executionPolicy RemoteSigned -file Get-Crossgen.ps1 pushd bin\release\netcoreapp2.0\win10-x64\ -call :SetupR2R publish +mkdir R2R +call :SetupR2R unlinked if errorlevel 1 set ExitCode=1 call :SetupR2R linked if errorlevel 1 set ExitCode=1 -echo -- Done -- +popd +exit /b +:CoreFx echo Build ** CoreFX ** -cd %ROOT%\corefx +pushd %LinkBenchRoot%\corefx set BinPlaceILLinkTrimAssembly=true call build.cmd -release if errorlevel 1 set ExitCode=1 -echo -- Done -- +popd +exit /b +:Roslyn echo Build ** Roslyn ** -cd %ROOT%\roslyn -copy %AssetDir%\Roslyn\RoslynRoots.txt . -copy %AssetDir%\Roslyn\RoslynRoots.xml . -set RoslynRoot=%cd% -REM Build Roslyn -call restore.cmd -msbuild /m Roslyn.sln /p:Configuration=Release +pushd %LinkBenchRoot%\roslyn + REM Fetch ILLink -mkdir illink +if not exist illink mkdir illink cd illink -copy %AssetDir%\Roslyn\illinkcsproj illink.csproj -dotnet restore illink.csproj -r win10-x64 --packages bin +copy %AssetDir%\Roslyn\illinkcsproj illink.csproj +call %__dotnet1% restore --packages pkg +if errorlevel 1 set ExitCode=1 +set __IlLinkDll=%cd%\pkg\microsoft.netcore.illink\0.1.9-preview\lib\netcoreapp1.1\illink.dll cd .. + +REM Build CscCore +call Restore.cmd +cd src\Compilers\CSharp\CscCore +call %__dotnet1% publish -c Release -r win7-x64 +if errorlevel 1 set ExitCode=1 +REM Published CscCore to Binaries\Release\Exes\CscCore\win7-x64\publish +cd ..\..\..\.. + REM Create Linker Directory -cd Binaries\Release\Exes +cd Binaries\Release\Exes\CscCore\win7-x64\ mkdir Linked -cd CscCore + REM Copy Unmanaged Assets +cd publish FOR /F "delims=" %%I IN ('DIR /b *') DO ( - corflags %%I >nul 2> nul - if errorlevel 1 copy %%I ..\Linked >nul + %__CORFLAGS% %%I + if errorlevel 1 copy %%I ..\Linked ) copy *.ni.dll ..\Linked + REM Run Linker -dotnet %RoslynRoot%\illink\bin\illink.tasks\0.1.0-preview\tools\illink.dll -t -c link -a @%RoslynRoot%\RoslynRoots.txt -x %RoslynRoot%\RoslynRoots.xml -l none -out ..\Linked +call %__dotnet1% %__IlLinkDll% -t -c link -a @%AssetDir%\Roslyn\RoslynRoots.txt -x %AssetDir%\Roslyn\RoslynRoots.xml -l none -out ..\Linked if errorlevel 1 set ExitCode=1 -echo -- Done -- popd - -:Done -exit /b %ExitCode% +exit /b :SetupR2R REM Create R2R directory and copy all contents from MSIL to R2R directory -mkdir %1_r2r -xcopy /E /Y /Q %1 %1_r2r +mkdir R2R\%1 +xcopy /E /Y /Q %1 R2R\%1 REM Generate Ready2Run images for all MSIL files by running crossgen -cd %1_r2r -copy ..\..\..\..\..\crossgen.exe +pushd R2R\%1 +copy ..\..\..\..\..\..\crossgen.exe FOR /F %%I IN ('dir /b *.dll ^| find /V /I ".ni.dll" ^| find /V /I "System.Private.CoreLib" ^| find /V /I "mscorlib.dll"') DO ( REM Don't crossgen Corlib, since the native image already exists. REM For all other MSIL files (corflags returns 0), run crossgen - corflags %%I >nul 2>nul + %__CORFLAGS% %%I if not errorlevel 1 ( - crossgen /Platform_Assemblies_Paths . %%I >nul 2>nul + crossgen.exe /Platform_Assemblies_Paths . %%I if errorlevel 1 ( exit /b 1 ) @@ -112,5 +150,5 @@ FOR /F "delims=" %%I IN ('dir /b *.dll') DO ( ren %%~nI.ni.dll %%I ) ) -cd .. +popd exit /b 0 diff --git a/tests/src/performance/linkbench/scripts/clone.cmd b/tests/src/performance/linkbench/scripts/clone.cmd index ae28d41d08..60cfe202b6 100644 --- a/tests/src/performance/linkbench/scripts/clone.cmd +++ b/tests/src/performance/linkbench/scripts/clone.cmd @@ -1,30 +1,64 @@ +setlocal ENABLEDELAYEDEXPANSION @echo off -rmdir /s /q LinkBench +set EXITCODE=0 +pushd %LinkBenchRoot% -set ROOT=%cd%\LinkBench -mkdir LinkBench 2> nul -pushd %ROOT% +if not exist %__dotnet1% call :DotNet +if defined __test_HelloWorld call :HelloWorld +if defined __test_WebAPI call :WebAPI +if defined __test_MusicStore call :MusicStore +if defined __test_MusicStore_R2R call :MusicStore_R2R +if defined __test_CoreFx call :CoreFx +if defined __test_Roslyn call :Roslyn + +popd +exit /b %EXITCODE% + +:DotNet +REM Roslyn needs SDK 1.0.0, other benchmarks need SDK 2.0.0 +mkdir .Net1 +mkdir .Net2 +powershell -noprofile -executionPolicy RemoteSigned wget https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1 -OutFile dotnet-install.ps1 +powershell -noprofile -executionPolicy RemoteSigned -file dotnet-install.ps1 -InstallDir .Net1 +powershell -noprofile -executionPolicy RemoteSigned -file dotnet-install.ps1 -Channel master -InstallDir .Net2 -version 2.0.0-preview2-005905 +if not exist %__dotnet1% set EXITCODE=1&& echo DotNet.1.0.0 uninstalled +if not exist %__dotnet2% set EXITCODE=1&& echo DotNet.2.0.0 uninstalled +exit /b + +:HelloWorld mkdir HelloWorld cd HelloWorld -dotnet new console -if errorlevel 1 exit /b 1 +call %__dotnet2% new console +if errorlevel 1 set EXITCODE=1 cd .. +exit /b +:WebAPI mkdir WebAPI cd WebAPI -dotnet new webapi -if errorlevel 1 exit /b 1 +call %__dotnet2% new webapi +if errorlevel 1 set EXITCODE=1 cd .. +exit /b +:MusicStore git clone https://github.com/aspnet/JitBench -b dev -if errorlevel 1 exit /b 1 +if errorlevel 1 set EXITCODE=1 +exit /b +:MusicStore_R2R +REM MusicStore_R2R requires a previous MusicStore run. +REM No Additional Setup +exit /b + +:CoreFx git clone http://github.com/dotnet/corefx -if errorlevel 1 exit /b 1 +if errorlevel 1 set EXITCODE=1 +exit /b +:Roslyn git clone https://github.com/dotnet/roslyn.git -if errorlevel 1 exit /b 1 - -popd
\ No newline at end of file +if errorlevel 1 set EXITCODE=1 +exit /b diff --git a/tests/src/performance/perflab/PerfLab.csproj b/tests/src/performance/perflab/PerfLab.csproj index ed197261fb..ccacb0b66c 100644 --- a/tests/src/performance/perflab/PerfLab.csproj +++ b/tests/src/performance/perflab/PerfLab.csproj @@ -12,6 +12,7 @@ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <DefineConstants>$(DefineConstants);STATIC</DefineConstants> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> @@ -19,8 +20,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> </PropertyGroup> <PropertyGroup> - <ProjectJson>..\project.json</ProjectJson> - <ProjectLockJson>..\project.lock.json</ProjectLockJson> + <RestoreOutputPath>..\obj</RestoreOutputPath> </PropertyGroup> <ItemGroup> <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> diff --git a/tests/src/performance/performance.csproj b/tests/src/performance/performance.csproj new file mode 100644 index 0000000000..8133535f45 --- /dev/null +++ b/tests/src/performance/performance.csproj @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.5</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>$(MicrosoftDiagnosticsTracingLibraryVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Collections.NonGeneric"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq.Expressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Numerics.Vectors"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Loader"> + <Version>4.0.0</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Numerics"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Diagnostics.Process"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XPath"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XPath.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XUnitConsoleNetCoreVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.5</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project> diff --git a/tests/src/performance/project.json b/tests/src/performance/project.json deleted file mode 100644 index 86a42f2df7..0000000000 --- a/tests/src/performance/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "dependencies": { - "xunit.performance.api": "1.0.0-beta-build0003", - "xunit.performance.core": "1.0.0-beta-build0003", - "xunit.performance.execution": "1.0.0-beta-build0003", - "xunit.performance.metrics": "1.0.0-beta-build0003", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", - "System.Collections.NonGeneric": "4.4.0-beta-24913-02", - "System.Console": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.Linq.Expressions": "4.4.0-beta-24913-02", - "System.Numerics.Vectors": "4.4.0-preview1-25221-01", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.Loader": "4.0.0", - "System.Runtime.Numerics": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.Tasks": "4.4.0-beta-24913-02", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", - "System.Diagnostics.Process": "4.4.0-beta-24913-02", - "System.Xml.XmlDocument": "4.4.0-beta-24913-02", - "System.Xml.XPath": "4.4.0-beta-24913-02", - "System.Xml.XPath.XmlDocument": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt index 5829a8f36c..3b59343f8a 100644 --- a/tests/testsFailingOutsideWindows.txt +++ b/tests/testsFailingOutsideWindows.txt @@ -57,6 +57,7 @@ JIT/Methodical/Boxing/xlang/_dbgsin_cs_il/_dbgsin_cs_il.sh JIT/Methodical/Boxing/xlang/_odbgsin_cs_il/_odbgsin_cs_il.sh JIT/Methodical/Boxing/xlang/_orelsin_cs_il/_orelsin_cs_il.sh JIT/Methodical/Boxing/xlang/_relsin_cs_il/_relsin_cs_il.sh +JIT/Regression/JitBlue/GitHub_11408/GitHub_11408/GitHub_11408.sh Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp/MarshalStructAsLayoutExp.sh GC/LargeMemory/Allocation/finalizertest/finalizertest.sh GC/LargeMemory/API/gc/reregisterforfinalize/reregisterforfinalize.sh @@ -70,7 +71,6 @@ GC/Features/BackgroundGC/foregroundgc/foregroundgc.sh GC/Features/LOHFragmentation/lohfragmentation/lohfragmentation.sh GC/Features/SustainedLowLatency/scenario/scenario.sh GC/Regressions/dev10bugs/536168/536168/536168.sh -GC/Scenarios/DoublinkList/doublinkgen/doublinkgen.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612/Generated612.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613/Generated613.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/Generated614.sh diff --git a/tests/x86/compatjit_x86_testenv.cmd b/tests/x86/compatjit_x86_testenv.cmd deleted file mode 100644 index d245370548..0000000000 --- a/tests/x86/compatjit_x86_testenv.cmd +++ /dev/null @@ -1,8 +0,0 @@ -@REM ------------------------------------------------------------------------- -@REM -@REM This script provides x86 compatjit test environment settings -@REM -@REM ------------------------------------------------------------------------- - -@REM Use compatjit.dll, not clrjit.dll. -set COMPlus_UseWindowsX86CoreLegacyJit=1 diff --git a/tests/x86/ryujit_x86_testenv.cmd b/tests/x86/ryujit_x86_testenv.cmd deleted file mode 100644 index 97e7ab8b56..0000000000 --- a/tests/x86/ryujit_x86_testenv.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@REM This is no longer needed, except the CI system, during the conversion of RyuJIT/x86 -@REM to the default, still looks for it for the old "ryujit" tasks. Leave it here, and the -@REM "ryujit" tasks will just run the default JIT (now RyuJIT). -@REM -@REM After the .NET CI is updated, this can be deleted. diff --git a/tests/x86_jit32_issues.targets b/tests/x86_jit32_issues.targets deleted file mode 100644 index 7a6983db26..0000000000 --- a/tests/x86_jit32_issues.targets +++ /dev/null @@ -1,516 +0,0 @@ -<?xml version="1.0" ?> -<Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Condition="'$(XunitTestBinBase)' != ''"> - <ExcludeList Include="$(XunitTestBinBase)\GC\API\GC\GetGeneration\GetGeneration.cmd"> - <Issue>6717</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\API\GC\GetGenerationWR2\GetGenerationWR2.cmd"> - <Issue>6717</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\LargeObjectAlloc2\LargeObjectAlloc2.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\smalloom\smalloom.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\Features\BackgroundGC\foregroundgc\foregroundgc.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\Features\HeapExpansion\pluggaps\pluggaps.cmd"> - <Issue>6720</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\Features\SustainedLowLatency\scenario\scenario.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\Allocation\finalizertest\finalizertest.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\Allocation\largeexceptiontest\largeexceptiontest.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\collect\collect.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\getgeneration\getgeneration.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\gettotalmemory\gettotalmemory.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\keepalive\keepalive.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\reregisterforfinalize\reregisterforfinalize.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\suppressfinalize\suppressfinalize.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\GC\Regressions\dev10bugs\536168\536168\536168.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\badldsfld_il_d\badldsfld_il_d.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\badldsfld_il_r\badldsfld_il_r.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd"> - <Issue>2414</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd"> - <Issue>2414</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d\ldelemnullarr1_il_d.cmd"> - <Issue>2416</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_r\ldelemnullarr1_il_r.cmd"> - <Issue>2416</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_d\nonrefsdarr_il_d.cmd"> - <Issue>2416</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_r\nonrefsdarr_il_r.cmd"> - <Issue>2416</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\forceinlining\AttributeConflict\AttributeConflict.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\forceinlining\PositiveCases\PositiveCases.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic1\rva_rvastatic1.cmd"> - <Issue>2433</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic2\rva_rvastatic2.cmd"> - <Issue>2433</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic3\rva_rvastatic3.cmd"> - <Issue>2433</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic4\rva_rvastatic4.cmd"> - <Issue>2433</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\preemptive_cooperative\preemptive_cooperative.cmd"> - <Issue>2434</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\extended\extended.cmd"> - <Issue>2435</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\overlap\overlap.cmd"> - <Issue>2435</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic1\rvastatic1.cmd"> - <Issue>2451</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic2\rvastatic2.cmd"> - <Issue>2451</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic3\rvastatic3.cmd"> - <Issue>2451</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic4\rvastatic4.cmd"> - <Issue>2451</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic5\rvastatic5.cmd"> - <Issue>2451</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tailcall\tailcall\tailcall.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\mutualrecurthd-tls\mutualrecurthd-tls.cmd"> - <Issue>2441</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\test-tls\test-tls.cmd"> - <Issue>2441</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\Coverage\chaos65204782cs\chaos65204782cs.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\Coverage\chaos65204782cs_o\chaos65204782cs_o.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd"> - <Issue>2414</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd"> - <Issue>2414</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd"> - <Issue>2414</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\opt\cse\HugeArray\HugeArray.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd"> - <Issue>2414</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Arrays\misc\_il_dbgarrres\_il_dbgarrres.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_dbgsin_cs_il\_dbgsin_cs_il.cmd"> - <Issue>3216</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_dbgsin_il_cs\_dbgsin_il_cs.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_dbgsin_il_il\_dbgsin_il_il.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_odbgsin_cs_il\_odbgsin_cs_il.cmd"> - <Issue>3216</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_odbgsin_il_cs\_odbgsin_il_cs.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_odbgsin_il_il\_odbgsin_il_il.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_orelsin_cs_il\_orelsin_cs_il.cmd"> - <Issue>3216</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_orelsin_il_cs\_orelsin_il_cs.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_orelsin_il_il\_orelsin_il_il.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_relsin_cs_il\_relsin_cs_il.cmd"> - <Issue>3216</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_relsin_il_cs\_relsin_il_cs.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_relsin_il_il\_relsin_il_il.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_d\global_il_d.cmd"> - <Issue>2433</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_r\global_il_r.cmd"> - <Issue>2433</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\tail_il_d\tail_il_d.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\tail_il_r\tail_il_r.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\threads3_il_d\threads3_il_d.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\threads3_il_r\threads3_il_r.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\simple\precise3_il_d\precise3_il_d.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\simple\precise3_il_r\precise3_il_r.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_simpleoddpower_il_d\_simpleoddpower_il_d.cmd"> - <Issue>'GetType() == TI_METHOD'</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_simpleoddpower_il_r\_simpleoddpower_il_r.cmd"> - <Issue>'GetType() == TI_METHOD'</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_d\badcodeafterfinally_d.cmd"> - <Issue>2444</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_r\badcodeafterfinally_r.cmd"> - <Issue>2444</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\basic\_il_relrefarg_i4\_il_relrefarg_i4.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_dbgpointer\_il_dbgpointer.cmd"> - <Issue>2435</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_dbgpointer_i\_il_dbgpointer_i.cmd"> - <Issue>2435</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_relpointer\_il_relpointer.cmd"> - <Issue>2435</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_relpointer_i\_il_relpointer_i.cmd"> - <Issue>2435</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall_v4\smallFrame\smallFrame.cmd"> - <Issue>4548</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\varargs\seh\fault_il_d\fault_il_d.cmd"> - <Issue>2414</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\varargs\seh\fault_il_r\fault_il_r.cmd"> - <Issue>2414</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\varargs\seh\filter_il_d\filter_il_d.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\varargs\seh\filter_il_r\filter_il_r.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_dbglocalloc\_il_dbglocalloc.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_rellocalloc\_il_rellocalloc.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Inline\regression\mismatch32\mismatch32\mismatch32.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Inline\regression\mismatch64\mismatch64\mismatch64.cmd"> - <Issue>'Arg type mismatch: Wanted long (size 8), Got struct (size 4) for call at IL offset 0x16'</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Inline\tests\LotsOfInlines\LotsOfInlines.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd"> - <Issue>x86 JIT doesn't support tail call opt</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_d\bigvtbl_cs_d.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_do\bigvtbl_cs_do.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_r\bigvtbl_cs_r.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\Math\Functions\Functions\Functions.cmd"> - <Issue>5430</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847\b07847.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16335\b16335\b16335.cmd"> - <Issue>6718</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28776\b28776\b28776.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49644\b49644\b49644.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57367\b57367\b57367.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102637\b102637\b102637.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689\b03689.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046\b08046.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b399444\b399444b\b399444b.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\dev10_865840\dev10_865840\dev10_865840.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\Dev11_468598\Test_HndIndex_10_Plain\Test_HndIndex_10_Plain.cmd"> - <Issue>5286</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\Dev11_468598\Test_HndIndex_10_Reordered\Test_HndIndex_10_Reordered.cmd"> - <Issue>5286</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\External\dev11_239804\ShowLocallocAlignment\ShowLocallocAlignment.cmd"> - <Issue>7163</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\GitHub_4044\GitHub_4044\GitHub_4044.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b311420\b311420\b311420.cmd"> - <Issue>6714</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474\b410474.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CircleInConvex_r\CircleInConvex_r.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CircleInConvex_ro\CircleInConvex_ro.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TSAmbiguities\CollapsedInterfaces\HelloWorld\HelloWorld.cmd"> - <Issue>6714</Issue> - </ExcludeList> - </ItemGroup> - - <!-- Tests that need to be triaged for vararg usage as that is not supported --> - <ItemGroup Condition="'$(XunitTestBinBase)' != ''"> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\1\arglist\arglist.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\2\arglist\arglist.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\4\arglist\arglist.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\volatile\1\arglist\arglist.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\gc\misc\funclet\funclet.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i00\mcc_i00.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i01\mcc_i01.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i02\mcc_i02.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i03\mcc_i03.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i10\mcc_i10.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i11\mcc_i11.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i12\mcc_i12.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i13\mcc_i13.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i30\mcc_i30.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i31\mcc_i31.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i32\mcc_i32.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i33\mcc_i33.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i50\mcc_i50.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i51\mcc_i51.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i52\mcc_i52.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i53\mcc_i53.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i60\mcc_i60.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i61\mcc_i61.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i62\mcc_i62.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i63\mcc_i63.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i70\mcc_i70.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i71\mcc_i71.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i72\mcc_i72.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i73\mcc_i73.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i80\mcc_i80.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i81\mcc_i81.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i82\mcc_i82.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i83\mcc_i83.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Coverage\arglist_pos\arglist_pos.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_il_dbgseq\_il_dbgseq.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_il_relseq\_il_relseq.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b26323\b26323\b26323.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16423\b16423\b16423.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324a\b26324a.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324b\b26324b.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28901\b28901\b28901.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30838\b30838\b30838.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30864\b30864\b30864.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32374\b32374\b32374.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b35784\b35784\b35784.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36472\b36472\b36472.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37598\b37598\b37598.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41391\b41391\b41391.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46867\b46867\b46867.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31745\b31745\b31745.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31746\b31746\b31746.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37646\b37646\b37646.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b41852\b41852\b41852.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88793\b88793\b88793.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91248\b91248\b91248.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409748\b409748\b409748.cmd"> - <Issue>needs triage</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\DevDiv_255294\DevDiv_255294\DevDiv_255294.cmd"> - <Issue>times out</Issue> - </ExcludeList> - </ItemGroup> -</Project> diff --git a/tests/xunitwrapper.targets b/tests/xunitwrapper.targets index 3b343bd891..a0ff7f59fa 100644 --- a/tests/xunitwrapper.targets +++ b/tests/xunitwrapper.targets @@ -6,13 +6,13 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Target Name="ResolveNuGetPackages"> - <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))" + <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectAssetsFile))" AllowFallbackOnTargetSelection="true" IncludeFrameworkReferences="false" NuGetPackagesDirectory="$(PackagesDir)" RuntimeIdentifier="$(TestNugetRuntimeId)" ProjectLanguage="$(Language)" - ProjectLockFile="$(ProjectLockJson)" + ProjectLockFile="$(ProjectAssetsFile)" TargetMonikers="$(TargetFrameworkMoniker)"> <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" /> <Output TaskParameter="ResolvedReferences" ItemName="Reference" /> |