From ec4664c0c57a4d3ca1a647c9f118740e5a9825e7 Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Mon, 6 Mar 2017 14:21:15 -0800 Subject: [PATCH] Fix jit32 perf and throughput testing For jit32, we need to download the compatjit to make sure we are using a jit32 build, not legacy backend (which is what is built when we run a regular build out of coreclr). This change updates the groovy scripting to pull down the jit nuget package that contains compatjit. Until the packaging is fixed (dotnet/coreclr#9991), we are defaulting to the last package that packaged compatjit along with clrjit. Commit migrated from https://github.com/dotnet/coreclr/commit/bf80bc7ee8905168c79826a060d4768537c14b7f --- src/coreclr/perf.groovy | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/coreclr/perf.groovy b/src/coreclr/perf.groovy index 652d993..3bd9dcc 100644 --- a/src/coreclr/perf.groovy +++ b/src/coreclr/perf.groovy @@ -74,6 +74,14 @@ def static getOSGroup(def os) { batchFile("py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\machinedata.py\"") batchFile("set __TestIntermediateDir=int&&build.cmd ${configuration} ${architecture}") batchFile("tests\\runtest.cmd ${configuration} ${architecture} GenerateLayoutOnly") + + if (arch == 'x86jit32') + { + // Download package and copy compatjit into Core_Root + batchFile("C:\\Tools\\nuget.exe install runtime.win7-${architecture}.Microsoft.NETCore.Jit -Source https://dotnet.myget.org/F/dotnet-core -OutputDirectory \"%WORKSPACE%\" -Prerelease -ExcludeVersion\n" + + "xcopy \"%WORKSPACE%\\runtime.win7-x86.Microsoft.NETCore.Jit\\runtimes\\win7-x86\\native\\compatjit.dll\" \"%WORKSPACE%\\bin\\tests\\${os}.${architecture}.${configuration}\\Tests\\Core_Root\" /Y") + } + batchFile("tests\\scripts\\run-xunit-perf.cmd -arch ${arch} -configuration ${configuration} ${testEnv} -testBinLoc bin\\tests\\${os}.${architecture}.${configuration}\\performance\\perflab\\Perflab -library -uploadToBenchview \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" -runtype ${runType}") batchFile("tests\\scripts\\run-xunit-perf.cmd -arch ${arch} -configuration ${configuration} ${testEnv} -testBinLoc bin\\tests\\${os}.${architecture}.${configuration}\\Jit\\Performance\\CodeQuality -uploadToBenchview \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" -runtype ${runType}") } @@ -150,6 +158,12 @@ def static getOSGroup(def os) { batchFile("py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\machinedata.py\"") batchFile("set __TestIntermediateDir=int&&build.cmd ${configuration} ${architecture} skiptests") batchFile("tests\\runtest.cmd ${configuration} ${architecture} GenerateLayoutOnly") + if (arch == 'x86jit32') + { + // Download package and copy compatjit into Core_Root + batchFile("C:\\Tools\\nuget.exe install runtime.win7-${architecture}.Microsoft.NETCore.Jit -Source https://dotnet.myget.org/F/dotnet-core -OutputDirectory \"%WORKSPACE%\" -Prerelease -ExcludeVersion\n" + + "xcopy \"%WORKSPACE%\\runtime.win7-x86.Microsoft.NETCore.Jit\\runtimes\\win7-x86\\native\\compatjit.dll\" \"%WORKSPACE%\\bin\\tests\\${os}.${architecture}.${configuration}\\Tests\\Core_Root\" /Y") + } batchFile("py -u tests\\scripts\\run-throughput-perf.py -arch ${arch} -os ${os} -configuration ${configuration} -clr_root \"%WORKSPACE%\" -assembly_root \"%WORKSPACE%\\Microsoft.BenchView.ThroughputBenchmarks.${architecture}.${os}\\lib\" -benchview_path \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" -run_type ${runType}") } } -- 2.7.4