From e7660e3226527166352aa7999ae1ed853a9c4868 Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Mon, 20 Nov 2017 17:18:01 -0800 Subject: [PATCH] Make RyuJIT/arm32 the default arm32 JIT RyuJIT/arm32 JIT is now named clrjit.dll (was named protojit.dll). arm32 LEGACY_BACKEND JIT is now named legacyjit.dll (was named clrjit.dll). Ubuntu and Tizen testing now use RyuJIT/arm32. Tests failing for legacy backend are now excluded with `LEGACYJIT_JITSTRESS_FAIL`, `LEGACYJIT_GCSTRESS_FAIL`, and `LEGACYJIT_FAIL`. --- build.cmd | 17 ++++--- crosscomponents.cmake | 2 +- netci.groovy | 95 +++++++++++++++++++-------------------- src/jit/CMakeLists.txt | 4 +- src/jit/legacyjit/CMakeLists.txt | 2 +- src/jit/standalone/CMakeLists.txt | 4 -- tests/arm/Tests.lst | 76 +++++++++++++++---------------- 7 files changed, 99 insertions(+), 101 deletions(-) diff --git a/build.cmd b/build.cmd index f8bd8f4..15e7cf3 100644 --- a/build.cmd +++ b/build.cmd @@ -139,7 +139,7 @@ set __BuildTests=1 set __BuildPackages=1 set __BuildNativeCoreLib=1 set __RestoreOptData=1 -set __AltJitCrossgen=0 +set __CrossgenAltJit= @REM CMD has a nasty habit of eating "=" on the argument list, so passing: @REM -priority=1 @@ -207,7 +207,10 @@ if /i "%1" == "-enforcepgo" (set __EnforcePgo=1&set processedArgs=!proc if /i "%1" == "-nopgooptimize" (set __PgoOptimize=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-ibcinstrument" (set __IbcTuning=/Tuning&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-toolset_dir" (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) -if /i "%1" == "-altjitcrossgen" (set __AltJitCrossgen=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "-crossgenaltjit" (set __CrossgenAltJit=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) + +REM Temporarily eat old -altjitcrossgen flag until CI system is updated. +if /i "%1" == "-altjitcrossgen" (set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) REM TODO these are deprecated remove them eventually REM don't add more, use the - syntax instead @@ -629,14 +632,14 @@ if %__BuildNativeCoreLib% EQU 1 ( REM End HACK ) - if %__AltJitCrossgen% EQU 1 ( + if defined __CrossgenAltJit ( REM Set altjit flags for the crossgen run. Note that this entire crossgen section is within a setlocal/endlocal scope, REM so we don't need to save or unset these afterwards. - echo %__MsgPrefix%Setting altjit environment variables. - echo %__MsgPrefix%Setting altjit environment variables. >> "%__CrossGenCoreLibLog%" + echo %__MsgPrefix%Setting altjit environment variables for %__CrossgenAltJit%. + echo %__MsgPrefix%Setting altjit environment variables for %__CrossgenAltJit%. >> "%__CrossGenCoreLibLog%" set COMPlus_AltJit=* set COMPlus_AltJitNgen=* - set COMPlus_AltJitName=protojit.dll + set COMPlus_AltJitName=%__CrossgenAltJit% set COMPlus_AltJitAssertOnNYI=1 set COMPlus_NoGuiOnAssert=1 set COMPlus_ContinueOnAssert=0 @@ -856,7 +859,7 @@ echo -disableoss: Disable Open Source Signing for System.Private.CoreLib. echo -priority=^ : specify a set of test that will be built and run, with priority N. echo -officialbuildid=^: specify the official build ID to be used by this build. echo -Rebuild: passes /t:rebuild to the build projects. -echo -altjitcrossgen: run crossgen using altjit ^(used for JIT testing^). +echo -crossgenaltjit ^: run crossgen using specified altjit ^(used for JIT testing^). echo portable : build for portable RID. echo. echo If "all" is specified, then all build architectures and types are built. If, in addition, diff --git a/crosscomponents.cmake b/crosscomponents.cmake index 1e386dc..f68587d 100644 --- a/crosscomponents.cmake +++ b/crosscomponents.cmake @@ -3,7 +3,7 @@ add_definitions(-DCROSS_COMPILE) set (CLR_CROSS_COMPONENTS_LIST crossgen clrjit - protojit + legacyjit ) if(NOT CLR_CMAKE_PLATFORM_LINUX) diff --git a/netci.groovy b/netci.groovy index 28b0c38..a4aedd3 100755 --- a/netci.groovy +++ b/netci.groovy @@ -596,9 +596,6 @@ def static getJobName(def configuration, def architecture, def os, def scenario, } break case 'arm': - baseName = architecture.toLowerCase() + '_cross_' + configuration.toLowerCase() + '_' + os.toLowerCase() - break - case 'armlb': // These are cross builds if (os == 'Tizen') { // ABI: softfp @@ -608,6 +605,9 @@ def static getJobName(def configuration, def architecture, def os, def scenario, baseName = architecture.toLowerCase() + '_cross_' + configuration.toLowerCase() + '_' + os.toLowerCase() } break + case 'armlb': + baseName = architecture.toLowerCase() + '_cross_' + configuration.toLowerCase() + '_' + os.toLowerCase() + break case 'x86': case 'x86_arm_altjit': case 'x64_arm64_altjit': @@ -1138,42 +1138,43 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os, switch (os) { case 'Ubuntu': case 'Ubuntu16.04': - if (architecture == 'armlb') { // Ubuntu arm is only for armlb currently - assert scenario == 'default' - job.with { - publishers { - azureVMAgentPostBuildAction { - agentPostBuildAction('Delete agent if the build was not successful (when idle).') - } + if (architecture == 'armlb') { // No arm legacy backend testing for Ubuntu + break + } + assert scenario == 'default' + job.with { + publishers { + azureVMAgentPostBuildAction { + agentPostBuildAction('Delete agent if the build was not successful (when idle).') } } - if ((os == 'Ubuntu' && configuration == 'Debug') || (os == 'Ubuntu16.04' && configuration == 'Debug')) { - Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Innerloop Build") - } - else { - Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Build", + } + if (configuration == 'Debug') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Innerloop Build") + } + else { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Build", "(?i).*test\\W+${os}\\W+${architecture}\\W+Cross\\W+${configuration}\\W+Build.*") - } } break case 'Tizen': - if (architecture == 'armlb') { // Tizen armel is only for armlb currently - architecture='armel' - job.with { - publishers { - azureVMAgentPostBuildAction { - agentPostBuildAction('Delete agent if the build was not successful (when idle).') - } + if (architecture == 'armlb') { // No arm legacy backend testing for Tizen armel + break + } + architecture='armel' + job.with { + publishers { + azureVMAgentPostBuildAction { + agentPostBuildAction('Delete agent if the build was not successful (when idle).') } } - // Removing the regex will cause this to run on each PR. - if (configuration == 'Checked') { - Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Innerloop Build and Test") - } - else { - Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Build", + } + if (configuration == 'Checked') { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Innerloop Build and Test") + } + else { + Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Build", "(?i).*test\\W+${os}\\W+${architecture}\\W+Cross\\W+${configuration}\\W+Build.*") - } } break case 'Windows_NT': @@ -1637,11 +1638,11 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR def buildArchitecture = 'arm' - // For 'arm' (the RyuJIT/arm32 architecture), tell build.cmd to use RyuJIT/arm32 for crossgen compilation. - // RyuJIT/arm32 is currently not the default JIT; it is an aljit. So, this is a special case. + // For 'armlb' (the JIT LEGACY_BACKEND architecture for arm), tell build.cmd to use legacy backend for crossgen compilation. + // Legacy backend is not the default JIT; it is an aljit. So, this is a special case. def armCrossgenOpt = '' - if (architecture == 'arm') { - armCrossgenOpt = '-altjitcrossgen' + if (architecture == 'armlb') { + armCrossgenOpt = '-crossgenaltjit legacyjit.dll' } // Hack: build pri1 tests for arm/armlb/arm64 build job, until we have separate pri0 and pri1 builds for the flow job to use. @@ -1775,7 +1776,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR Utilities.addArchival(newJob, "bin/Product/**,bin/obj/*/tests/**/*.dylib,bin/obj/*/tests/**/*.so", "bin/Product/**/.nuget/**") } break - case 'armlb': + case 'arm': // Cross builds for ARM runs on Ubuntu, Ubuntu16.04 and Tizen currently assert (os == 'Ubuntu') || (os == 'Ubuntu16.04') || (os == 'Tizen') @@ -1847,8 +1848,8 @@ Constants.allScenarios.each { scenario -> os = 'Windows_NT' } - // Tizen is only supported for arm legacy_backend architecture - if (os == 'Tizen' && architecture != 'armlb') { + // Tizen is only supported for arm architecture + if (os == 'Tizen' && architecture != 'arm') { return } @@ -1864,12 +1865,12 @@ Constants.allScenarios.each { scenario -> return } break - case 'armlb': + case 'arm': if ((os != 'Ubuntu') && (os != 'Ubuntu16.04') && (os != 'Tizen') && (os != 'Windows_NT')) { return } break - case 'arm': + case 'armlb': if (os != 'Windows_NT') { return } @@ -2077,7 +2078,7 @@ Constants.allScenarios.each { scenario -> } else { // Setup corefx and Windows test binaries for Linux cross build for ubuntu-arm, ubuntu16.04-arm and tizen-armel - if ( architecture == 'armlb' && ( os == 'Ubuntu' || os == 'Ubuntu16.04' || os == 'Tizen')) { + if ( architecture == 'arm' && ( os == 'Ubuntu' || os == 'Ubuntu16.04' || os == 'Tizen')) { // Cross build for ubuntu-arm, ubuntu16.04-arm and tizen-armel // Define the Windows Tests and Corefx build job names def WindowTestsName = projectFolder + '/' + @@ -2549,13 +2550,11 @@ Constants.allScenarios.each { scenario -> addEnvVariable("COMPlus_NoGuiOnAssert", "1") addEnvVariable("COMPlus_ContinueOnAssert", "0") - // Arm(32) ryujit - if (architecture == "arm") { - // **This is an AltJit** - + // ARM legacy backend; this is an altjit. + if (architecture == "armlb") { addEnvVariable("COMPlus_AltJit", "*") addEnvVariable("COMPlus_AltJitNgen", "*") - addEnvVariable("COMPlus_AltJitName", "protojit.dll") + addEnvVariable("COMPlus_AltJitName", "legacyjit.dll") addEnvVariable("COMPlus_AltJitAssertOnNYI", "1") } @@ -2582,10 +2581,10 @@ Constants.allScenarios.each { scenario -> def addSmartyFlag = { flag -> smartyCommand += flag + " "} def addExclude = { exclude -> addSmartyFlag("/exc " + exclude)} - def addArchSpecificExclude = { architectureToExclude, exclude -> if (architectureToExclude == "arm") { addExclude("PROTOJIT_" + exclude) } else { addExclude(exclude) } } + def addArchSpecificExclude = { architectureToExclude, exclude -> if (architectureToExclude == "armlb") { addExclude("LEGACYJIT_" + exclude) } else { addExclude(exclude) } } - if (architecture == "arm") { - addExclude("PROTOJIT_FAIL") + if (architecture == "armlb") { + addExclude("LEGACYJIT_FAIL") } if (isJitStressScenario(scenario) || isR2RStressScenario(scenario)) { diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt index 6ce89c8..4755053 100644 --- a/src/jit/CMakeLists.txt +++ b/src/jit/CMakeLists.txt @@ -259,8 +259,8 @@ endif (FEATURE_MERGE_JIT_AND_ENGINE) add_subdirectory(standalone) if (CLR_CMAKE_TARGET_ARCH_ARM) - # Build RyuJIT/arm32 protojit to run on both x86 host (crossgen build) and arm host (native). - add_subdirectory(protojit) + # Build arm32 legacy_backend to run on both x86 host (crossgen build) and arm host (native). + add_subdirectory(legacyjit) endif (CLR_CMAKE_TARGET_ARCH_ARM) if (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_AMD64) diff --git a/src/jit/legacyjit/CMakeLists.txt b/src/jit/legacyjit/CMakeLists.txt index 4a14d0f..8bf2a1d 100644 --- a/src/jit/legacyjit/CMakeLists.txt +++ b/src/jit/legacyjit/CMakeLists.txt @@ -62,4 +62,4 @@ target_link_libraries(legacyjit ) # add the install targets -install_clr(legacyjit) \ No newline at end of file +install_clr(legacyjit) diff --git a/src/jit/standalone/CMakeLists.txt b/src/jit/standalone/CMakeLists.txt index 3111b03..5f32d49 100644 --- a/src/jit/standalone/CMakeLists.txt +++ b/src/jit/standalone/CMakeLists.txt @@ -8,10 +8,6 @@ if(FEATURE_READYTORUN) add_definitions(-DFEATURE_READYTORUN_COMPILER) endif(FEATURE_READYTORUN) -if(CLR_CMAKE_TARGET_ARCH_ARM) - add_definitions(-DLEGACY_BACKEND) -endif() - if(WIN32) add_definitions(-DFX_VER_INTERNALNAME_STR=clrjit.dll) endif(WIN32) diff --git a/tests/arm/Tests.lst b/tests/arm/Tests.lst index 34d57df..06404a9 100644 --- a/tests/arm/Tests.lst +++ b/tests/arm/Tests.lst @@ -625,7 +625,7 @@ RelativePath=readytorun\tests\mainv1\mainv1.cmd WorkingDir=readytorun\tests\mainv1 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;PROTOJIT_JITSTRESS_FAIL;15150 +Categories=EXPECTED_PASS;JITSTRESS_FAIL;15150 HostStyle=0 [ComparerCompare2.cmd_80] @@ -881,7 +881,7 @@ RelativePath=GC\Scenarios\DoublinkList\dlstack\dlstack.cmd WorkingDir=GC\Scenarios\DoublinkList\dlstack Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;PROTOJIT_JITSTRESS_FAIL;15156 +Categories=EXPECTED_PASS;JITSTRESS_FAIL;15156 HostStyle=0 [Generated1222.cmd_112] @@ -2729,7 +2729,7 @@ RelativePath=baseservices\compilerservices\dynamicobjectproperties\test448035\te WorkingDir=baseservices\compilerservices\dynamicobjectproperties\test448035 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [ldc_conv_ovf_u4_u2.cmd_343] @@ -5177,7 +5177,7 @@ RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\UserExceptionThread\U WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\UserExceptionThread Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [thread22.cmd_651] @@ -14353,7 +14353,7 @@ RelativePath=baseservices\threading\mutex\abandonedmutex\am07abandonmultiplemute WorkingDir=baseservices\threading\mutex\abandonedmutex\am07abandonmultiplemutex Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [MathFIEEERemainder.cmd_1805] @@ -15169,7 +15169,7 @@ RelativePath=Loader\classloader\regressions\523654\test532654_b\test532654_b.cmd WorkingDir=Loader\classloader\regressions\523654\test532654_b Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203 HostStyle=0 [Generated501.cmd_1908] @@ -15497,7 +15497,7 @@ RelativePath=GC\Features\Finalizer\finalizeother\finalizearraysleep\finalizearra WorkingDir=GC\Features\Finalizer\finalizeother\finalizearraysleep Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;JITSTRESS_FAIL;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_JITSTRESS_FAIL;Pri1 HostStyle=0 [_il_dbgindcall.cmd_1949] @@ -20129,7 +20129,7 @@ RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_r8\_il_relrefloc_r8.cmd WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_r8 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203 HostStyle=0 [RuntimeMethodHanldeGetHashCode.cmd_2529] @@ -24601,7 +24601,7 @@ RelativePath=baseservices\threading\waithandle\waitall\waitallex9\waitallex9.cmd WorkingDir=baseservices\threading\waithandle\waitall\waitallex9 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [float_cs_ro.cmd_3090] @@ -25417,7 +25417,7 @@ RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\HandlerException\Hand WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\HandlerException Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13206;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13206;Pri1 HostStyle=0 [bool_cs_d.cmd_3192] @@ -30313,7 +30313,7 @@ RelativePath=JIT\Directed\lifetime\lifetime1\lifetime1.cmd WorkingDir=JIT\Directed\lifetime\lifetime1 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13200;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13200;13203;Pri1 HostStyle=0 [castclass-interface003.cmd_3807] @@ -32281,7 +32281,7 @@ RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_i1\_il_relrefloc_i1.cmd WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_i1 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [b16423.cmd_4054] @@ -32337,7 +32337,7 @@ RelativePath=baseservices\threading\waithandle\waitone\waitoneex3a\waitoneex3a.c WorkingDir=baseservices\threading\waithandle\waitone\waitoneex3a Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [waitallex7a.cmd_4061] @@ -32353,7 +32353,7 @@ RelativePath=baseservices\threading\coverage\Nullref\CS_MRENullRefEx\CS_MRENullR WorkingDir=baseservices\threading\coverage\Nullref\CS_MRENullRefEx Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [Generated741.cmd_4063] @@ -35105,7 +35105,7 @@ RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\ExternalException\Ext WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\ExternalException Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [ConvertToString6.cmd_4407] @@ -40377,7 +40377,7 @@ RelativePath=baseservices\threading\waithandle\waitany\waitanyex10a\waitanyex10a WorkingDir=baseservices\threading\waithandle\waitany\waitanyex10a Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13207;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13207;Pri1 HostStyle=0 [Generated248.cmd_5066] @@ -44025,7 +44025,7 @@ RelativePath=JIT\Directed\tailcall\tailcall\tailcall.cmd WorkingDir=JIT\Directed\tailcall\tailcall Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;13604;GCSTRESS_FAIL;13200 +Categories=EXPECTED_FAIL;13604;LEGACYJIT_GCSTRESS_FAIL;13200 HostStyle=0 [b47093.cmd_5523] @@ -44065,7 +44065,7 @@ RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\MultipleException\Mul WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\MultipleException Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [Generated1448.cmd_5528] @@ -44265,7 +44265,7 @@ RelativePath=baseservices\threading\waithandle\waitall\waitallex8a\waitallex8a.c WorkingDir=baseservices\threading\waithandle\waitall\waitallex8a Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [cgt_u.cmd_5553] @@ -45489,7 +45489,7 @@ RelativePath=baseservices\threading\mutex\openexisting\openmutexpos4\openmutexpo WorkingDir=baseservices\threading\mutex\openexisting\openmutexpos4 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13201;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13201;Pri1 HostStyle=0 [hasvalue_d.cmd_5708] @@ -47217,7 +47217,7 @@ RelativePath=baseservices\threading\regressions\269336\objmonhelper\objmonhelper WorkingDir=baseservices\threading\regressions\269336\objmonhelper Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13200;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13200;Pri1 HostStyle=0 [ConvertToByte1.cmd_5925] @@ -50497,7 +50497,7 @@ RelativePath=baseservices\threading\generics\Monitor\EnterExit13\EnterExit13.cmd WorkingDir=baseservices\threading\generics\Monitor\EnterExit13 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13205;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13205;Pri1 HostStyle=0 [GThread10.cmd_6336] @@ -56161,7 +56161,7 @@ RelativePath=baseservices\threading\threadstatic\threadstatic07\threadstatic07.c WorkingDir=baseservices\threading\threadstatic\threadstatic07 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13204;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13204;Pri1 HostStyle=0 [convr8a_cs_ro.cmd_7049] @@ -57689,7 +57689,7 @@ RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1353\Generat WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1353\Generated1353 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [lclfldmul_cs_ro.cmd_7240] @@ -65417,7 +65417,7 @@ RelativePath=GC\Scenarios\LeakWheel\leakwheel\leakwheel.cmd WorkingDir=GC\Scenarios\LeakWheel\leakwheel Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;JITSTRESS_FAIL +Categories=EXPECTED_PASS;LEGACYJIT_JITSTRESS_FAIL HostStyle=0 [GCSimulator_280.cmd_8209] @@ -66425,7 +66425,7 @@ RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10827\b10827\b10827.cmd WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10827\b10827 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203 HostStyle=0 [istype.cmd_8335] @@ -67513,7 +67513,7 @@ RelativePath=GC\Scenarios\DoublinkList\doublinkstay\doublinkstay.cmd WorkingDir=GC\Scenarios\DoublinkList\doublinkstay Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;JITSTRESS_FAIL +Categories=EXPECTED_PASS;LEGACYJIT_JITSTRESS_FAIL HostStyle=0 [b57516.cmd_8471] @@ -69153,7 +69153,7 @@ RelativePath=GC\Scenarios\DoublinkList\doublinkgen\doublinkgen.cmd WorkingDir=GC\Scenarios\DoublinkList\doublinkgen Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;JITSTRESS_FAIL +Categories=EXPECTED_PASS;LEGACYJIT_JITSTRESS_FAIL HostStyle=0 [ConvertToString15.cmd_8676] @@ -70201,7 +70201,7 @@ RelativePath=GC\API\GCHandle\HandleCopy\HandleCopy.cmd WorkingDir=GC\API\GCHandle\HandleCopy Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;JITSTRESS_FAIL;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_JITSTRESS_FAIL;Pri1 HostStyle=0 [Dup_ro.cmd_8809] @@ -72857,7 +72857,7 @@ RelativePath=baseservices\threading\generics\Monitor\TryEnter05\TryEnter05.cmd WorkingDir=baseservices\threading\generics\Monitor\TryEnter05 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [MathAtan.cmd_9141] @@ -74609,7 +74609,7 @@ RelativePath=baseservices\exceptions\regressions\Dev11\154243\dynamicmethodliven WorkingDir=baseservices\exceptions\regressions\Dev11\154243\dynamicmethodliveness Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13204;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13204;Pri1 HostStyle=0 [GCSimulator_247.cmd_9361] @@ -77097,7 +77097,7 @@ RelativePath=JIT\Directed\lifetime\lifetime2\lifetime2.cmd WorkingDir=JIT\Directed\lifetime\lifetime2 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13207;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13207;Pri1 HostStyle=0 [_il_dbgcatchfinally_ind.cmd_9677] @@ -77193,7 +77193,7 @@ RelativePath=baseservices\threading\interlocked\exchange\exchange1_cti\exchange1 WorkingDir=baseservices\threading\interlocked\exchange\exchange1_cti Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13204;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13204;Pri1 HostStyle=0 [494226.cmd_9689] @@ -81785,7 +81785,7 @@ RelativePath=GC\API\GC\KeepAliveNull\KeepAliveNull.cmd WorkingDir=GC\API\GC\KeepAliveNull Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;JITSTRESS_FAIL;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_JITSTRESS_FAIL;Pri1 HostStyle=0 [starg_r4.cmd_10267] @@ -82089,7 +82089,7 @@ RelativePath=baseservices\threading\regressions\beta2\437044\437044.cmd WorkingDir=baseservices\threading\regressions\beta2\437044 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13201;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13201;Pri1 HostStyle=0 [KeyCollectionCtor.cmd_10305] @@ -85153,7 +85153,7 @@ RelativePath=readytorun\tests\mainv2\mainv2.cmd WorkingDir=readytorun\tests\mainv2 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;PROTOJIT_JITSTRESS_FAIL;15150 +Categories=EXPECTED_PASS;JITSTRESS_FAIL;15150 HostStyle=0 [Generated1463.cmd_10690] @@ -85265,7 +85265,7 @@ RelativePath=baseservices\threading\generics\Monitor\EnterExit05\EnterExit05.cmd WorkingDir=baseservices\threading\generics\Monitor\EnterExit05 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203;Pri1 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203;Pri1 HostStyle=0 [5w1d-06_cs_d.cmd_10704] @@ -86729,7 +86729,7 @@ RelativePath=JIT\Methodical\explicit\basic\_il_relrefarg_i1\_il_relrefarg_i1.cmd WorkingDir=JIT\Methodical\explicit\basic\_il_relrefarg_i1 Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;GCSTRESS_FAIL;13203 +Categories=EXPECTED_PASS;LEGACYJIT_GCSTRESS_FAIL;13203 HostStyle=0 [b16054.cmd_10888] -- 2.7.4