Handle more than 64 registers - Part 3

src/coreclr/jit/CMakeLists.txt

@@ -167,6 +167,7 @@ set( JIT_SOURCES
   redundantbranchopts.cpp
   regalloc.cpp
   registerargconvention.cpp
+  regMaskTPOps.cpp
   regset.cpp
   scev.cpp
   scopeinfo.cpp

src/coreclr/jit/codegencommon.cpp

@@ -74,11 +74,11 @@ NodeInternalRegisters::NodeInternalRegisters(Compiler* comp)
 //   tree - IR node to add internal allocated registers to
 //   regs - Registers to add
 //
-void NodeInternalRegisters::Add(GenTree* tree, regMaskTP regs)
+void NodeInternalRegisters::Add(GenTree* tree, SingleTypeRegSet regs)
 {
     assert(regs != RBM_NONE);
 
-    regMaskTP* result = m_table.LookupPointerOrAdd(tree, RBM_NONE);
+    SingleTypeRegSet* result = m_table.LookupPointerOrAdd(tree, RBM_NONE);
     *result |= regs;
 }
 
@@ -95,12 +95,12 @@ void NodeInternalRegisters::Add(GenTree* tree, regMaskTP regs)
 // Returns:
 //   Register number.
 //
-regNumber NodeInternalRegisters::Extract(GenTree* tree, regMaskTP mask)
+regNumber NodeInternalRegisters::Extract(GenTree* tree, SingleTypeRegSet mask)
 {
-    regMaskTP* regs = m_table.LookupPointer(tree);
+    SingleTypeRegSet* regs = m_table.LookupPointer(tree);
     assert(regs != nullptr);
 
-    regMaskTP availableSet = *regs & mask;
+    SingleTypeRegSet availableSet = *regs & mask;
     assert(availableSet != RBM_NONE);
 
     regNumber result = genFirstRegNumFromMask(availableSet);
@@ -122,9 +122,9 @@ regNumber NodeInternalRegisters::Extract(GenTree* tree, regMaskTP mask)
 // Returns:
 //   Register number.
 //
-regNumber NodeInternalRegisters::GetSingle(GenTree* tree, regMaskTP mask)
+regNumber NodeInternalRegisters::GetSingle(GenTree* tree, SingleTypeRegSet mask)
 {
-    regMaskTP* regs = m_table.LookupPointer(tree);
+    SingleTypeRegSet* regs = m_table.LookupPointer(tree);
     assert(regs != nullptr);
 
     regMaskTP availableSet = *regs & mask;
@@ -145,9 +145,9 @@ regNumber NodeInternalRegisters::GetSingle(GenTree* tree, regMaskTP mask)
 // Returns:
 //   Mask of registers.
 //
-regMaskTP NodeInternalRegisters::GetAll(GenTree* tree)
+SingleTypeRegSet NodeInternalRegisters::GetAll(GenTree* tree)
 {
-    regMaskTP regs;
+    SingleTypeRegSet regs;
     return m_table.Lookup(tree, &regs) ? regs : RBM_NONE;
 }
 
@@ -162,9 +162,9 @@ regMaskTP NodeInternalRegisters::GetAll(GenTree* tree)
 // Returns:
 //   Count of nodes
 //
-unsigned NodeInternalRegisters::Count(GenTree* tree, regMaskTP mask)
+unsigned NodeInternalRegisters::Count(GenTree* tree, SingleTypeRegSet mask)
 {
-    regMaskTP regs;
+    SingleTypeRegSet regs;
     return m_table.Lookup(tree, &regs) ? genCountBits(regs & mask) : 0;
 }
 

src/coreclr/jit/codegeninterface.h

@@ -48,17 +48,17 @@ CodeGenInterface* getCodeGenerator(Compiler* comp);
 
 class NodeInternalRegisters
 {
-    typedef JitHashTable<GenTree*, JitPtrKeyFuncs<GenTree>, regMaskTP> NodeInternalRegistersTable;
-    NodeInternalRegistersTable                                         m_table;
+    typedef JitHashTable<GenTree*, JitPtrKeyFuncs<GenTree>, SingleTypeRegSet> NodeInternalRegistersTable;
+    NodeInternalRegistersTable                                                m_table;
 
 public:
     NodeInternalRegisters(Compiler* comp);
 
-    void      Add(GenTree* tree, regMaskTP reg);
-    regNumber Extract(GenTree* tree, regMaskTP mask = static_cast<regMaskTP>(-1));
-    regNumber GetSingle(GenTree* tree, regMaskTP mask = static_cast<regMaskTP>(-1));
-    regMaskTP GetAll(GenTree* tree);
-    unsigned  Count(GenTree* tree, regMaskTP mask = static_cast<regMaskTP>(-1));
+    void             Add(GenTree* tree, SingleTypeRegSet reg);
+    regNumber        Extract(GenTree* tree, SingleTypeRegSet mask = static_cast<SingleTypeRegSet>(-1));
+    regNumber        GetSingle(GenTree* tree, SingleTypeRegSet mask = static_cast<SingleTypeRegSet>(-1));
+    SingleTypeRegSet GetAll(GenTree* tree);
+    unsigned         Count(GenTree* tree, SingleTypeRegSet mask = static_cast<SingleTypeRegSet>(-1));
 };
 
 class CodeGenInterface

src/coreclr/jit/emit.cpp

@@ -10062,7 +10062,7 @@ void emitter::emitStackPopLargeStk(BYTE* addr, bool isCall, unsigned char callIn
     // of callee-saved registers only).
     for (unsigned calleeSavedRegIdx = 0; calleeSavedRegIdx < CNT_CALL_GC_REGS; calleeSavedRegIdx++)
     {
-        regMaskTP calleeSavedRbm = raRbmCalleeSaveOrder[calleeSavedRegIdx];
+        regMaskSmall calleeSavedRbm = raRbmCalleeSaveOrder[calleeSavedRegIdx];
         if (emitThisGCrefRegs & calleeSavedRbm)
         {
             gcrefRegs |= (1 << calleeSavedRegIdx);

src/coreclr/jit/gcencode.cpp

@@ -4620,7 +4620,7 @@ void GCInfo::gcInfoRecordGCRegStateChange(GcInfoEncoder* gcInfoEncoder,
     while (regMask)
     {
         // Get hold of the next register bit.
-        regMaskTP tmpMask = genFindLowestBit(regMask);
+        regMaskSmall tmpMask = genFindLowestBit(regMask);
         assert(tmpMask);
 
         // Remember the new state of this register.

src/coreclr/jit/jit.h

@@ -513,7 +513,7 @@ class GlobalJitOptions
 #define TRACK_LSRA_STATS  1 // Collect LSRA stats
 #define TRACK_ENREG_STATS 1 // Collect enregistration stats
 #else
-#define MEASURE_MEM_ALLOC 0 // You can set this to 1 to get memory stats in retail, as well
+#define MEASURE_MEM_ALLOC 1 // You can set this to 1 to get memory stats in retail, as well
 #define LOOP_HOIST_STATS  0 // You can set this to 1 to get loop hoist stats in retail, as well
 #define TRACK_LSRA_STATS  0 // You can set this to 1 to get LSRA stats in retail, as well
 #define TRACK_ENREG_STATS 0