diff options
52 files changed, 1488 insertions, 293 deletions
diff --git a/Documentation/project-docs/ci-trigger-phrases.md b/Documentation/project-docs/ci-trigger-phrases.md index 9751ed0f6a..3652565498 100644 --- a/Documentation/project-docs/ci-trigger-phrases.md +++ b/Documentation/project-docs/ci-trigger-phrases.md @@ -79,8 +79,8 @@ To trigger a job, post a comment on your PR with "@dotnet-bot {trigger-phrase}". - **Windows_NT x64 Checked CoreFX JitStressRegs=8 Build & Test:** "test Windows_NT corefx_jitstressregs8" - **Windows_NT x64 Checked CoreFX JitStressRegs=0x10 Build & Test:** "test Windows_NT corefx_jitstressregs0x10" - **Windows_NT x64 Checked CoreFX JitStressRegs=0x80 Build & Test:** "test Windows_NT corefx_jitstressregs0x80" -- **Windows_NT x86 RyuJit Checked Priority 0 Build & Test:** "test Windows_NT x86 ryujit -- **Windows_NT x86 legacy_backend Checked Priority 0 Build & Test:** "test Windows_NT x86 legacy_backend +- **Windows_NT x86 RyuJit Checked Priority 0 Build & Test:** "test Windows_NT x86 ryujit" +- **Windows_NT x86 legacy_backend Checked Priority 0 Build & Test:** "test Windows_NT x86 legacy_backend" - **Windows_NT x86 RyuJit Release Ready-To-Run Priority 0 Build & Test:** "test Windows_NT x86 ryujit Release r2r" - **Windows_NT x86 legacy_backend Release Ready-To-Run Priority 0 Build & Test:** "test Windows_NT x86 legacy_backend Release r2r" - **Windows_NT x86 RyuJit Release Ready-To-Run Priority 1 Build & Test:** "test Windows_NT x86 ryujit Release pri1r2r" @@ -109,6 +109,34 @@ To trigger a job, post a comment on your PR with "@dotnet-bot {trigger-phrase}". - **Windows_NT x86 RyuJit Checked JITMinOpts R2R Build & Test:** "test Windows_NT x86 ryujit Checked JITMinOpts R2R" - **Windows_NT x86 RyuJit Release ForceRelocs R2R Build & Test:** "test Windows_NT x86 ryujit Release ForceRelocs R2R" - **Windows_NT x86 RyuJit Checked ForceRelocs R2R Build & Test:** "test Windows_NT x86 ryujit Checked ForceRelocs R2R" +- **Windows_NT x86 RyuJit Checked JIT MinOpts Build & Test:** "test Windows_NT x86 ryujit minopts" +- **Windows_NT x86 RyuJit Checked JITStress=1 Build & Test:** "test Windows_NT x86 ryujit jitstress1" +- **Windows_NT x86 RyuJit Checked JITStress=2 Build & Test:** "test Windows_NT x86 ryujit jitstress2" +- **Windows_NT x86 RyuJit Checked Jit ForceRelocs Build & Test:** "test Windows_NT x86 ryujit forcerelocs" +- **Windows_NT x86 RyuJit Checked JITStressRegs=1 Build & Test:** "test Windows_NT x86 ryujit jitstressregs1" +- **Windows_NT x86 RyuJit Checked JITStressRegs=2 Build & Test:** "test Windows_NT x86 ryujit jitstressregs2" +- **Windows_NT x86 RyuJit Checked JITStressRegs=3 Build & Test:** "test Windows_NT x86 ryujit jitstressregs3" +- **Windows_NT x86 RyuJit Checked JITStressRegs=4 Build & Test:** "test Windows_NT x86 ryujit jitstressregs4" +- **Windows_NT x86 RyuJit Checked JITStressRegs=8 Build & Test:** "test Windows_NT x86 ryujit jitstressregs8" +- **Windows_NT x86 RyuJit Checked JITStressRegs=0x10 Build & Test:** "test Windows_NT x86 ryujit jitstressregs0x10" +- **Windows_NT x86 RyuJit Checked JITStressRegs=0x80 Build & Test:** "test Windows_NT x86 ryujit jitstressregs0x80" +- **Windows_NT x86 RyuJit Checked JitStress=2 JITStressRegs=1 Build & Test:** "test Windows_NT x86 ryujit jitstress2_jitstressregs1" +- **Windows_NT x86 RyuJit Checked JitStress=2 JITStressRegs=2 Build & Test:** "test Windows_NT x86 ryujit jitstress2_jitstressregs2" +- **Windows_NT x86 RyuJit Checked JitStress=2 JITStressRegs=3 Build & Test:** "test Windows_NT x86 ryujit jitstress2_jitstressregs3" +- **Windows_NT x86 RyuJit Checked JitStress=2 JITStressRegs=4 Build & Test:** "test Windows_NT x86 ryujit jitstress2_jitstressregs4" +- **Windows_NT x86 RyuJit Checked JitStress=2 JITStressRegs=8 Build & Test:** "test Windows_NT x86 ryujit jitstress2_jitstressregs8" +- **Windows_NT x86 RyuJit Checked JitStress=2 JITStressRegs=0x10 Build & Test:** "test Windows_NT x86 ryujit jitstress2_jitstressregs0x10" +- **Windows_NT x86 RyuJit Checked JitStress=2 JITStressRegs=0x80 Build & Test:** "test Windows_NT x86 ryujit jitstress2_jitstressregs0x80" +- **Windows_NT x86 RyuJit Checked GCStress=0x3 Build & Test:** "test Windows_NT x86 ryujit gcstress0x3" +- **Windows_NT x86 RyuJit Checked GCStress=0xc Build & Test:** "test Windows_NT x86 ryujit gcstress0xc" +- **Windows_NT x86 RyuJit Checked zapdisable Build & Test:** "test Windows_NT x86 ryujit zapdisable" +- **Windows_NT x86 RyuJit Checked Heap Verify 1 Build & Test:** "test Windows_NT x86 ryujit heapverify1" +- **Windows_NT x86 RyuJit Checked GCStress=0xc zapdisable Build & Test:** "test Windows_NT x86 ryujit gcstress0xc_zapdisable" +- **Windows_NT x86 RyuJit Checked GCStress=0xc JitStress=2 zapdisable Build & Test:** "test Windows_NT x86 ryujit gcstress0xc_zapdisable_jitstress2" +- **Windows_NT x86 RyuJit Checked GCStress=0xc zapdisable Heap Verify 1 Build & Test:** "test Windows_NT x86 ryujit gcstress0xc_zapdisable_heapverify1" +- **Windows_NT x86 RyuJit Checked GCStress=0xc JitStress=1 Build & Test:** "test Windows_NT x86 ryujit gcstress0xc_jitstress1" +- **Windows_NT x86 RyuJit Checked GCStress=0xc JitStress=2 Build & Test:** "test Windows_NT x86 ryujit gcstress0xc_jitstress2" +- **Windows_NT x86 RyuJit Checked GCStress=0xc MinOpts Heap Verify 1 Build & Test:** "test Windows_NT x86 ryujit gcstress0xc_minopts_heapverify1" - **Windows_NT x86 legacy_backend Release jitstress1 R2R Build & Test:** "test Windows_NT x86 legacy_backend Release jitstress1 R2R" - **Windows_NT x86 legacy_backend Checked jitstress1 R2R Build & Test:** "test Windows_NT x86 legacy_backend Checked jitstress1 R2R" - **Windows_NT x86 legacy_backend Release jitstress2 R2R Build & Test:** "test Windows_NT x86 legacy_backend Release jitstress2 R2R" @@ -131,8 +159,8 @@ To trigger a job, post a comment on your PR with "@dotnet-bot {trigger-phrase}". - **Windows_NT x86 legacy_backend Checked JITMinOpts R2R Build & Test:** "test Windows_NT x86 legacy_backend Checked JITMinOpts R2R" - **Windows_NT x86 legacy_backend Release ForceRelocs R2R Build & Test:** "test Windows_NT x86 legacy_backend Release ForceRelocs R2R" - **Windows_NT x86 legacy_backend Checked ForceRelocs R2R Build & Test:** "test Windows_NT x86 legacy_backend Checked ForceRelocs R2R" -- **Windows_NT x86 RyuJit Release Long-Running GC Build & Test:** "test Windows_NT x86 ryujit Release longgc -- **Windows_NT x86 legacy_backend Release Long-Running GC Build & Test:** "test Windows_NT x86 legacy_backend Release longgc +- **Windows_NT x86 RyuJit Release Long-Running GC Build & Test:** "test Windows_NT x86 ryujit Release longgc" +- **Windows_NT x86 legacy_backend Release Long-Running GC Build & Test:** "test Windows_NT x86 legacy_backend Release longgc" - **Ubuntu x64 Release Priority 1 Build & Test:** "test Ubuntu pri1" - **Ubuntu x64 Release IL RoundTrip Build & Test:** "test Ubuntu ilrt" - **Ubuntu x64 Release Long-Running GC Build & Test:**: "test Ubuntu Release longgc" diff --git a/Documentation/project-docs/glossary.md b/Documentation/project-docs/glossary.md index 19609049a7..6b13ba82d3 100644 --- a/Documentation/project-docs/glossary.md +++ b/Documentation/project-docs/glossary.md @@ -18,7 +18,7 @@ As much as possible, we should link to the most authoritative and recent source * PAL: [Platform Adaptation Layer](http://archive.oreilly.com/pub/a/dotnet/2002/03/04/rotor.html). Provides an abstraction layer between the runtime and the operating system * PE: Portable Executable. * ProjectN: Codename for the first version of [.NET Native for UWP](https://msdn.microsoft.com/en-us/vstudio/dotnetnative.aspx). -* ReadyToRun: A flavor of native images - command line switch of [crossgen](https://github.com/dotnet/coreclr/blob/master/src/tools/crossgen/crossgen.cpp). We do plan to add docs as part of [#227](https://github.com/dotnet/coreclr/issues/227). +* ReadyToRun: A flavor of native images - command line switch of [crossgen](../building/crossgen.md). * Redhawk: Codename for experimental minimal managed code runtime that evolved into [CoreRT](https://github.com/dotnet/corert/). * SOS: [Son of Strike](http://blogs.msdn.com/b/jasonz/archive/2003/10/21/53581.aspx). The debugging extension for DbgEng based debuggers. Uses the DAC as an abstraction layer for its operation. * SVR: The CLR used to be built as two variants, with one called "mscorsvr.dll", to mean the "server" version. In particular, it contained the server GC implementation, which was intended for multi-threaded apps capable of taking advantage of multiple processors. In the .NET Framework 2 release, the two variants were merged into "mscorwks.dll". The WKS version was the default, however the SVR version remained available. diff --git a/netci.groovy b/netci.groovy index f083400354..071048dffa 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1129,6 +1129,195 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os, } break case 'x86ryujit': + def arch = 'x86' + def jit = 'ryujit' + switch (scenario) { + case 'default': + // Default trigger + if (os == 'Windows_NT') { + if (configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test") + } + } + else { + // default trigger + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build", "(?i).*test\\W+${arch}\\W+${osGroup}.\\W+${jit}.*") + } + break + case 'pri1': + // Default trigger + if (configuration == 'Release') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Priority 1 Build and Test") + } + break + case 'ilrt': + if (configuration == 'Release') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} IL RoundTrip Build and Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r': + if (configuration == 'Checked' || configuration == 'Release') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} R2R pri0 Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'pri1r2r': + if (configuration == 'Checked' || configuration == 'Release') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} R2R pri1 Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'gcstress15_pri1r2r': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} GCStress 15 R2R pri1 Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitstress1': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} jitstress1 R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitstress2': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} jitstress2 R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitstressregs1': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} jitstressregs1 R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitstressregs2': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} jitstressregs2 R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitstressregs3': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} jitstressregs3 R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitstressregs4': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} jitstressregs4 R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitstressregs8': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} jitstressregs8 R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitstressregsx10': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} jitstressregsx10 R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitstressregsx80': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} jitstressregsx80 R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitminopts': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} JITMinOpts R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'r2r_jitforcerelocs': + if (configuration == 'Release' || configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} ForceRelocs R2R Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'longgc': + if (configuration == 'Release') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Long-Running GC Build & Test", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'gcsimulator': + if (configuration == 'Release') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} GC Simulator", "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + } + break + case 'minopts': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - MinOpts)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'forcerelocs': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - ForceRelocs)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstress1': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - JitStress=1)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstress2': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - JitStress=2)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstressregs1': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - JitStressRegs=1)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstressregs2': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - JitStressRegs=2)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstressregs3': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - JitStressRegs=3)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstressregs4': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - JitStressRegs=4)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstressregs8': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - JitStressRegs=8)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstressregs0x10': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - JitStressRegs=0x10)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstressregs0x80': + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - JitStressRegs=0x80)", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + case 'jitstress2_jitstressregs1': + case 'jitstress2_jitstressregs2': + case 'jitstress2_jitstressregs3': + case 'jitstress2_jitstressregs4': + case 'jitstress2_jitstressregs8': + case 'jitstress2_jitstressregs0x10': + case 'jitstress2_jitstressregs0x80': + case 'gcstress0x3': + case 'gcstress0xc': + case 'zapdisable': + case 'heapverify1': + case 'gcstress0xc_zapdisable': + case 'gcstress0xc_zapdisable_jitstress2': + case 'gcstress0xc_zapdisable_heapverify1': + case 'gcstress0xc_jitstress1': + case 'gcstress0xc_jitstress2': + case 'gcstress0xc_minopts_heapverify1': + def displayStr = getStressModeDisplayName(scenario) + assert (os == 'Windows_NT') + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - ${displayStr})", + "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*") + break + default: + println("Unknown scenario: ${arch} ${jit} ${scenario}"); + assert false + break + } + break case 'x86lb': assert (scenario == 'default' || scenario == 'r2r' || scenario == 'pri1r2r' || scenario == 'gcstress15_pri1r2r' || scenario == 'longgc' || scenario == 'gcsimulator' || Constants.r2rJitStressScenarios.indexOf(scenario) != -1) @@ -1147,7 +1336,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os, } else { // default trigger - Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build", "(?i).*test\\W+${arch}\\W+${osGroup}.\\W+${jit}*") + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build", "(?i).*test\\W+${arch}\\W+${osGroup}.\\W+${jit}.*") } } else if (scenario == 'r2r') { @@ -1359,6 +1548,11 @@ combinedScenarios.each { scenario -> case 'x64': // Everything implemented break + case 'x86ryujit': + if (enableCorefxTesting) { + return + } + break default: return } @@ -1636,12 +1830,18 @@ combinedScenarios.each { scenario -> } else { def stepScriptLocation = "%WORKSPACE%\\bin\\tests\\SetStressModes.bat" - buildCommands += genStressModeScriptStep(os, scenario, Constants.jitStressModeScenarios[scenario], stepScriptLocation) - // Run tests with the + if (architecture == 'x86ryujit'){ + def x86Vars = ['COMPLUS_AltJit' : '*', 'COMPLUS_AltJitName' : 'protojit.dll', 'COMPLUS_NoGuiOnAssert' : '1'] + buildCommands += genStressModeScriptStep(os, scenario, Constants.jitStressModeScenarios[scenario] + x86Vars, stepScriptLocation) + } + else { + buildCommands += genStressModeScriptStep(os, scenario, Constants.jitStressModeScenarios[scenario], stepScriptLocation) + } + // Run tests with the buildCommands += "tests\\runtest.cmd ${runtestArguments} TestEnv ${stepScriptLocation}" - } + } } else if (architecture == 'x64') { buildCommands += "tests\\runtest.cmd ${runtestArguments}" @@ -1779,7 +1979,7 @@ combinedScenarios.each { scenario -> buildCommands += "git clone https://github.com/dotnet/corefx fx" // Set environment variable - def setEnvVar = getStressModeEnvSetCmd(os, scenario) + def setEnvVar = getStressModeEnvSetCmd(os, scenario) // Build and text corefx buildCommands += "rm -rf \$WORKSPACE/fx_home; mkdir \$WORKSPACE/fx_home" diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds index 7ac4e3f469..0b476e368a 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds @@ -39,6 +39,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.ILAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> @@ -51,6 +55,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.ILAsm.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index d1beacb15a..9287160685 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -32,6 +32,9 @@ <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="rhel\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -41,6 +44,9 @@ <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj new file mode 100644 index 0000000000..89b438dc71 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,30 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ilasm" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj new file mode 100644 index 0000000000..766b71fd21 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,30 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ilasm" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds index fd9ced9b22..7e6f00deba 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds @@ -39,6 +39,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.ILDAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> @@ -51,6 +55,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.ILDAsm.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index bca9bf737b..d1ea5ba93f 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -32,6 +32,9 @@ <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="rhel\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -41,6 +44,9 @@ <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj new file mode 100644 index 0000000000..dfe0de0193 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,30 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ildasm" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj new file mode 100644 index 0000000000..62f8853a64 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,30 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ildasm" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds index 0eca9976a4..e1ad9fb0a4 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds @@ -39,6 +39,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.Jit.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.Jit.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> @@ -51,6 +55,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.Jit.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj index f3b539b998..f8587c6b32 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -31,6 +31,9 @@ <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.Jit.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="rhel\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -40,6 +43,9 @@ <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.Jit.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> diff --git a/src/.nuget/Microsoft.NETCore.Jit/opensuse/42.1/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/opensuse/42.1/Microsoft.NETCore.Jit.pkgproj new file mode 100644 index 0000000000..31a94c97b5 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Jit/opensuse/42.1/Microsoft.NETCore.Jit.pkgproj @@ -0,0 +1,30 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj new file mode 100644 index 0000000000..7c5d86eea3 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj @@ -0,0 +1,30 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds index f4b5e18bf9..7867fa4b4c 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds @@ -39,6 +39,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> @@ -51,6 +55,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 0af50e1776..40c12f8024 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -44,6 +44,9 @@ <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="rhel\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -53,6 +56,9 @@ <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj new file mode 100644 index 0000000000..62fc2d4efc --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,57 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> + <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> + <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> + <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> + <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> + <NativeSplittableBinary Include="$(BinDir)libsos.so" /> + <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> + <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> + <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> + <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> + <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> + <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> + </File> + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/netstandard1.0</TargetPath> + </File> + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj new file mode 100644 index 0000000000..b00403571b --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,57 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> + <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> + <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> + <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> + <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> + <NativeSplittableBinary Include="$(BinDir)libsos.so" /> + <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> + <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> + <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> + <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> + <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> + <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> + </File> + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/netstandard1.0</TargetPath> + </File> + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds index 54b52079f8..89d1776286 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds @@ -39,6 +39,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.TestHost.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> @@ -51,6 +55,10 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.TestHost.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj index bf2013657b..511a81c3df 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj @@ -36,6 +36,9 @@ <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.TestHost.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.TestHost.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="rhel\Microsoft.NETCore.TestHost.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -45,6 +48,9 @@ <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.TestHost.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.TestHost.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.TestHost.pkgproj"> <Platform>amd64</Platform> </ProjectReference> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj new file mode 100644 index 0000000000..3006e367f9 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.TestHost/opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj @@ -0,0 +1,30 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)corerun" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj new file mode 100644 index 0000000000..3dd6afd12c --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj @@ -0,0 +1,30 @@ +<?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> + <Version>1.1.0</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)corerun" /> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> + <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj index e8e2b7e0bd..bd9d2395f8 100644 --- a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj +++ b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj @@ -11,6 +11,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <NoStdLib>true</NoStdLib> <NoCompilerStandardLib>true</NoCompilerStandardLib> + <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey> </PropertyGroup> <!-- Default configurations to help VS understand the options --> diff --git a/src/ToolBox/SOS/NETCore/SymbolReader.cs b/src/ToolBox/SOS/NETCore/SymbolReader.cs index c4c1dc89d2..bfd4c2bb7d 100644 --- a/src/ToolBox/SOS/NETCore/SymbolReader.cs +++ b/src/ToolBox/SOS/NETCore/SymbolReader.cs @@ -144,22 +144,29 @@ namespace SOS internal static IntPtr LoadSymbolsForModule(string assemblyPath, bool isFileLayout, IntPtr loadedPeAddress, int loadedPeSize, IntPtr inMemoryPdbAddress, int inMemoryPdbSize, ReadMemoryDelegate readMemory) { - TargetStream peStream = null; - if (assemblyPath == null && loadedPeAddress != IntPtr.Zero) + try { - peStream = new TargetStream(loadedPeAddress, loadedPeSize, readMemory); + TargetStream peStream = null; + if (assemblyPath == null && loadedPeAddress != IntPtr.Zero) + { + peStream = new TargetStream(loadedPeAddress, loadedPeSize, readMemory); + } + TargetStream pdbStream = null; + if (inMemoryPdbAddress != IntPtr.Zero) + { + pdbStream = new TargetStream(inMemoryPdbAddress, inMemoryPdbSize, readMemory); + } + OpenedReader openedReader = GetReader(assemblyPath, isFileLayout, peStream, pdbStream); + if (openedReader != null) + { + GCHandle gch = GCHandle.Alloc(openedReader); + return GCHandle.ToIntPtr(gch); + } } - TargetStream pdbStream = null; - if (inMemoryPdbAddress != IntPtr.Zero) + catch { - pdbStream = new TargetStream(inMemoryPdbAddress, inMemoryPdbSize, readMemory); } - OpenedReader openedReader = GetReader(assemblyPath, isFileLayout, peStream, pdbStream); - if (openedReader == null) - return IntPtr.Zero; - - GCHandle gch = GCHandle.Alloc(openedReader); - return GCHandle.ToIntPtr(gch); + return IntPtr.Zero; } /// <summary> @@ -493,7 +500,7 @@ namespace SOS provider = MetadataReaderProvider.FromPortablePdbStream(pdbStream); result = new OpenedReader(provider, provider.GetMetadataReader()); } - catch (BadImageFormatException) + catch (Exception e) when (e is BadImageFormatException || e is IOException) { return null; } diff --git a/src/classlibnative/bcltype/stringnative.cpp b/src/classlibnative/bcltype/stringnative.cpp index 46be714ed3..1e6b132b17 100644 --- a/src/classlibnative/bcltype/stringnative.cpp +++ b/src/classlibnative/bcltype/stringnative.cpp @@ -285,7 +285,7 @@ FCIMPLEND STRINGREF value; INT32 thisOffset;} _compareOrdinalArgsEx; ==============================================================================*/ -FCIMPL5(INT32, COMString::CompareOrdinalEx, StringObject* strA, INT32 indexA, StringObject* strB, INT32 indexB, INT32 count) +FCIMPL6(INT32, COMString::CompareOrdinalEx, StringObject* strA, INT32 indexA, INT32 countA, StringObject* strB, INT32 indexB, INT32 countB) { FCALL_CONTRACT; @@ -294,41 +294,16 @@ FCIMPL5(INT32, COMString::CompareOrdinalEx, StringObject* strA, INT32 indexA, St DWORD *strAChars, *strBChars; int strALength, strBLength; - // This runtime test is handled in the managed wrapper. + // These runtime tests are handled in the managed wrapper. _ASSERTE(strA != NULL && strB != NULL); - - //If any of our indices are negative throw an exception. - if (count<0) - { - FCThrowArgumentOutOfRange(W("count"), W("ArgumentOutOfRange_NegativeCount")); - } - if (indexA < 0) - { - FCThrowArgumentOutOfRange(W("indexA"), W("ArgumentOutOfRange_Index")); - } - if (indexB < 0) - { - FCThrowArgumentOutOfRange(W("indexB"), W("ArgumentOutOfRange_Index")); - } + _ASSERTE(indexA >= 0 && indexB >= 0); + _ASSERTE(countA >= 0 && countB >= 0); strA->RefInterpretGetStringValuesDangerousForGC((WCHAR **) &strAChars, &strALength); strB->RefInterpretGetStringValuesDangerousForGC((WCHAR **) &strBChars, &strBLength); - int countA = count; - int countB = count; - - //Do a lot of range checking to make sure that everything is kosher and legit. - if (count > (strALength - indexA)) { - countA = strALength - indexA; - if (countA < 0) - FCThrowArgumentOutOfRange(W("indexA"), W("ArgumentOutOfRange_Index")); - } - - if (count > (strBLength - indexB)) { - countB = strBLength - indexB; - if (countB < 0) - FCThrowArgumentOutOfRange(W("indexB"), W("ArgumentOutOfRange_Index")); - } + _ASSERTE(countA <= strALength - indexA); + _ASSERTE(countB <= strBLength - indexB); // Set up the loop variables. strAChars = (DWORD *) ((WCHAR *) strAChars + indexA); diff --git a/src/classlibnative/bcltype/stringnative.h b/src/classlibnative/bcltype/stringnative.h index 6d0d413c0d..a4d962df6d 100644 --- a/src/classlibnative/bcltype/stringnative.h +++ b/src/classlibnative/bcltype/stringnative.h @@ -59,7 +59,7 @@ public: static FCDECL2(INT32, FCCompareOrdinalIgnoreCaseWC, StringObject* strA, __in_z INT8 *strB); - static FCDECL5(INT32, CompareOrdinalEx, StringObject* strA, INT32 indexA, StringObject* strB, INT32 indexB, INT32 count); + static FCDECL6(INT32, CompareOrdinalEx, StringObject* strA, INT32 indexA, INT32 countA, StringObject* strB, INT32 indexB, INT32 countB); static FCDECL4(INT32, LastIndexOfCharArray, StringObject* thisRef, CHARArray* valueRef, INT32 startIndex, INT32 count ); diff --git a/src/gcinfo/gcinfoencoder.cpp b/src/gcinfo/gcinfoencoder.cpp index 3e587ea5ef..67852220ed 100644 --- a/src/gcinfo/gcinfoencoder.cpp +++ b/src/gcinfo/gcinfoencoder.cpp @@ -1019,7 +1019,8 @@ void GcInfoEncoder::Build() BOOL slimHeader = (!m_IsVarArg && !hasSecurityObject && !hasGSCookie && (m_PSPSymStackSlot == NO_PSP_SYM) && !hasContextParamType && !m_WantsReportOnlyLeaf && (m_InterruptibleRanges.Count() == 0) && !hasReversePInvokeFrame && ((m_StackBaseRegister == NO_STACK_BASE_REGISTER) || (NORMALIZE_STACK_BASE_REGISTER(m_StackBaseRegister) == 0))) && - (m_SizeOfEditAndContinuePreservedArea == NO_SIZE_OF_EDIT_AND_CONTINUE_PRESERVED_AREA); + (m_SizeOfEditAndContinuePreservedArea == NO_SIZE_OF_EDIT_AND_CONTINUE_PRESERVED_AREA) && + !IsStructReturnKind(m_ReturnKind); // All new code is generated for the latest GCINFO_VERSION. // So, always encode RetunrKind and encode ReversePInvokeFrameSlot where applicable. diff --git a/src/inc/gcinfotypes.h b/src/inc/gcinfotypes.h index c08dd79c16..cd7afa4f93 100644 --- a/src/inc/gcinfotypes.h +++ b/src/inc/gcinfotypes.h @@ -289,6 +289,13 @@ inline bool IsValidReturnRegister(size_t regNo) ; } +inline bool IsStructReturnKind(ReturnKind returnKind) +{ + // Two bits encode integer/ref/float return-kinds. + // Encodings needing more than two bits are (non-scalar) struct-returns. + return returnKind > 3; +} + // Helpers for combining/extracting individual ReturnKinds from/to Struct ReturnKinds. // Encoding is two bits per register diff --git a/src/jit/codegenxarch.cpp b/src/jit/codegenxarch.cpp index 5e3506790f..e61630541e 100755 --- a/src/jit/codegenxarch.cpp +++ b/src/jit/codegenxarch.cpp @@ -3489,8 +3489,12 @@ void CodeGen::genCodeForInitBlkUnroll(GenTreeInitBlk* initBlkNode) if (initVal->gtIntCon.gtIconVal != 0) { - emit->emitIns_R_R(INS_mov_i2xmm, EA_8BYTE, tmpReg, valReg); + emit->emitIns_R_R(INS_mov_i2xmm, EA_PTRSIZE, tmpReg, valReg); emit->emitIns_R_R(INS_punpckldq, EA_8BYTE, tmpReg, tmpReg); +#ifdef _TARGET_X86_ + // For x86, we need one more to convert it from 8 bytes to 16 bytes. + emit->emitIns_R_R(INS_punpckldq, EA_8BYTE, tmpReg, tmpReg); +#endif // _TARGET_X86_ } else { diff --git a/src/jit/emitxarch.cpp b/src/jit/emitxarch.cpp index f9ab5975e8..d43f766ee8 100644 --- a/src/jit/emitxarch.cpp +++ b/src/jit/emitxarch.cpp @@ -75,7 +75,8 @@ bool emitter::IsThreeOperandBinaryAVXInstruction(instruction ins) ins == INS_maxss || ins == INS_maxsd || ins == INS_andnps || ins == INS_andnpd || ins == INS_paddb || ins == INS_paddw || ins == INS_paddd || ins == INS_paddq || ins == INS_psubb || ins == INS_psubw || ins == INS_psubd || ins == INS_psubq || ins == INS_pmuludq || ins == INS_pxor || ins == INS_pmaxub || - ins == INS_pminub || ins == INS_pmaxsw || ins == INS_pminsw || ins == INS_insertps || ins == INS_vinsertf128 + ins == INS_pminub || ins == INS_pmaxsw || ins == INS_pminsw || ins == INS_insertps || ins == INS_vinsertf128 || + ins == INS_punpckldq ); } diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp index a1d4aafc4e..ced582b30a 100644 --- a/src/jit/flowgraph.cpp +++ b/src/jit/flowgraph.cpp @@ -14170,6 +14170,10 @@ bool Compiler::fgOptimizeBranch(BasicBlock* bJump) /* Mark the jump dest block as being a jump target */ bJump->bbJumpDest->bbFlags |= BBF_JMP_TARGET | BBF_HAS_LABEL; + // We need to update the following flags of the bJump block if they were set in the bbJumpDest block + bJump->bbFlags |= (bJump->bbJumpDest->bbFlags + & (BBF_HAS_NEWOBJ | BBF_HAS_NEWARRAY | BBF_HAS_NULLCHECK | BBF_HAS_IDX_LEN | BBF_HAS_VTABREF)); + /* Update bbRefs and bbPreds */ // bJump now falls through into the next block diff --git a/src/jit/gcencode.cpp b/src/jit/gcencode.cpp index fbd51bb31c..a9f4a90ddc 100644 --- a/src/jit/gcencode.cpp +++ b/src/jit/gcencode.cpp @@ -1777,7 +1777,11 @@ size_t GCInfo::gcMakeRegPtrTable(BYTE* dest, int mask, const InfoHdr& header, un */ /* Has this argument been enregistered? */ +#ifndef LEGACY_BACKEND + if (!varDsc->lvOnFrame) +#else // LEGACY_BACKEND if (varDsc->lvRegister) +#endif // LEGACY_BACKEND { /* if a CEE_JMP has been used, then we need to report all the arguments even if they are enregistered, since we will be using this value diff --git a/src/jit/objectalloc.cpp b/src/jit/objectalloc.cpp index 1921e20afc..2e19f4378d 100644 --- a/src/jit/objectalloc.cpp +++ b/src/jit/objectalloc.cpp @@ -66,10 +66,13 @@ void ObjectAllocator::MorphAllocObjNodes() foreach_block(comp, block) { - if ((block->bbFlags & BBF_HAS_NEWOBJ) == 0) + const bool basicBlockHasNewObj = (block->bbFlags & BBF_HAS_NEWOBJ) == BBF_HAS_NEWOBJ; +#ifndef DEBUG + if (!basicBlockHasNewObj) { continue; } +#endif // DEBUG for (GenTreeStmt* stmt = block->firstStmt(); stmt; stmt = stmt->gtNextStmt) { @@ -90,6 +93,7 @@ void ObjectAllocator::MorphAllocObjNodes() if (canonicalAllocObjFound) { + assert(basicBlockHasNewObj); //------------------------------------------------------------------------ // We expect the following expression tree at this point // * GT_STMT void (top level) diff --git a/src/mscorlib/src/System/Char.cs b/src/mscorlib/src/System/Char.cs index c7fd4b36e0..ff936c6618 100644 --- a/src/mscorlib/src/System/Char.cs +++ b/src/mscorlib/src/System/Char.cs @@ -163,10 +163,7 @@ namespace System { ==============================================================================*/ // Provides a string representation of a character. [Pure] - public static String ToString(char c) { - Contract.Ensures(Contract.Result<String>() != null); - return new String(c, 1); - } + public static string ToString(char c) => string.CreateFromChar(c); public static char Parse(String s) { if (s==null) { diff --git a/src/mscorlib/src/System/Globalization/CompareInfo.cs b/src/mscorlib/src/System/Globalization/CompareInfo.cs index 0498a017ed..0b14f05264 100644 --- a/src/mscorlib/src/System/Globalization/CompareInfo.cs +++ b/src/mscorlib/src/System/Globalization/CompareInfo.cs @@ -528,8 +528,7 @@ namespace System.Globalization { if (options == CompareOptions.Ordinal) { - return CompareOrdinal(string1, offset1, length1, - string2, offset2, length2); + return string.CompareOrdinalHelper(string1, offset1, length1, string2, offset2, length2); } return InternalCompareString(this.m_dataHandle, this.m_handleOrigin, this.m_sortName, string1, offset1, length1, @@ -537,18 +536,6 @@ namespace System.Globalization { GetNativeCompareFlags(options)); } - [System.Security.SecurityCritical] - private static int CompareOrdinal(string string1, int offset1, int length1, string string2, int offset2, int length2) - { - int result = String.nativeCompareOrdinalEx(string1, offset1, string2, offset2, - (length1 < length2 ? length1 : length2)); - if ((length1 != length2) && result == 0) - { - return (length1 > length2 ? 1 : -1); - } - return (result); - } - //////////////////////////////////////////////////////////////////////// // // IsPrefix diff --git a/src/mscorlib/src/System/IntPtr.cs b/src/mscorlib/src/System/IntPtr.cs index d33cf91579..c7eea36447 100644 --- a/src/mscorlib/src/System/IntPtr.cs +++ b/src/mscorlib/src/System/IntPtr.cs @@ -24,7 +24,7 @@ namespace System { [Serializable] [System.Runtime.InteropServices.ComVisible(true)] - public struct IntPtr : ISerializable + public struct IntPtr : IEquatable<IntPtr>, ISerializable { [SecurityCritical] unsafe private void* m_value; // The compiler treats void* closest to uint hence explicit casts are required to preserve int behavior @@ -104,6 +104,12 @@ namespace System { } return false; } + + [SecuritySafeCritical] + unsafe bool IEquatable<IntPtr>.Equals(IntPtr other) + { + return m_value == other.m_value; + } [System.Security.SecuritySafeCritical] // auto-generated public unsafe override int GetHashCode() { diff --git a/src/mscorlib/src/System/Runtime/InteropServices/Marshal.cs b/src/mscorlib/src/System/Runtime/InteropServices/Marshal.cs index 5e6e7828bb..86e88306f0 100644 --- a/src/mscorlib/src/System/Runtime/InteropServices/Marshal.cs +++ b/src/mscorlib/src/System/Runtime/InteropServices/Marshal.cs @@ -1148,24 +1148,6 @@ namespace System.Runtime.InteropServices //==================================================================== - // Converts the CLR exception to an HRESULT. This function also sets - // up an IErrorInfo for the exception. - //==================================================================== - [System.Security.SecurityCritical] // auto-generated_required - [MethodImplAttribute(MethodImplOptions.InternalCall)] - public static extern int GetHRForException(Exception e); - - //==================================================================== - // Converts the CLR exception to an HRESULT. This function also sets - // up an IErrorInfo for the exception. - // This function is only used in WinRT and converts ObjectDisposedException - // to RO_E_CLOSED - //==================================================================== - [System.Security.SecurityCritical] // auto-generated_required - [MethodImplAttribute(MethodImplOptions.InternalCall)] - internal static extern int GetHRForException_WinRT(Exception e); - - //==================================================================== // This method is intended for compiler code generators rather // than applications. //==================================================================== @@ -1336,6 +1318,24 @@ namespace System.Runtime.InteropServices #if FEATURE_COMINTEROP + //==================================================================== + // Converts the CLR exception to an HRESULT. This function also sets + // up an IErrorInfo for the exception. + //==================================================================== + [System.Security.SecurityCritical] // auto-generated_required + [MethodImplAttribute(MethodImplOptions.InternalCall)] + public static extern int GetHRForException(Exception e); + + //==================================================================== + // Converts the CLR exception to an HRESULT. This function also sets + // up an IErrorInfo for the exception. + // This function is only used in WinRT and converts ObjectDisposedException + // to RO_E_CLOSED + //==================================================================== + [System.Security.SecurityCritical] // auto-generated_required + [MethodImplAttribute(MethodImplOptions.InternalCall)] + internal static extern int GetHRForException_WinRT(Exception e); + internal static readonly Guid ManagedNameGuid = new Guid("{0F21F359-AB84-41E8-9A78-36D110E6D2F9}"); //==================================================================== diff --git a/src/mscorlib/src/System/Runtime/InteropServices/NonPortable.cs b/src/mscorlib/src/System/Runtime/InteropServices/NonPortable.cs index 130a48a40a..408f56c8e2 100644 --- a/src/mscorlib/src/System/Runtime/InteropServices/NonPortable.cs +++ b/src/mscorlib/src/System/Runtime/InteropServices/NonPortable.cs @@ -5,9 +5,15 @@ // Dummy implementations of non-portable interop methods that just throw PlatformNotSupportedException namespace System.Runtime.InteropServices -{ +{ public static partial class Marshal { + [System.Security.SecurityCritical] + public static int GetHRForException(Exception e) + { + return (e != null) ? e.HResult : 0; + } + [System.Security.SecurityCriticalAttribute] public static int AddRef(System.IntPtr pUnk) { diff --git a/src/mscorlib/src/System/String.cs b/src/mscorlib/src/System/String.cs index 841af22c8d..86a367a16d 100644 --- a/src/mscorlib/src/System/String.cs +++ b/src/mscorlib/src/System/String.cs @@ -25,6 +25,7 @@ namespace System { using System.Runtime.Versioning; using Microsoft.Win32; using System.Diagnostics.Contracts; + using System.Security; // // For Information on these methods, please see COMString.cpp @@ -306,7 +307,7 @@ namespace System { // native call to COMString::CompareOrdinalEx [System.Security.SecurityCritical] // auto-generated [MethodImplAttribute(MethodImplOptions.InternalCall)] - internal static extern int nativeCompareOrdinalEx(String strA, int indexA, String strB, int indexB, int count); + internal static extern int CompareOrdinalHelper(String strA, int indexA, int countA, String strB, int indexB, int countB); //This will not work in case-insensitive mode for any character greater than 0x80. //We'll throw an ArgumentException. @@ -1488,7 +1489,6 @@ namespace System { return TrimHelper(trimChars,TrimTail); } - // Creates a new string with the characters copied in from ptr. If // ptr is null, a 0-length string (like String.Empty) is returned. // @@ -1567,6 +1567,17 @@ namespace System { return s; } + + // This is only intended to be used by char.ToString. + // It is necessary to put the code in this class instead of Char, since m_firstChar is a private member. + // Making m_firstChar internal would be dangerous since it would make it much easier to break String's immutability. + [SecuritySafeCritical] + internal static string CreateFromChar(char c) + { + string result = FastAllocateString(1); + result.m_firstChar = c; + return result; + } [System.Security.SecuritySafeCritical] // auto-generated unsafe internal int GetBytesFromEncoding(byte* pbNativeBuffer, int cbNativeBuffer,Encoding encoding) @@ -2091,84 +2102,61 @@ namespace System { // beginning at indexB of the same length. // [Pure] - public static int Compare(String strA, int indexA, String strB, int indexB, int length) { - int lengthA = length; - int lengthB = length; - - if (strA!=null) { - if (strA.Length - indexA < lengthA) { - lengthA = (strA.Length - indexA); - } - } - - if (strB!=null) { - if (strB.Length - indexB < lengthB) { - lengthB = (strB.Length - indexB); - } - } - return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.None); + public static int Compare(String strA, int indexA, String strB, int indexB, int length) + { + // NOTE: It's important we call the boolean overload, and not the StringComparison + // one. The two have some subtly different behavior (see notes in the former). + return Compare(strA, indexA, strB, indexB, length, ignoreCase: false); } - // Determines whether two string regions match. The substring of strA beginning // at indexA of length count is compared with the substring of strB // beginning at indexB of the same length. Case sensitivity is determined by the ignoreCase boolean. // [Pure] - public static int Compare(String strA, int indexA, String strB, int indexB, int length, bool ignoreCase) { + public static int Compare(String strA, int indexA, String strB, int indexB, int length, bool ignoreCase) + { + // Ideally we would just forward to the string.Compare overload that takes + // a StringComparison parameter, and just pass in CurrentCulture/CurrentCultureIgnoreCase. + // That function will return early if an optimization can be applied, e.g. if + // (object)strA == strB && indexA == indexB then it will return 0 straightaway. + // There are a couple of subtle behavior differences that prevent us from doing so + // however: + // - string.Compare(null, -1, null, -1, -1, StringComparison.CurrentCulture) works + // since that method also returns early for nulls before validation. It shouldn't + // for this overload. + // - Since we originally forwarded to CompareInfo.Compare for all of the argument + // validation logic, the ArgumentOutOfRangeExceptions thrown will contain different + // parameter names. + // Therefore, we have to duplicate some of the logic here. + int lengthA = length; int lengthB = length; - - if (strA!=null) { - if (strA.Length - indexA < lengthA) { - lengthA = (strA.Length - indexA); - } + + if (strA != null) + { + lengthA = Math.Min(lengthA, strA.Length - indexA); } - if (strB!=null) { - if (strB.Length - indexB < lengthB) { - lengthB = (strB.Length - indexB); - } + if (strB != null) + { + lengthB = Math.Min(lengthB, strB.Length - indexB); } - if (ignoreCase) { - return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.IgnoreCase); - } - return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.None); + var options = ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None; + return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, options); } - + // Determines whether two string regions match. The substring of strA beginning // at indexA of length length is compared with the substring of strB // beginning at indexB of the same length. Case sensitivity is determined by the ignoreCase boolean, // and the culture is set by culture. // [Pure] - public static int Compare(String strA, int indexA, String strB, int indexB, int length, bool ignoreCase, CultureInfo culture) { - if (culture == null) { - throw new ArgumentNullException("culture"); - } - Contract.EndContractBlock(); - - int lengthA = length; - int lengthB = length; - - if (strA!=null) { - if (strA.Length - indexA < lengthA) { - lengthA = (strA.Length - indexA); - } - } - - if (strB!=null) { - if (strB.Length - indexB < lengthB) { - lengthB = (strB.Length - indexB); - } - } - - if (ignoreCase) { - return culture.CompareInfo.Compare(strA,indexA,lengthA, strB, indexB, lengthB,CompareOptions.IgnoreCase); - } else { - return culture.CompareInfo.Compare(strA,indexA,lengthA, strB, indexB, lengthB,CompareOptions.None); - } + public static int Compare(String strA, int indexA, String strB, int indexB, int length, bool ignoreCase, CultureInfo culture) + { + var options = ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None; + return Compare(strA, indexA, strB, indexB, length, culture, options); } @@ -2259,7 +2247,7 @@ namespace System { return CultureInfo.InvariantCulture.CompareInfo.Compare(strA, indexA, lengthA, strB, indexB, lengthB, CompareOptions.IgnoreCase); case StringComparison.Ordinal: - return nativeCompareOrdinalEx(strA, indexA, strB, indexB, length); + return CompareOrdinalHelper(strA, indexA, lengthA, strB, indexB, lengthB); case StringComparison.OrdinalIgnoreCase: #if FEATURE_COREFX_GLOBALIZATION @@ -2339,16 +2327,48 @@ namespace System { // [Pure] [System.Security.SecuritySafeCritical] // auto-generated - public static int CompareOrdinal(String strA, int indexA, String strB, int indexB, int length) { - if (strA == null || strB == null) { - if ((Object)strA==(Object)strB) { //they're both null; + public static int CompareOrdinal(String strA, int indexA, String strB, int indexB, int length) + { + if (strA == null || strB == null) + { + if (object.ReferenceEquals(strA, strB)) + { + // They're both null return 0; } - return (strA==null)? -1 : 1; //-1 if A is null, 1 if B is null. + return strA == null ? -1 : 1; + } + + // COMPAT: Checking for nulls should become before the arguments are validated, + // but other optimizations which allow us to return early should come after. + + if (length < 0) + { + throw new ArgumentOutOfRangeException("length", Environment.GetResourceString("ArgumentOutOfRange_NegativeCount")); + } + + if (indexA < 0 || indexB < 0) + { + string paramName = indexA < 0 ? "indexA" : "indexB"; + throw new ArgumentOutOfRangeException(paramName, Environment.GetResourceString("ArgumentOutOfRange_Index")); + } + + int lengthA = Math.Min(length, strA.Length - indexA); + int lengthB = Math.Min(length, strB.Length - indexB); + + if (lengthA < 0 || lengthB < 0) + { + string paramName = lengthA < 0 ? "indexA" : "indexB"; + throw new ArgumentOutOfRangeException(paramName, Environment.GetResourceString("ArgumentOutOfRange_Index")); + } + + if (length == 0 || (object.ReferenceEquals(strA, strB) && indexA == indexB)) + { + return 0; } - return nativeCompareOrdinalEx(strA, indexA, strB, indexB, length); + return CompareOrdinalHelper(strA, indexA, lengthA, strB, indexB, lengthB); } @@ -2402,7 +2422,7 @@ namespace System { return CultureInfo.InvariantCulture.CompareInfo.IsSuffix(this, value, CompareOptions.IgnoreCase); case StringComparison.Ordinal: - return this.Length < value.Length ? false : (nativeCompareOrdinalEx(this, this.Length -value.Length, value, 0, value.Length) == 0); + return this.Length < value.Length ? false : (CompareOrdinalHelper(this, this.Length - value.Length, value.Length, value, 0, value.Length) == 0); case StringComparison.OrdinalIgnoreCase: #if FEATURE_COREFX_GLOBALIZATION diff --git a/src/mscorlib/src/System/Text/Encoding.cs b/src/mscorlib/src/System/Text/Encoding.cs index aa93dd4bfc..1f91364fd3 100644 --- a/src/mscorlib/src/System/Text/Encoding.cs +++ b/src/mscorlib/src/System/Text/Encoding.cs @@ -87,8 +87,6 @@ namespace System.Text public abstract class Encoding : ICloneable { private static Encoding defaultEncoding; - - private static volatile Hashtable encodings; // // The following values are from mlang.idl. These values @@ -373,6 +371,7 @@ namespace System.Text return dstEncoding.GetBytes(srcEncoding.GetChars(bytes, index, count)); } +#if FEATURE_CODEPAGES_FILE // Private object for locking instead of locking on a public type for SQL reliability work. private static Object s_InternalSyncObject; private static Object InternalSyncObject { @@ -385,6 +384,11 @@ namespace System.Text } } + // On Desktop, encoding instances that aren't cached in a static field are cached in + // a hash table by codepage. + private static volatile Hashtable encodings; +#endif + #if !FEATURE_CORECLR [System.Security.SecurityCritical] #endif @@ -420,9 +424,34 @@ namespace System.Text // Our Encoding + // See if the encoding is cached in a static field. + switch (codepage) + { + case CodePageDefault: return Default; // 0 + case CodePageUnicode: return Unicode; // 1200 + case CodePageBigEndian: return BigEndianUnicode; // 1201 + case CodePageUTF32: return UTF32; // 12000 + case CodePageUTF32BE: return BigEndianUTF32; // 12001 + case CodePageUTF7: return UTF7; // 65000 + case CodePageUTF8: return UTF8; // 65001 + case CodePageASCII: return ASCII; // 20127 + case ISO_8859_1: return Latin1; // 28591 + + // We don't allow the following special code page values that Win32 allows. + case CodePageNoOEM: // 1 CP_OEMCP + case CodePageNoMac: // 2 CP_MACCP + case CodePageNoThread: // 3 CP_THREAD_ACP + case CodePageNoSymbol: // 42 CP_SYMBOL + throw new ArgumentException(Environment.GetResourceString( + "Argument_CodepageNotSupported", codepage), "codepage"); + } + +#if FEATURE_CODEPAGES_FILE + object key = codepage; // Box once + // See if we have a hash table with our encoding in it already. if (encodings != null) { - result = (Encoding)encodings[codepage]; + result = (Encoding)encodings[key]; } if (result == null) @@ -437,92 +466,34 @@ namespace System.Text } // Double check that we don't have one in the table (in case another thread beat us here) - if ((result = (Encoding)encodings[codepage]) != null) + if ((result = (Encoding)encodings[key]) != null) return result; - // Special case the commonly used Encoding classes here, then call - // GetEncodingRare to avoid loading classes like MLangCodePageEncoding - // and ASCIIEncoding. ASP.NET uses UTF-8 & ISO-8859-1. - switch (codepage) + if (codepage == CodePageWindows1252) { - case CodePageDefault: // 0, default code page - result = Encoding.Default; - break; - case CodePageUnicode: // 1200, Unicode - result = Unicode; - break; - case CodePageBigEndian: // 1201, big endian unicode - result = BigEndianUnicode; - break; -#if FEATURE_CODEPAGES_FILE - case CodePageWindows1252: // 1252, Windows - result = new SBCSCodePageEncoding(codepage); - break; -#else - // on desktop, UTF7 is handled by GetEncodingRare. - // On Coreclr, we handle this directly without bringing GetEncodingRare, so that we get real UTF-7 encoding. - case CodePageUTF7: // 65000, UTF7 - result = UTF7; - break; - case CodePageUTF32: // 12000 - result = UTF32; - break; - case CodePageUTF32BE: // 12001 - result = new UTF32Encoding(true, true); - break; -#endif - case CodePageUTF8: // 65001, UTF8 - result = UTF8; - break; - - // These are (hopefully) not very common, but also shouldn't slow us down much and make default - // case able to handle more code pages by calling GetEncodingCodePage - case CodePageNoOEM: // 1 - case CodePageNoMac: // 2 - case CodePageNoThread: // 3 - case CodePageNoSymbol: // 42 - // Win32 also allows the following special code page values. We won't allow them except in the - // CP_ACP case. - // #define CP_ACP 0 // default to ANSI code page - // #define CP_OEMCP 1 // default to OEM code page - // #define CP_MACCP 2 // default to MAC code page - // #define CP_THREAD_ACP 3 // current thread's ANSI code page - // #define CP_SYMBOL 42 // SYMBOL translations - throw new ArgumentException(Environment.GetResourceString( - "Argument_CodepageNotSupported", codepage), "codepage"); - // Have to do ASCII and Latin 1 first so they don't get loaded as code pages - case CodePageASCII: // 20127 - result = ASCII; - break; - case ISO_8859_1: // 28591 - result = Latin1; - break; - default: - { -#if FEATURE_CODEPAGES_FILE - // 1st assume its a code page. - result = GetEncodingCodePage(codepage); - if (result == null) - result = GetEncodingRare(codepage); - break; -#else - // Is it a valid code page? - if (EncodingTable.GetCodePageDataItem(codepage) == null) - { - throw new NotSupportedException( - Environment.GetResourceString("NotSupported_NoCodepageData", codepage)); - } - - result = UTF8; - break; -#endif // FEATURE_CODEPAGES_FILE - } + result = new SBCSCodePageEncoding(codepage); } - encodings.Add(codepage, result); - } + else + { + result = GetEncodingCodePage(codepage) ?? GetEncodingRare(codepage); + } + + Contract.Assert(result != null, "result != null"); + encodings.Add(key, result); + } } return result; +#else + // Is it a valid code page? + if (EncodingTable.GetCodePageDataItem(codepage) == null) + { + throw new NotSupportedException( + Environment.GetResourceString("NotSupported_NoCodepageData", codepage)); + } + + return UTF8; +#endif // FEATURE_CODEPAGES_FILE } [Pure] @@ -553,15 +524,6 @@ namespace System.Text Encoding result; switch (codepage) { - case CodePageUTF7: // 65000 - result = UTF7; - break; - case CodePageUTF32: // 12000 - result = UTF32; - break; - case CodePageUTF32BE: // 12001 - result = new UTF32Encoding(true, true); - break; case ISCIIAssemese: case ISCIIBengali: case ISCIIDevanagari: @@ -1478,6 +1440,13 @@ namespace System.Text public static Encoding UTF32 => UTF32Encoding.s_default; + // Returns an encoding for the UTF-32 format. The returned encoding will be + // an instance of the UTF32Encoding class. + // + // It will use big endian byte order. + + private static Encoding BigEndianUTF32 => UTF32Encoding.s_bigEndianDefault; + public override bool Equals(Object value) { Encoding that = value as Encoding; if (that != null) diff --git a/src/mscorlib/src/System/Text/UTF32Encoding.cs b/src/mscorlib/src/System/Text/UTF32Encoding.cs index 62e4167e91..0bdbaefbf2 100644 --- a/src/mscorlib/src/System/Text/UTF32Encoding.cs +++ b/src/mscorlib/src/System/Text/UTF32Encoding.cs @@ -34,9 +34,10 @@ namespace System.Text Real Unicode value = (HighSurrogate - 0xD800) * 0x400 + (LowSurrogate - 0xDC00) + 0x10000 */ - // Used by Encoding.UTF32 for lazy initialization + // Used by Encoding.UTF32/BigEndianUTF32 for lazy initialization // The initialization code will not be run until a static member of the class is referenced internal static readonly UTF32Encoding s_default = new UTF32Encoding(bigEndian: false, byteOrderMark: true); + internal static readonly UTF32Encoding s_bigEndianDefault = new UTF32Encoding(bigEndian: true, byteOrderMark: true); private bool emitUTF32ByteOrderMark = false; private bool isThrowException = false; diff --git a/src/mscorlib/src/System/UIntPtr.cs b/src/mscorlib/src/System/UIntPtr.cs index 10a573a0bc..ac3b811b42 100644 --- a/src/mscorlib/src/System/UIntPtr.cs +++ b/src/mscorlib/src/System/UIntPtr.cs @@ -22,7 +22,7 @@ namespace System { [Serializable] [CLSCompliant(false)] [System.Runtime.InteropServices.ComVisible(true)] - public struct UIntPtr : ISerializable + public struct UIntPtr : IEquatable<UIntPtr>, ISerializable { [SecurityCritical] unsafe private void* m_value; @@ -84,6 +84,12 @@ namespace System { } return false; } + + [SecuritySafeCritical] + unsafe bool IEquatable<UIntPtr>.Equals(UIntPtr other) + { + return m_value == other.m_value; + } [System.Security.SecuritySafeCritical] // auto-generated public unsafe override int GetHashCode() { diff --git a/src/pal/src/init/pal.cpp b/src/pal/src/init/pal.cpp index d14b64bcd4..a5edb36428 100644 --- a/src/pal/src/init/pal.cpp +++ b/src/pal/src/init/pal.cpp @@ -705,6 +705,8 @@ PAL_IsDebuggerPresent() } } + close(status_fd); + return debugger_present; #elif defined(__APPLE__) struct kinfo_proc info = {}; diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index 5992b29a79..19e0f34bef 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -224,7 +224,7 @@ FCFuncStart(gStringFuncs) FCIntrinsic("get_Length", COMString::Length, CORINFO_INTRINSIC_StringLength) FCIntrinsic("get_Chars", COMString::GetCharAt, CORINFO_INTRINSIC_StringGetChar) FCFuncElement("IsAscii", COMString::IsAscii) - FCFuncElement("nativeCompareOrdinalEx", COMString::CompareOrdinalEx) + FCFuncElement("CompareOrdinalHelper", COMString::CompareOrdinalEx) FCFuncElement("IndexOfAny", COMString::IndexOfCharArray) FCFuncElement("LastIndexOfAny", COMString::LastIndexOfCharArray) FCFuncElementSig("ReplaceInternal", &gsig_IM_Str_Str_RetStr, COMString::ReplaceString) @@ -1600,11 +1600,11 @@ FCFuncStart(gInteropMarshalFuncs) FCFuncElement("StructureToPtr", MarshalNative::StructureToPtr) FCFuncElement("ThrowExceptionForHRInternal", MarshalNative::ThrowExceptionForHR) FCFuncElement("GetExceptionForHRInternal", MarshalNative::GetExceptionForHR) - FCFuncElement("GetHRForException", MarshalNative::GetHRForException) - FCFuncElement("GetHRForException_WinRT", MarshalNative::GetHRForException_WinRT) FCFuncElement("GetDelegateForFunctionPointerInternal", MarshalNative::GetDelegateForFunctionPointerInternal) FCFuncElement("GetFunctionPointerForDelegateInternal", MarshalNative::GetFunctionPointerForDelegateInternal) #ifdef FEATURE_COMINTEROP + FCFuncElement("GetHRForException", MarshalNative::GetHRForException) + FCFuncElement("GetHRForException_WinRT", MarshalNative::GetHRForException_WinRT) FCFuncElement("GetRawIUnknownForComObjectNoAddRef", MarshalNative::GetRawIUnknownForComObjectNoAddRef) FCFuncElement("IsComObject", MarshalNative::IsComObject) FCFuncElement("GetObjectForIUnknown", MarshalNative::GetObjectForIUnknown) diff --git a/src/vm/threadsuspend.cpp b/src/vm/threadsuspend.cpp index 5785ad7f13..cd4203b9d0 100644 --- a/src/vm/threadsuspend.cpp +++ b/src/vm/threadsuspend.cpp @@ -7286,7 +7286,7 @@ ReturnKind GetReturnKind(Thread *pThread, EECodeInfo *codeInfo) if (gcInfoToken.IsReturnKindAvailable()) { GcInfoDecoder gcInfoDecoder(gcInfoToken, DECODE_RETURN_KIND); - ReturnKind returnKind = gcInfoDecoder.GetReturnKind(); + returnKind = gcInfoDecoder.GetReturnKind(); } #endif // _TARGET_X86_ diff --git a/tests/issues.targets b/tests/issues.targets index e40477c221..869dfbd483 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -266,42 +266,15 @@ <!-- The following x86 failures only occur with RyuJIT/x86 --> <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x86'"> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\Serialization\Serialize\Serialize.cmd"> - <Issue>3597</Issue> - </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\MDArray\basics\stringarr_cs_do\stringarr_cs_do.cmd"> <Issue>4844</Issue> </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\MDArray\basics\stringarr_cs_ro\stringarr_cs_ro.cmd"> <Issue>4844</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CircleInConvex_r\CircleInConvex_r.cmd"> - <Issue>4992</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CircleInConvex_ro\CircleInConvex_ro.cmd"> - <Issue>4992</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\Methodical\fp\exgen\10w5d_cs_do\10w5d_cs_do.cmd"> - <Issue>6097</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\fp\exgen\10w250d_cs_do\10w250d_cs_do.cmd"> - <Issue>6097</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\perffix\primitivevt\mixed1_cs_ro\mixed1_cs_ro.cmd"> - <Issue>6097</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\fp\exgen\10w250d_cs_ro\10w250d_cs_ro.cmd"> - <Issue>6097</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\fp\exgen\10w5d_cs_ro\10w5d_cs_ro.cmd"> - <Issue>6097</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\perffix\primitivevt\mixed1_cs_do\mixed1_cs_do.cmd"> - <Issue>6097</Issue> - </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\eh\basics\loopEH\loopEH.cmd"> <Issue>6778</Issue> </ExcludeList> @@ -311,6 +284,9 @@ <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\DoublinkList\dlstack\*"> <Issue>6553</Issue> </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\DevDiv_255263\DevDiv_255263\DevDiv_255263.cmd"> + <Issue>6940</Issue> + </ExcludeList> </ItemGroup> <!-- Tests that need to be triaged for vararg usage as that is not supported --> diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh index 2c20d7fe2d..1b016bbd8f 100755 --- a/tests/scripts/arm32_ci_script.sh +++ b/tests/scripts/arm32_ci_script.sh @@ -180,6 +180,10 @@ function mount_emulator { mount_with_checking "-o bind" "/dev/pts" "$__ARMRootfsMountPath/dev/pts" mount_with_checking "-t tmpfs" "shm" "$__ARMRootfsMountPath/run/shm" mount_with_checking "-o bind" "/sys" "$__ARMRootfsMountPath/sys" + if [ ! -d "$__ARMRootfsMountPath/bindings/tmp" ]; then + sudo mkdir -p "$__ARMRootfsMountPath/bindings/tmp" + fi + mount_with_checking "-o bind" "/mnt" "$__ARMRootfsMountPath/bindings/tmp" } #Cross builds coreclr @@ -265,7 +269,7 @@ function copy_to_emulator { #Runs tests in an emulated mode function run_tests { sudo chroot $__ARMRootfsMountPath /bin/bash -x <<EOF - cd /home/coreclr + cd "$__ARMEmulCoreclr" ./tests/runtest.sh --testRootDir=$__testRootDirBase \ --mscorlibDir=$__mscorlibDirBase \ --coreFxNativeBinDir=$__coreFxNativeBinDirBase \ @@ -392,10 +396,16 @@ fi __buildDirName="$__buildOS.$__buildArch.$__buildConfig" #Define emulator paths -__ARMRootfsCoreclrPath="$__ARMRootfsMountPath/home/coreclr" -__ARMRootfsCorefxPath="$__ARMRootfsMountPath/home/corefx" -__ARMEmulCoreclr="/home/coreclr" -__ARMEmulCorefx="/home/corefx" +__TempFolder="bindings/tmp/arm32_ci_temp" + +if [ ! -d "$__TempFolder" ]; then + mkdir "$__TempFolder" +fi + +__ARMRootfsCoreclrPath="$__ARMRootfsMountPath/$__TempFolder/coreclr" +__ARMRootfsCorefxPath="$__ARMRootfsMountPath/$__TempFolder/corefx" +__ARMEmulCoreclr="/$__TempFolder/coreclr" +__ARMEmulCorefx="/$__TempFolder/corefx" __testRootDirBase= __mscorlibDirBase= __coreFxNativeBinDirBase= @@ -441,4 +451,6 @@ run_tests (set +x; echo 'Cleaning environment...') clean_env +rm -r "/mnt/arm32_ci_temp" + (set +x; echo 'Build and test complete') diff --git a/tests/scripts/project.json b/tests/scripts/project.json new file mode 100644 index 0000000000..8601127d71 --- /dev/null +++ b/tests/scripts/project.json @@ -0,0 +1,15 @@ +{ + "dependencies": { + "Microsoft.DotNet.xunit.performance.run.core": "1.0.0-alpha-build0035", + "Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0035", + "Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0035", + "Microsoft.DotNet.xunit.performance":"1.0.0-alpha-build0035", + "xunit.console.netcore": "1.0.3-prerelease-00607-01", + "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00629-04", + }, + "frameworks": { + "netstandard1.3":{ + "imports":["dnxcore50", "portable-net45+win8"] + } + } +}
\ No newline at end of file diff --git a/tests/scripts/run-xunit-perf.py b/tests/scripts/run-xunit-perf.py new file mode 100644 index 0000000000..e82a0193f1 --- /dev/null +++ b/tests/scripts/run-xunit-perf.py @@ -0,0 +1,398 @@ +#!/usr/bin/env bash + +function print_usage { + echo '' + echo 'CoreCLR test runner script.' + echo '' + echo 'Typical command line:' + echo '' + echo 'coreclr/tests/runtest.sh' + echo ' --testRootDir="temp/Windows_NT.x64.Debug"' + echo ' --testNativeBinDir="coreclr/bin/obj/Linux.x64.Debug/tests"' + echo ' --coreClrBinDir="coreclr/bin/Product/Linux.x64.Debug"' + echo ' --mscorlibDir="windows/coreclr/bin/Product/Linux.x64.Debug"' + echo ' --coreFxBinDir="corefx/bin/Linux.AnyCPU.Debug"' + echo ' --coreFxNativeBinDir="corefx/bin/Linux.x64.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 ' (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, --coreFxBinDir, and --coreFxNativeBinDir.' + 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>[;<path>]" : List of one or more directories with CoreFX build outputs (semicolon-delimited)' + echo ' (e.g. "corefx/bin/Linux.AnyCPU.Debug;corefx/bin/Unix.AnyCPU.Debug;corefx/bin/AnyOS.AnyCPU.Debug").' + echo ' If files with the same name are present in multiple directories, the first one wins.' + echo ' --coreFxNativeBinDir=<path> : Directory of the CoreFX native build (e.g. corefx/bin/Linux.x64.Debug).' +} + +# 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= +case $OSName in + Darwin) + libExtension="dylib" + ;; + + Linux) + libExtension="so" + ;; + + NetBSD) + libExtension="so" + ;; + + *) + echo "Unsupported OS $OSName detected, configuring as if for Linux" + libExtension="so" + ;; +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 + local printUsage=$3 + + if [ -z "$printUsage" ]; then + ((printUsage = 0)) + fi + + echo "$errorMessage" + xunit_output_end "$errorSource" "$errorMessage" + if ((printUsage != 0)); then + print_usage + fi + exit $EXIT_CODE_EXCEPTION +} + +# Handle Ctrl-C. We will stop execution and print the results that +# we gathered so far. +function handle_ctrl_c { + local errorSource='handle_ctrl_c' + + echo "" + echo "*** Stopping... ***" + print_results + exit_with_error "$errorSource" "Test run aborted by Ctrl+C." +} + +# Register the Ctrl-C handler +trap handle_ctrl_c INT + +function create_core_overlay { + local errorSource='create_core_overlay' + local printUsage=1 + + if [ -n "$coreOverlayDir" ]; then + export CORE_ROOT="$coreOverlayDir" + return + 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. + local testDependenciesDir=$testRootDir/Tests/Core_Root + if [ ! -d "$testDependenciesDir" ]; then + exit_with_error "$errorSource" "Did not find the test dependencies directory: $testDependenciesDir" + fi + if [ -z "$coreClrBinDir" ]; then + exit_with_error "$errorSource" "One of --coreOverlayDir or --coreClrBinDir must be specified." "$printUsage" + fi + if [ ! -d "$coreClrBinDir" ]; then + exit_with_error "$errorSource" "Directory specified by --coreClrBinDir does not exist: $coreClrBinDir" + fi + if [ ! -f "$mscorlibDir/mscorlib.dll" ]; then + exit_with_error "$errorSource" "mscorlib.dll was not found in: $mscorlibDir" + fi + if [ -z "$coreFxBinDir" ]; then + exit_with_error "$errorSource" "One of --coreOverlayDir or --coreFxBinDir must be specified." "$printUsage" + fi + if [ -z "$coreFxNativeBinDir" ]; then + exit_with_error "$errorSource" "One of --coreOverlayDir or --coreFxBinDir must be specified." "$printUsage" + fi + if [ ! -d "$coreFxNativeBinDir/Native" ]; then + exit_with_error "$errorSource" "Directory specified by --coreNativeFxBinDir does not exist: $coreFxNativeBinDir/Native" + fi + + # Create the overlay + coreOverlayDir=$testRootDir/Tests/coreoverlay + export CORE_ROOT="$coreOverlayDir" + if [ -e "$coreOverlayDir" ]; then + rm -f -r "$coreOverlayDir" + fi + mkdir "$coreOverlayDir" + + while IFS=';' read -ra coreFxBinDirectories; do + for currDir in "${coreFxBinDirectories[@]}"; do + if [ ! -d "$currDir" ]; then + exit_with_error "$errorSource" "Directory specified in --coreFxBinDir does not exist: $currDir" + fi + pushd $currDir > /dev/null + for dirName in $(find . -iname '*.dll' \! -iwholename '*test*' \! -iwholename '*/ToolRuntime/*' \! -iwholename '*/RemoteExecutorConsoleApp/*' \! -iwholename '*/net*' \! -iwholename '*aot*' -exec dirname {} \; | uniq | sed 's/\.\/\(.*\)/\1/g'); do + cp -n -v "$currDir/$dirName/$dirName.dll" "$coreOverlayDir/" + done + popd $currDur > /dev/null + done + done <<< $coreFxBinDir + + cp -f -v "$coreFxNativeBinDir/Native/"*."$libExtension" "$coreOverlayDir/" 2>/dev/null + + cp -f -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null + cp -f -v "$mscorlibDir/mscorlib.dll" "$coreOverlayDir/" + cp -n -v "$testDependenciesDir"/* "$coreOverlayDir/" 2>/dev/null + 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" + fi +} + +function precompile_overlay_assemblies { + + if [ $doCrossgen == 1 ]; then + + local overlayDir=$CORE_ROOT + + filesToPrecompile=$(ls -trh $overlayDir/*.dll) + for fileToPrecompile in ${filesToPrecompile} + do + local filename=${fileToPrecompile} + # Precompile any assembly except mscorlib since we already have its NI image available. + if [[ "$filename" != *"mscorlib.dll"* ]]; then + if [[ "$filename" != *"mscorlib.ni.dll"* ]]; then + 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. + elif [ $exitCode != 0 ]; then + echo Unable to precompile $filename. + else + echo Successfully precompiled $filename + fi + fi + fi + done + else + echo Skipping crossgen of FX assemblies. + fi +} + +function copy_test_native_bin_to_test_root { + local errorSource='copy_test_native_bin_to_test_root' + + if [ -z "$testNativeBinDir" ]; then + exit_with_error "$errorSource" "--testNativeBinDir is required." + fi + testNativeBinDir=$testNativeBinDir/src + if [ ! -d "$testNativeBinDir" ]; then + exit_with_error "$errorSource" "Directory specified by --testNativeBinDir does not exist: $testNativeBinDir" + fi + + # Copy native test components from the native test build into the respective test directory in the test root directory + find "$testNativeBinDir" -type f -iname '*.$libExtension' | + while IFS='' read -r filePath || [ -n "$filePath" ]; do + local dirPath=$(dirname "$filePath") + local destinationDirPath=${testRootDir}${dirPath:${#testNativeBinDir}} + if [ ! -d "$destinationDirPath" ]; then + exit_with_error "$errorSource" "Cannot copy native test bin '$filePath' to '$destinationDirPath/', as the destination directory does not exist." + fi + cp -f "$filePath" "$destinationDirPath/" + done +} + +# Exit code constants +readonly EXIT_CODE_SUCCESS=0 # Script ran normally. +readonly EXIT_CODE_EXCEPTION=1 # Script exited because something exceptional happened (e.g. bad arguments, Ctrl-C interrupt). +readonly EXIT_CODE_TEST_FAILURE=2 # Script completed successfully, but one or more tests failed. + +# Argument variables +testRootDir= +testNativeBinDir= +coreOverlayDir= +coreClrBinDir= +mscorlibDir= +coreFxBinDir= +coreFxNativeBinDir= + +for i in "$@" +do + case $i in + -h|--help) + print_usage + exit $EXIT_CODE_SUCCESS + ;; + --testRootDir=*) + testRootDir=${i#*=} + ;; + --testNativeBinDir=*) + testNativeBinDir=${i#*=} + ;; + --coreOverlayDir=*) + coreOverlayDir=${i#*=} + ;; + --coreClrBinDir=*) + coreClrBinDir=${i#*=} + ;; + --mscorlibDir=*) + mscorlibDir=${i#*=} + ;; + --coreFxBinDir=*) + coreFxBinDir=${i#*=} + ;; + --coreFxNativeBinDir=*) + coreFxNativeBinDir=${i#*=} + ;; + *) + echo "Unknown switch: $i" + print_usage + exit $EXIT_CODE_SUCCESS + ;; + esac +done + +if [ -z "$testRootDir" ]; then + echo "--testRootDir is required." + print_usage + exit $EXIT_CODE_EXCEPTION +fi +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 +fi +if [ -d "$mscorlibDir" ] && [ -d "$mscorlibDir/bin" ]; then + cp $mscorlibDir/bin/* $mscorlibDir +fi + +create_core_overlay +precompile_overlay_assemblies +copy_test_native_bin_to_test_root + +cd $CORE_ROOT + +DO_SETUP=TRUE + +if [ ${DO_SETUP} == "TRUE" ]; then + +cp /home/ddcloud/git/coreclr/packages/Microsoft.DotNet.xunit.performance.runner.cli/1.0.0-alpha-build0035/lib/netstandard1.3/Microsoft.DotNet.xunit.performance.runner.cli.dll . + +cp /home/ddcloud/git/coreclr/packages/Microsoft.DotNet.xunit.performance.run.core/1.0.0-alpha-build0035/lib/dotnet/*.dll . + +fi + +tests=($(find ~/test/Windows_NT.x64.Release/JIT/Performance/CodeQuality -name '*.exe')) + +for testcase in ${tests[@]}; do + +test=$(basename $testcase) +testname=$(basename $testcase .exe) +echo "....Running $testname" + +cp $testcase . + +./corerun Microsoft.DotNet.xunit.performance.runner.cli.dll $test -runner xunit.console.netcore.exe -runnerhost ./corerun -verbose -runid perf-$testname + +done diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.il b/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.il new file mode 100644 index 0000000000..497cf6c671 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.il @@ -0,0 +1,99 @@ +// 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 legacy library mscorlib {} +.assembly extern System.Console +{ + .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) + .ver 4:0:0:0 +} +.assembly initblk.exe{} + +.class public sealed Foo + extends [mscorlib]System.ValueType +{ + .field public int64 i1 + .field public int64 i2 + .field public int64 i3 + .field public uint8 b +} + +.class DevDiv_255263 { + + +// .data d = int32(0x00000000) + .field static valuetype Foo f + .field static float64 d + +//------------------------- +// Entry point - Main +//------------------------- +.method static int32 Main(class [mscorlib]System.String[]) +{ +.entrypoint + .maxstack 10 + .locals init (class [mscorlib]System.Random V_0, + float64 V_1, + float64 V_2, + int32 V_3) + + // Get some floating point values and keep them live to avoid + // ymm0 being available. + newobj instance void [mscorlib]System.Random::.ctor() + stloc.0 + ldloc.0 + callvirt instance float64 [mscorlib]System.Random::NextDouble() + stloc.1 + ldloc.0 + callvirt instance float64 [mscorlib]System.Random::NextDouble() + stloc.2 + + // -- init 25 bytes of memory to 0xAA + ldsflda valuetype Foo DevDiv_255263::f + ldc.i4 0xAA + ldc.i4 25 + unaligned. 0x1 + initblk + + // Now use the floating point values. + ldloc.1 + ldloc.2 + add + stsfld float64 DevDiv_255263::d + ldc.i4.s 100 + stloc.3 + + // -- load the 25 bytes of memory _and be sure they are all 0xAA + ldsflda valuetype Foo DevDiv_255263::f + ldfld int64 Foo::i1 + ldc.i8 0xAAAAAAAAAAAAAAAA + ceq + brfalse FAIL + + ldsflda valuetype Foo DevDiv_255263::f + ldfld int64 Foo::i2 + ldc.i8 0xAAAAAAAAAAAAAAAA + ceq + brfalse FAIL + ldsflda valuetype Foo DevDiv_255263::f + ldfld int64 Foo::i3 + ldc.i8 0xAAAAAAAAAAAAAAAA + ceq + brfalse FAIL + ldsflda valuetype Foo DevDiv_255263::f + ldfld uint8 Foo::b + ldc.i4 0x000000AA + ceq + brfalse FAIL + +//---------------- +PASS: + ldc.i4 0x64 + ret +//---------------- +FAIL: + ldc.i4 0xFFFFFFFF + ret +} +} diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.ilproj new file mode 100644 index 0000000000..bba6f00954 --- /dev/null +++ b/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.ilproj @@ -0,0 +1,41 @@ +<?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>None</DebugType> + <Optimize>True</Optimize> + </PropertyGroup> + <ItemGroup> + <Compile Include="DevDiv_255263.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> |