Revert "Optimize"

This reverts commit 9905646.
DeepakRajendrakumaran · Dec 27, 2024 · 0ecbbd3 · 0ecbbd3
1 parent a5bab76
commit 0ecbbd3
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 27 deletions.
diff --git a/src/coreclr/jit/compiler.cpp b/src/coreclr/jit/compiler.cpp
@@ -3401,13 +3401,11 @@ void Compiler::compInitOptions(JitFlags* jitFlags)
         cntCalleeTrashFloat += CNT_CALLEE_TRASH_HIGHFLOAT;
     }
 
-    regIntLast = REG_R15;
     if (canUseApxEncoding())
     {
         rbmAllInt |= RBM_HIGHINT;
         rbmIntCalleeTrash |= RBM_HIGHINT;
         cntCalleeTrashInt += CNT_CALLEE_TRASH_HIGHINT;
-        regIntLast = REG_R31;
     }
 #endif // TARGET_AMD64
 

diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
@@ -11673,7 +11673,6 @@ class Compiler
     regMaskTP rbmAllInt;
     regMaskTP rbmIntCalleeTrash;
     unsigned  cntCalleeTrashInt;
-    regNumber regIntLast;
 public:
     FORCEINLINE regMaskTP get_RBM_ALLFLOAT() const
     {
@@ -11700,10 +11699,6 @@ class Compiler
     {
         return this->cntCalleeTrashInt;
     }
-    FORCEINLINE regNumber get_REG_INT_LAST() const
-    {
-        return this->regIntLast;
-    }
 
 #endif // TARGET_AMD64
 

diff --git a/src/coreclr/jit/lsra.cpp b/src/coreclr/jit/lsra.cpp
@@ -808,7 +808,6 @@ LinearScan::LinearScan(Compiler* theCompiler)
     rbmFltCalleeTrash = compiler->rbmFltCalleeTrash;
     rbmAllInt         = compiler->rbmAllInt;
     rbmIntCalleeTrash = compiler->rbmIntCalleeTrash;
-    regIntLast        = compiler->regIntLast;
 #endif // TARGET_AMD64
 
 #if defined(TARGET_XARCH)

diff --git a/src/coreclr/jit/lsra.h b/src/coreclr/jit/lsra.h
@@ -2068,7 +2068,6 @@ class LinearScan : public LinearScanInterface
     regMaskTP rbmFltCalleeTrash;
     regMaskTP rbmAllInt;
     regMaskTP rbmIntCalleeTrash;
-    regNumber regIntLast;
 
     FORCEINLINE regMaskTP get_RBM_ALLFLOAT() const
     {
@@ -2086,10 +2085,6 @@ class LinearScan : public LinearScanInterface
     {
         return this->rbmIntCalleeTrash;
     }
-    FORCEINLINE regNumber get_REG_INT_LAST() const
-    {
-        return this->regIntLast;
-    }
 #endif // TARGET_AMD64
 
 #if defined(TARGET_XARCH)

diff --git a/src/coreclr/jit/lsrabuild.cpp b/src/coreclr/jit/lsrabuild.cpp
@@ -2821,11 +2821,7 @@ void LinearScan::buildIntervals()
     needNonIntegerRegisters |= compiler->compFloatingPointUsed;
     if (!needNonIntegerRegisters)
     {
-#ifdef TARGET_AMD64
-        availableRegCount = (regIntLast - REG_INT_FIRST + 1);
-#else
         availableRegCount = REG_INT_COUNT;
-#endif
     }
 
 #ifdef HAS_MORE_THAN_64_REGISTERS
@@ -2842,17 +2838,7 @@ void LinearScan::buildIntervals()
 #ifdef HAS_MORE_THAN_64_REGISTERS
     else if (availableRegCount < (sizeof(regMaskTP) * 8))
     {
-#ifdef TARGET_AMD64
-        regMaskSmall mask = ~RBM_NONE;
-        if (regIntLast == REG_R15)
-        {
-            regMaskSmall highInt = (regMaskSmall)RBM_HIGHINT;
-            mask                 = mask & ~highInt;
-        }
-        actualRegistersMask = regMaskTP(mask, availableMaskRegs);
-#else
         actualRegistersMask = regMaskTP(~RBM_NONE, availableMaskRegs);
-#endif
     }
 #endif
     else