From 809e60e73c5a94c41e2d2ac6ea51715ff66ea629 Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Mon, 20 Nov 2017 16:23:22 -0800 Subject: [PATCH] Remove x86 legacy_backend build and CI testing --- netci.groovy | 44 ++++------------------------------------- perf.groovy | 19 +----------------- src/jit/CMakeLists.txt | 1 - tests/legacyjit_x86_testenv.cmd | 11 ----------- 4 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 tests/legacyjit_x86_testenv.cmd diff --git a/netci.groovy b/netci.groovy index b36861c..59c296f 100755 --- a/netci.groovy +++ b/netci.groovy @@ -247,7 +247,7 @@ class Constants { def static configurationList = ['Debug', 'Checked', 'Release'] // This is the set of architectures - def static architectureList = ['arm', 'armlb', 'x86_arm_altjit', 'x64_arm64_altjit', 'arm64', 'x64', 'x86', 'x86lb'] + def static architectureList = ['arm', 'armlb', 'x86_arm_altjit', 'x64_arm64_altjit', 'arm64', 'x64', 'x86'] } def static setMachineAffinity(def job, def os, def architecture, def options = null) { @@ -555,7 +555,6 @@ def static getJobName(def configuration, def architecture, def os, def scenario, } break case 'x86': - case 'x86lb': case 'x86_arm_altjit': case 'x64_arm64_altjit': baseName = architecture.toLowerCase() + '_' + configuration.toLowerCase() + '_' + os.toLowerCase() @@ -577,7 +576,6 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def switch (architecture) { case 'x64': case 'x86': - case 'x86lb': if (architecture == 'x86' && os == 'Ubuntu') { Utilities.addPeriodicTrigger(job, '@daily') } @@ -618,7 +616,7 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def } } // For x86, only add per-commit jobs for Windows - else if (architecture == 'x86' || architecture == 'x86lb') { + else if (architecture == 'x86') { if (os == 'Windows_NT') { Utilities.addGithubPushTrigger(job) } @@ -1310,25 +1308,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os, } break // editor brace matching: } - case 'x86lb': // editor brace matching: { - assert (os == 'Windows_NT') - - def arch = 'x86' - def jit = 'legacy_backend' - switch (scenario) { - case 'default': - if (configuration == 'Checked') { - Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test", - "(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+Build and Test.*") - } - break - default: - println("Unknown scenario: ${os} ${arch} ${jit} ${scenario}"); - assert false - break - } - break - // editor brace matching: } case 'x64_arm64_altjit': case 'x86_arm_altjit': // editor brace matching: { assert (os == 'Windows_NT') @@ -1369,12 +1348,11 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR switch (architecture) { case 'x64': case 'x86': - case 'x86lb': case 'x86_arm_altjit': case 'x64_arm64_altjit': def arch = architecture def buildOpts = '' - if ((architecture == 'x86lb') || (architecture == 'x86_arm_altjit')) { + if (architecture == 'x86_arm_altjit') { arch = 'x86' } else if (architecture == 'x64_arm64_altjit') { @@ -1394,7 +1372,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR // If it is a release build for windows, ensure PGO is used, else fail the build if ((lowerConfiguration == 'release') && (scenario in Constants.basicScenarios) && - (architecture != 'x86lb') && (architecture != 'x86_arm_altjit') && (architecture != 'x64_arm64_altjit')) { @@ -1495,10 +1472,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR def buildCommandsStr = '' envScriptPath = "%WORKSPACE%\\SetStressModes.bat" buildCommandsStr += genStressModeScriptStep(os, scenario, Constants.jitStressModeScenarios[scenario], envScriptPath) - if (architecture == 'x86lb') { - buildCommandsStr += appendStressModeScriptStep(os, "%WORKSPACE%\\tests\\legacyjit_x86_testenv.cmd", envScriptPath) - } - else if (architecture == 'x86_arm_altjit') { + if (architecture == 'x86_arm_altjit') { buildCommandsStr += appendStressModeScriptStep(os, "%WORKSPACE%\\tests\\x86_arm_altjit.cmd", envScriptPath) } else if (architecture == 'x64_arm64_altjit') { @@ -1510,9 +1484,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR // into a single script. buildCommands += buildCommandsStr } - else if (architecture == 'x86lb') { - envScriptPath = "%WORKSPACE%\\tests\\legacyjit_x86_testenv.cmd" - } else if (architecture == 'x86_arm_altjit') { envScriptPath = "%WORKSPACE%\\tests\\x86_arm_altjit.cmd" } @@ -1844,7 +1815,6 @@ Constants.allScenarios.each { scenario -> return } break - case 'x86lb': case 'x86_arm_altjit': case 'x64_arm64_altjit': if (os != 'Windows_NT') { @@ -1888,7 +1858,6 @@ Constants.allScenarios.each { scenario -> default: // arm, arm64, armlb: stress is handled through flow jobs. - // x86lb: No stress modes for legacy jit. (There's no technical reason we couldn't allow these.) return } } @@ -2009,11 +1978,6 @@ Constants.allScenarios.each { scenario -> break } - // Only implement 'default' for x86lb. - if ((architecture == 'x86lb') && (scenario != 'default')) { - return - } - // Calculate names def lowerConfiguration = configuration.toLowerCase() def jobName = getJobName(configuration, architecture, os, scenario, isBuildOnly) diff --git a/perf.groovy b/perf.groovy index 7046e5b..dede228 100644 --- a/perf.groovy +++ b/perf.groovy @@ -30,20 +30,12 @@ def static getOSGroup(def os) { ['Windows_NT'].each { os -> ['x64', 'x86'].each { arch -> ['ryujit'].each { jit -> - if (arch == 'x64' && jit == 'legacy_backend') { - return - } - ['full_opt', 'min_opt'].each { opt_level -> def architecture = arch def jobName = "perf_perflab_${os}_${arch}_${opt_level}_${jit}" def testEnv = "" - if (jit == 'legacy_backend') { - testEnv = '-testEnv %WORKSPACE%\\tests\\legacyjit_x86_testenv.cmd' - } - def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { // Set the label. label('windows_server_2016_clr_perf') @@ -155,17 +147,8 @@ def static getOSGroup(def os) { [true, false].each { isPR -> ['Windows_NT'].each { os -> ['x64', 'x86'].each { arch -> - ['ryujit', 'legacy_backend'].each { jit -> + ['ryujit'].each { jit -> [true, false].each { pgo_optimized -> - if (arch == 'x64' && jit == 'legacy_backend') { - return - } - - // pgo not supported for legacy_backend - if (pgo_optimized && jit == 'legacy_backend') { - return - } - ['full_opt', 'min_opt'].each { opt_level -> def architecture = arch diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt index 9bf5503..6e295fa 100644 --- a/src/jit/CMakeLists.txt +++ b/src/jit/CMakeLists.txt @@ -277,7 +277,6 @@ if ((CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_AMD64) AND WIN32) endif () if (CLR_CMAKE_PLATFORM_ARCH_I386 AND WIN32) - add_subdirectory(legacyjit) # On Windows x86, build altjit generating Windows/ARM32 code using LEGACY_BACKEND. # (Note: we could also create linuxlegacynonjit for generating Linux/ARM32 code using LEGACY_BACKEND, if needed.) add_subdirectory(legacynonjit) diff --git a/tests/legacyjit_x86_testenv.cmd b/tests/legacyjit_x86_testenv.cmd deleted file mode 100644 index 053bd16..0000000 --- a/tests/legacyjit_x86_testenv.cmd +++ /dev/null @@ -1,11 +0,0 @@ -@REM ------------------------------------------------------------------------- -@REM -@REM This script provides x86 Legacy JIT test environment settings -@REM -@REM ------------------------------------------------------------------------- - -set COMPLUS_AltJit=* -set COMPLUS_AltJitNgen=* -set COMPLUS_AltJitName=legacyjit.dll -set COMPLUS_NoGuiOnAssert=1 -set COMPLUS_AltJitAssertOnNYI=1 -- 2.7.4