Avoid using register x8 as it will be used as the RetBuf argument in the future

Placed usage of REG_SPILL_CHOICE under LEGACY_BACKEND and removed them for RyuJit only targets
Moved REG_R8 for ARM64 to later in the REG_VAR_ORDER
Change the definition of REG_PINVOKE_ registers to avoid using REG_R8
Change the definition of REG_TMP_0 and REG_TMP_1 to avoid using REG_R8
 the REG_TMP defines are only used in one place: CodeGen::genEmitGSCookieCheck

Commit migrated from https://github.com/dotnet/coreclr/commit/95f4e6c3a2954be99ae090eb264daf2ee757005b

diff --git a/src/coreclr/src/jit/target.h b/src/coreclr/src/jit/target.h
index a788b8a..0afdd9b 100644 (file)
--- a/src/coreclr/src/jit/target.h
+++ b/src/coreclr/src/jit/target.h
@@ -595,8 +595,10 @@ typedef unsigned short          regPairNoSmall; // arm: need 12 bits
   #define REG_PINVOKE_SCRATCH      REG_EAX
   #define RBM_PINVOKE_SCRATCH      RBM_EAX
 
+#ifdef LEGACY_BACKEND
   #define REG_SPILL_CHOICE         REG_EAX
   #define RBM_SPILL_CHOICE         RBM_EAX
+#endif // LEGACY_BACKEND
 
   // The following defines are useful for iterating a regNumber
   #define REG_FIRST                REG_EAX
@@ -967,9 +969,6 @@ typedef unsigned short          regPairNoSmall; // arm: need 12 bits
   #define REG_PINVOKE_SCRATCH      REG_EAX
   #define RBM_PINVOKE_SCRATCH      RBM_EAX
 
-  #define REG_SPILL_CHOICE         REG_EAX
-  #define RBM_SPILL_CHOICE         RBM_EAX
-
   // The following defines are useful for iterating a regNumber
   #define REG_FIRST                REG_EAX
   #define REG_INT_FIRST            REG_EAX
@@ -1351,10 +1350,12 @@ typedef unsigned short          regPairNoSmall; // arm: need 12 bits
   #define REG_PINVOKE_SCRATCH      REG_R6
   #define RBM_PINVOKE_SCRATCH      RBM_R6
 
+#ifdef LEGACY_BACKEND
   #define REG_SPILL_CHOICE         REG_LR
   #define RBM_SPILL_CHOICE         RBM_LR
   #define REG_SPILL_CHOICE_FLT     REG_F14
   #define RBM_SPILL_CHOICE_FLT    (RBM_F14|RBM_F15)
+#endif // LEGACY_BACKEND
 
   // The following defines are useful for iterating a regNumber
   #define REG_FIRST                REG_R0
@@ -1529,8 +1530,8 @@ typedef unsigned short          regPairNoSmall; // arm: need 12 bits
   #define RBM_ALLFLOAT            (RBM_FLT_CALLEE_SAVED | RBM_FLT_CALLEE_TRASH)
   #define RBM_ALLDOUBLE            RBM_ALLFLOAT
 
-  #define REG_VAR_ORDER            REG_R8,REG_R9,REG_R10,REG_R11,REG_R12,REG_R13,REG_R14,REG_R15,\
-                                   REG_R7,REG_R6,REG_R5,REG_R4,REG_R3,REG_R2,REG_R1,REG_R0,\
+  #define REG_VAR_ORDER            REG_R9,REG_R10,REG_R11,REG_R12,REG_R13,REG_R14,REG_R15,\
+                                   REG_R8,REG_R7,REG_R6,REG_R5,REG_R4,REG_R3,REG_R2,REG_R1,REG_R0,\
                                    REG_R19,REG_R20,REG_R21,REG_R22,REG_R23,REG_R24,REG_R25,REG_R26,REG_R27,REG_R28,\
 
   #define REG_VAR_ORDER_FLT        REG_V16, REG_V17, REG_V18, REG_V19, \
@@ -1559,12 +1560,12 @@ typedef unsigned short          regPairNoSmall; // arm: need 12 bits
   #define REG_L_STK                REG_ZR
 
   //  This is the first register in REG_TMP_ORDER
-  #define REG_TMP_0                REG_R8
-  #define RBM_TMP_0                RBM_R8
+  #define REG_TMP_0                REG_R9
+  #define RBM_TMP_0                RBM_R9
 
   //  This is the second register in REG_TMP_ORDER
-  #define REG_TMP_1                REG_R9
-  #define RBM_TMP_1                RBM_R9
+  #define REG_TMP_1                REG_R10
+  #define RBM_TMP_1                RBM_R10
 
   // register to hold shift amount; no special register is required on ARM64.
   #define REG_SHIFT                REG_NA
@@ -1572,8 +1573,8 @@ typedef unsigned short          regPairNoSmall; // arm: need 12 bits
   #define PREDICT_REG_SHIFT        PREDICT_REG
 
   // This is a general scratch register that does not conflict with the argument registers
-  #define REG_SCRATCH              REG_R8
-  #define RBM_SCRATCH              RBM_R8
+  #define REG_SCRATCH              REG_R9
+  #define RBM_SCRATCH              RBM_R9
 
   // This is a general register that can be optionally reserved for other purposes during codegen
   #define REG_OPT_RSVD             REG_IP1
@@ -1622,18 +1623,13 @@ typedef unsigned short          regPairNoSmall; // arm: need 12 bits
   #define PREDICT_REG_RER_INDIRECT_PARAM  PREDICT_REG_R11
 
   // Registers used by PInvoke frame setup
-  #define REG_PINVOKE_FRAME        REG_R8
-  #define RBM_PINVOKE_FRAME        RBM_R8
-  #define REG_PINVOKE_TCB          REG_R9
-  #define RBM_PINVOKE_TCB          RBM_R9
+  #define REG_PINVOKE_FRAME        REG_R9
+  #define RBM_PINVOKE_FRAME        RBM_R9
+  #define REG_PINVOKE_TCB          REG_R10
+  #define RBM_PINVOKE_TCB          RBM_R10
   #define REG_PINVOKE_SCRATCH      REG_R10
   #define RBM_PINVOKE_SCRATCH      RBM_R10
 
-  #define REG_SPILL_CHOICE         REG_R8
-  #define RBM_SPILL_CHOICE         RBM_R8
-  #define REG_SPILL_CHOICE_FLT     REG_F16
-  #define RBM_SPILL_CHOICE_FLT     RBM_F16
-
   // The following defines are useful for iterating a regNumber
   #define REG_FIRST                REG_R0
   #define REG_INT_FIRST            REG_R0

diff --git a/src/coreclr/tests/arm64/Tests.lst b/src/coreclr/tests/arm64/Tests.lst
index 7405772..a8951e4 100644 (file)
--- a/src/coreclr/tests/arm64/Tests.lst
+++ b/src/coreclr/tests/arm64/Tests.lst
@@ -1250,7 +1250,7 @@ RelativePath=baseservices\threading\generics\Monitor\EnterExit08\EnterExit08.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit08
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS
+Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [EnterExit09.cmd_179]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit09\EnterExit09.cmd
@@ -1278,7 +1278,7 @@ RelativePath=baseservices\threading\generics\Monitor\EnterExit12\EnterExit12.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit12
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS
+Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [EnterExit13.cmd_183]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit13\EnterExit13.cmd
@@ -1292,7 +1292,7 @@ RelativePath=baseservices\threading\generics\Monitor\EnterExit14\EnterExit14.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit14
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS
+Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [TryEnter01.cmd_185]
 RelativePath=baseservices\threading\generics\Monitor\TryEnter01\TryEnter01.cmd
@@ -1306,7 +1306,7 @@ RelativePath=baseservices\threading\generics\Monitor\TryEnter03\TryEnter03.cmd
 WorkingDir=baseservices\threading\generics\Monitor\TryEnter03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS
+Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [TryEnter04.cmd_187]
 RelativePath=baseservices\threading\generics\Monitor\TryEnter04\TryEnter04.cmd
@@ -1327,7 +1327,7 @@ RelativePath=baseservices\threading\generics\Monitor\TryEnter06\TryEnter06.cmd
 WorkingDir=baseservices\threading\generics\Monitor\TryEnter06
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS
+Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [GThread01.cmd_190]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread01\GThread01.cmd
@@ -1964,7 +1964,7 @@ RelativePath=baseservices\threading\generics\TimerCallback\tighttimercallback\ti
 WorkingDir=baseservices\threading\generics\TimerCallback\tighttimercallback
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS
+Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [thread01.cmd_281]
 RelativePath=baseservices\threading\generics\WaitCallback\thread01\thread01.cmd
@@ -2412,7 +2412,7 @@ RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeT
 WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_FAIL;UNSTABLE
 HostStyle=0
 [CompareExchangeTClass_1.cmd_345]
 RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass_1\CompareExchangeTClass_1.cmd
@@ -2643,7 +2643,7 @@ RelativePath=baseservices\threading\monitor\tryenter\longtimeout\longtimeout.cmd
 WorkingDir=baseservices\threading\monitor\tryenter\longtimeout
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [EnterExitExit.cmd_378]
 RelativePath=baseservices\threading\monitor\unownedlock\EnterExitExit\EnterExitExit.cmd
@@ -3364,7 +3364,7 @@ RelativePath=baseservices\threading\regressions\beta2\437017\437017.cmd
 WorkingDir=baseservices\threading\regressions\beta2\437017
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [437044.cmd_481]
 RelativePath=baseservices\threading\regressions\beta2\437044\437044.cmd
@@ -4631,7 +4631,7 @@ RelativePath=CoreMangLib\cti\system\array\ArraySort3\ArraySort3.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
+Categories=Pri1;RT;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [ArraySort3b.cmd_662]
 RelativePath=CoreMangLib\cti\system\array\ArraySort3b\ArraySort3b.cmd
@@ -20500,35 +20500,35 @@ RelativePath=GC\Features\HeapExpansion\bestfit\bestfit.cmd
 WorkingDir=GC\Features\HeapExpansion\bestfit
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [bestfit-finalize.cmd_2932]
 RelativePath=GC\Features\HeapExpansion\bestfit-finalize\bestfit-finalize.cmd
 WorkingDir=GC\Features\HeapExpansion\bestfit-finalize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [bestfit-threaded.cmd_2933]
 RelativePath=GC\Features\HeapExpansion\bestfit-threaded\bestfit-threaded.cmd
 WorkingDir=GC\Features\HeapExpansion\bestfit-threaded
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [bestfit_1.cmd_2934]
 RelativePath=GC\Features\HeapExpansion\bestfit_1\bestfit_1.cmd
 WorkingDir=GC\Features\HeapExpansion\bestfit_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [expandheap.cmd_2935]
 RelativePath=GC\Features\HeapExpansion\expandheap\expandheap.cmd
 WorkingDir=GC\Features\HeapExpansion\expandheap
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [Finalizer.cmd_2936]
 RelativePath=GC\Features\HeapExpansion\Finalizer\Finalizer.cmd
@@ -20556,7 +20556,7 @@ RelativePath=GC\Features\HeapExpansion\pluggaps\pluggaps.cmd
 WorkingDir=GC\Features\HeapExpansion\pluggaps
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [keepalivearray.cmd_2940]
 RelativePath=GC\Features\KeepAlive\keepaliveother\keepalivearray\keepalivearray.cmd
@@ -20612,7 +20612,7 @@ RelativePath=GC\Features\LOHCompaction\lohcompactapi\lohcompactapi.cmd
 WorkingDir=GC\Features\LOHCompaction\lohcompactapi
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [lohcompactapi2.cmd_2948]
 RelativePath=GC\Features\LOHCompaction\lohcompactapi2\lohcompactapi2.cmd
@@ -20857,7 +20857,7 @@ RelativePath=GC\Scenarios\BinTree\thdtreegrowingobj\thdtreegrowingobj.cmd
 WorkingDir=GC\Scenarios\BinTree\thdtreegrowingobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_FAIL
+Categories=NEW;EXPECTED_FAIL;UNSTABLE
 HostStyle=0
 [thdtreelivingobj.cmd_2991]
 RelativePath=GC\Scenarios\BinTree\thdtreelivingobj\thdtreelivingobj.cmd
@@ -21046,7 +21046,7 @@ RelativePath=GC\Scenarios\GCBench\gcbench\gcbench.cmd
 WorkingDir=GC\Scenarios\GCBench\gcbench
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [GCSimulator.cmd_3019]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator\GCSimulator.cmd
@@ -24077,7 +24077,7 @@ RelativePath=GC\Scenarios\GCStress\gcstress\gcstress.cmd
 WorkingDir=GC\Scenarios\GCStress\gcstress
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [leakgen.cmd_3452]
 RelativePath=GC\Scenarios\LeakGen\leakgen\leakgen.cmd
@@ -24098,7 +24098,7 @@ RelativePath=GC\Scenarios\LeakWheel\leakwheel\leakwheel.cmd
 WorkingDir=GC\Scenarios\LeakWheel\leakwheel
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [minleakgen.cmd_3455]
 RelativePath=GC\Scenarios\MinLeakGen\minleakgen\minleakgen.cmd
@@ -24133,7 +24133,7 @@ RelativePath=GC\Scenarios\ReflectObj\reflectobj\reflectobj.cmd
 WorkingDir=GC\Scenarios\ReflectObj\reflectobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [continue.cmd_3461]
 RelativePath=GC\Scenarios\Resurrection\continue\continue.cmd
@@ -24161,7 +24161,7 @@ RelativePath=GC\Scenarios\ServerModel\servermodel\servermodel.cmd
 WorkingDir=GC\Scenarios\ServerModel\servermodel
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [singlinkgen.cmd_3465]
 RelativePath=GC\Scenarios\SingLinkList\singlinkgen\singlinkgen.cmd
@@ -29488,7 +29488,7 @@ RelativePath=JIT\Directed\UnrollLoop\loop2_cs_do\loop2_cs_do.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop2_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS
+Categories=Pri0;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [loop2_cs_r.cmd_4251]
 RelativePath=JIT\Directed\UnrollLoop\loop2_cs_r\loop2_cs_r.cmd
@@ -29502,7 +29502,7 @@ RelativePath=JIT\Directed\UnrollLoop\loop2_cs_ro\loop2_cs_ro.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop2_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS
+Categories=Pri0;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [loop3_il_d.cmd_4253]
 RelativePath=JIT\Directed\UnrollLoop\loop3_il_d\loop3_il_d.cmd
@@ -35795,7 +35795,7 @@ RelativePath=JIT\jit64\localloc\ehverify\eh11_large\eh11_large.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh11_large
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL;REGRESS
+Categories=Pri0;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [eh11_small.cmd_5153]
 RelativePath=JIT\jit64\localloc\ehverify\eh11_small\eh11_small.cmd
@@ -36579,28 +36579,28 @@ RelativePath=JIT\jit64\opt\cse\HugeArray1\HugeArray1.cmd
 WorkingDir=JIT\jit64\opt\cse\HugeArray1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS
+Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [hugeexpr1.cmd_5296]
 RelativePath=JIT\jit64\opt\cse\hugeexpr1\hugeexpr1.cmd
 WorkingDir=JIT\jit64\opt\cse\hugeexpr1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS
+Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [HugeField1.cmd_5297]
 RelativePath=JIT\jit64\opt\cse\HugeField1\HugeField1.cmd
 WorkingDir=JIT\jit64\opt\cse\HugeField1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS
+Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [HugeField2.cmd_5298]
 RelativePath=JIT\jit64\opt\cse\HugeField2\HugeField2.cmd
 WorkingDir=JIT\jit64\opt\cse\HugeField2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS
+Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [hugeSimpleExpr1.cmd_5299]
 RelativePath=JIT\jit64\opt\cse\hugeSimpleExpr1\hugeSimpleExpr1.cmd
@@ -37188,7 +37188,7 @@ RelativePath=JIT\jit64\opt\rngchk\RngchkStress3\RngchkStress3.cmd
 WorkingDir=JIT\jit64\opt\rngchk\RngchkStress3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS
+Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [SimpleArray_01_o.cmd_5383]
 RelativePath=JIT\jit64\opt\rngchk\SimpleArray_01_o\SimpleArray_01_o.cmd
@@ -47646,7 +47646,7 @@ RelativePath=JIT\Methodical\explicit\rotate\_il_dbgrotarg_double\_il_dbgrotarg_d
 WorkingDir=JIT\Methodical\explicit\rotate\_il_dbgrotarg_double
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS
+Categories=Pri0;JIT;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [_il_dbgrotarg_float.cmd_6889]
 RelativePath=JIT\Methodical\explicit\rotate\_il_dbgrotarg_float\_il_dbgrotarg_float.cmd
@@ -53029,7 +53029,7 @@ RelativePath=JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd
 WorkingDir=JIT\Methodical\tailcall_v4\hijacking
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL;ISSUE_4122
+Categories=Pri0;EXPECTED_FAIL;ISSUE_4122;LONG_RUNNING
 HostStyle=0
 [smallFrame.cmd_7664]
 RelativePath=JIT\Methodical\tailcall_v4\smallFrame\smallFrame.cmd
@@ -55493,7 +55493,7 @@ RelativePath=JIT\Performance\CodeQuality\Bytemark\Bytemark\Bytemark.cmd
 WorkingDir=JIT\Performance\CodeQuality\Bytemark\Bytemark
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS
+Categories=Pri0;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [FractalPerf.cmd_8019]
 RelativePath=JIT\Performance\CodeQuality\FractalPerf\FractalPerf\FractalPerf.cmd
@@ -55514,7 +55514,7 @@ RelativePath=JIT\Performance\CodeQuality\Roslyn\CscBench\CscBench.cmd
 WorkingDir=JIT\Performance\CodeQuality\Roslyn\CscBench
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS
+Categories=Pri0;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [SciMark.cmd_8022]
 RelativePath=JIT\Performance\CodeQuality\SciMark\SciMark\SciMark.cmd
@@ -57901,7 +57901,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40725\b40725\b40725.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40725\b40725
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS
+Categories=Pri0;JIT;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [b41002.cmd_8375]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41002\b41002\b41002.cmd
@@ -61583,7 +61583,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b399444\b399444b\b399444b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b399444\b399444b
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS
+Categories=Pri0;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [b405223.cmd_8913]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b405223\b405223\b405223.cmd
@@ -61639,7 +61639,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b425314\b425314\b425314.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b425314\b425314
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL;REGRESS
+Categories=Pri0;EXPECTED_FAIL;REGRESS;LONG_RUNNING
 HostStyle=0
 [b426654.cmd_8922]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b426654\b426654\b426654.cmd
@@ -63438,7 +63438,7 @@ RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28158\b28158\b28158.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28158\b28158
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS
+Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
 [b28158_64.cmd_9180]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28158\b28158_64\b28158_64.cmd
@@ -67750,14 +67750,14 @@ RelativePath=readytorun\mainv1\mainv1.cmd
 WorkingDir=readytorun\mainv1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [mainv2.cmd_9797]
 RelativePath=readytorun\mainv2\mainv2.cmd
 WorkingDir=readytorun\mainv2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=NEW;EXPECTED_PASS;UNSTABLE
 HostStyle=0
 [Dev10_629953.cmd_9798]
 RelativePath=reflection\regression\dev10bugs\Dev10_629953\Dev10_629953.cmd