Clean up

Author: DeepakRajendrakumaran

src/coreclr/jit/lsra.cpp

@@ -4908,29 +4908,24 @@ void LinearScan::handleDelayRegisters(regsFreeStruct* regsFree,
                                       var_types       currType)
 {
     if ((regsFree->regsToFree | regsFree->delayRegsToFree) != RBM_NONE)
-    // if ((regsToFree | delayRegsToFree).IsNonEmpty())
     {
-        // freeRegisters(regsToFree);
         freeRegisters(regsFree->regsToFree, currType, regOffset);
         if ((currentLocation > (prevLocation + 1)) && (regsFree->delayRegsToFree != RBM_NONE))
-        // if ((currentLocation > (prevLocation + 1)) && (delayRegsToFree.IsNonEmpty()))
         {
             // We should never see a delayReg that is delayed until a Location that has no RefPosition
             // (that would be the RefPosition that it was supposed to interfere with).
-            assert(!"Found a delayRegFree associated with Location with no reference");
+
+            // Assert not valid any longer since we might process this later
+            // assert(!"Found a delayRegFree associated with Location with no reference");
             // However, to be cautious for the Release build case, we will free them.
             freeRegisters(regsFree->delayRegsToFree, currType, regOffset);
             regsFree->delayRegsToFree = RBM_NONE;
             regsInUseThisLocation     = RBM_NONE;
         }
         regsFree->regsToFree = regsFree->delayRegsToFree;
-        // regsToFree      = delayRegsToFree;
         regsFree->delayRegsToFree = RBM_NONE;
 #ifdef DEBUG
-        // verifyFreeRegisters(regsToFree);
-        regMaskTP regsToFreeVerify = RBM_NONE;
-        regsToFreeVerify.AddRegsetForType(regsFree->regsToFree, currType);
-        verifyFreeRegisters(regsToFreeVerify, currType);
+        verifyFreeRegisters(regsFree->regsToFree, currType);
 #endif
     }
 }
@@ -5122,10 +5117,11 @@ void LinearScan::allocateRegistersMinimal()
             currentRegsFree->copyRegsToFree = RBM_NONE;
             regsInUseThisLocation           = regsInUseNextLocation;
             regsInUseNextLocation           = RBM_NONE;
-            handleDelayRegisters(&regsFreeLow, prevLocation, currentLocation, REG_LOW_BASE);
+            handleDelayRegisters(currentRegsFree, prevLocation, currentLocation, regOffset, currType);
+            /*handleDelayRegisters(&regsFreeLow, prevLocation, currentLocation, REG_LOW_BASE);
 #ifdef HAS_MORE_THAN_64_REGISTERS
             handleDelayRegisters(&regsFreeHigh, prevLocation, currentLocation, REG_HIGH_BASE, TYP_MASK);
-#endif // HAS_MORE_THAN_64_REGISTERS
+#endif // HAS_MORE_THAN_64_REGISTERS*/
             /*if ((currentRegsFree->regsToFree | currentRegsFree->delayRegsToFree) != RBM_NONE)
             {
                 freeRegisters(currentRegsFree->regsToFree, currType, regOffset);
@@ -5860,10 +5856,11 @@ void LinearScan::allocateRegisters()
                 consecutiveRegsInUseThisLocation = RBM_NONE;
             }
 #endif
-            handleDelayRegisters(&regsFreeLow, prevLocation, currentLocation, REG_LOW_BASE);
+            handleDelayRegisters(currentRegsFree, prevLocation, currentLocation, regOffset, currType);
+            /*handleDelayRegisters(&regsFreeLow, prevLocation, currentLocation, REG_LOW_BASE);
 #ifdef HAS_MORE_THAN_64_REGISTERS
             handleDelayRegisters(&regsFreeHigh, prevLocation, currentLocation, REG_HIGH_BASE, TYP_MASK);
-#endif // HAS_MORE_THAN_64_REGISTERS
+#endif // HAS_MORE_THAN_64_REGISTERS*/
             /*if ((currentRegsFree->regsToFree | currentRegsFree->delayRegsToFree) != RBM_NONE)
             // if ((regsToFree | delayRegsToFree).IsNonEmpty())
             {
@@ -12106,14 +12103,17 @@ void LinearScan::verifyFreeRegisters(regMaskTP regsToFree)
 // Arguments:
 //   regsToFree - Registers that were just freed.
 //
-void LinearScan::verifyFreeRegisters(regMaskTP regsToFree, var_types type)
+void LinearScan::verifyFreeRegisters(SingleTypeRegSet regsToFree, var_types type)
 {
+    //regMaskTP availableRegs = (allAvailableRegs);
+    SingleTypeRegSet availableRegsForType = (allAvailableRegs).GetRegSetForType(type);
     for (regNumber reg = REG_FIRST; reg < AVAILABLE_REG_COUNT; reg = REG_NEXT(reg))
     {
-        regMaskTP regMask = genRegMask(reg);
+        //regMaskTP regMask = genRegMask(reg);
+        SingleTypeRegSet regMask = genSingleTypeRegMask(reg);
         // If this isn't available or if it's still waiting to be freed (i.e. it was in
         // delayRegsToFree and so now it's in regsToFree), then skip it.
-        if ((regMask & allAvailableRegs & ~regsToFree).IsEmpty())
+        if ((regMask & availableRegsForType & ~regsToFree) == RBM_NONE)
         {
             continue;
         }

src/coreclr/jit/lsra.h

@@ -931,7 +931,7 @@ class LinearScan : public LinearScanInterface
     static bool IsResolutionMove(GenTree* node);
     static bool IsResolutionNode(LIR::Range& containingRange, GenTree* node);
 
-    void verifyFreeRegisters(regMaskTP regsToFree, var_types type);
+    void verifyFreeRegisters(SingleTypeRegSet regsToFree, var_types type);
     void verifyFreeRegisters(regMaskTP regsToFree);
     void verifyFinalAllocation();
     void verifyResolutionMove(GenTree* resolutionNode, LsraLocation currentLocation);