[RyuJIT/ARM32] Update restoring TYP_DOUBLE interval

- Introduce findAnotherHalfRegRec()
- Restore TYP_DOUBLE interval to valid double register

Signed-off-by: Hyung-Kyu Choi <hk0110.choi@samsung.com>
Commit migrated from https://github.com/dotnet/coreclr/commit/8d209134fb20150c15cf08755d8a12d8654a8ebf

diff --git a/src/coreclr/src/jit/lsra.cpp b/src/coreclr/src/jit/lsra.cpp
index c2a5fcf..b46fb94 100644 (file)
--- a/src/coreclr/src/jit/lsra.cpp
+++ b/src/coreclr/src/jit/lsra.cpp
@@ -6457,19 +6457,10 @@ void LinearScan::unassignPhysReg(RegRecord* regRec, RefPosition* spillRefPositio
         // Update second half RegRecord of a double register for TYP_DOUBLE
         if (regRec->assignedInterval->registerType == TYP_DOUBLE)
         {
-            assert(isFloatRegType(regRec->registerType));
-            assert(genIsValidDoubleReg(regRec->regNum));
+            RegRecord* anotherHalfRegRec = findAnotherHalfRegRec(regRec);
 
-            // Because nextRegRec was defined only when assignedInterval is TYP_DOUBLE,
-            // we should compute nextRegRec when nextRegRec is not defined yet.
-            if (nextRegRec == nullptr)
-            {
-                nextRegNum = REG_NEXT(regRec->regNum);
-                nextRegRec = getRegisterRecord(nextRegNum);
-            }
-
-            nextRegRec->assignedInterval = nextRegRec->previousInterval;
-            nextRegRec->previousInterval = nullptr;
+            anotherHalfRegRec->assignedInterval = regRec->assignedInterval;
+            anotherHalfRegRec->previousInterval = nullptr;
         }
 #endif // _TARGET_ARM_
 
@@ -6651,6 +6642,42 @@ bool LinearScan::isSecondHalfReg(RegRecord* regRec, Interval* interval)
 
     return false;
 }
+
+//------------------------------------------------------------------------------------------
+// findAnotherHalfRegRec: Find another half RegRecord which forms same ARM32 double register
+//
+// Arguments:
+//    regRec - A float RegRecord
+//
+// Assumptions:
+//    None
+//
+// Return Value:
+//    A RegRecord which forms same double register with regRec
+//
+RegRecord* LinearScan::findAnotherHalfRegRec(RegRecord* regRec)
+{
+    regNumber  anotherHalfRegNum;
+    RegRecord* anotherHalfRegRec;
+
+    assert(genIsValidFloatReg(regRec->regNum));
+
+    // Find another half register for TYP_DOUBLE interval,
+    // following same logic in canRestorePreviousInterval().
+    if (genIsValidDoubleReg(regRec->regNum))
+    {
+        anotherHalfRegNum = REG_NEXT(regRec->regNum);
+        assert(!genIsValidDoubleReg(anotherHalfRegNum));
+    }
+    else
+    {
+        anotherHalfRegNum = REG_PREV(regRec->regNum);
+        assert(genIsValidDoubleReg(anotherHalfRegNum));
+    }
+    anotherHalfRegRec = getRegisterRecord(anotherHalfRegNum);
+
+    return anotherHalfRegRec;
+}
 #endif
 
 //--------------------------------------------------------------------------------------
@@ -6675,10 +6702,9 @@ bool LinearScan::canRestorePreviousInterval(RegRecord* regRec, Interval* assigne
 #ifdef _TARGET_ARM_
     if (retVal && regRec->previousInterval->registerType == TYP_DOUBLE)
     {
-        regNumber  nextRegNum = REG_NEXT(regRec->regNum);
-        RegRecord* nextRegRec = getRegisterRecord(nextRegNum);
+        RegRecord* anotherHalfRegRec = findAnotherHalfRegRec(regRec);
 
-        retVal = retVal && nextRegRec->assignedInterval == nullptr;
+        retVal = retVal && anotherHalfRegRec->assignedInterval == nullptr;
     }
 #endif
 

diff --git a/src/coreclr/src/jit/lsra.h b/src/coreclr/src/jit/lsra.h
index aab034b..b660048 100644 (file)
--- a/src/coreclr/src/jit/lsra.h
+++ b/src/coreclr/src/jit/lsra.h
@@ -696,6 +696,7 @@ private:
 
 #ifdef _TARGET_ARM_
     bool isSecondHalfReg(RegRecord* regRec, Interval* interval);
+    RegRecord* findAnotherHalfRegRec(RegRecord* regRec);
 #endif
     bool canRestorePreviousInterval(RegRecord* regRec, Interval* assignedInterval);