Deprecate TR_OptimizeForSpace

This option is not set anywhere and there is no option flag present which can enable this option. Therefore the code guarded by it is dead.
eclipse · May 5, 2021 · 20d6734 · 20d6734
1 parent d96f2b3
commit 20d6734
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 25 deletions.
diff --git a/compiler/arm/codegen/ControlFlowEvaluator.cpp b/compiler/arm/codegen/ControlFlowEvaluator.cpp
@@ -127,8 +127,7 @@ static TR::Instruction *compareIntsForOrder(TR_ARMConditionCode  branchType,
    bool            cannotInline = false;
 
    // For TR::instanceof, the opcode must be ificmpeq/ne.
-   if (!cg->comp()->getOption(TR_OptimizeForSpace) &&
-        firstChild->getOpCodeValue() == TR::instanceof &&
+   if (firstChild->getOpCodeValue() == TR::instanceof &&
         firstChild->getRegister() == NULL &&
         node->getReferenceCount() <=1 &&
         (value == 0 || value == 1))
@@ -235,8 +234,7 @@ TR::Instruction *OMR::ARM::TreeEvaluator::compareIntsForEquality(TR_ARMCondition
    bool            cannotInline = false;
 
    // For TR::instanceof, the opcode must be ificmpeq/ne.
-   if (!cg->comp()->getOption(TR_OptimizeForSpace) &&
-        firstChild->getOpCodeValue() == TR::instanceof &&
+   if (firstChild->getOpCodeValue() == TR::instanceof &&
         firstChild->getRegister() == NULL &&
         node->getReferenceCount() <=1 &&
         (value == 0 || value == 1))

diff --git a/compiler/codegen/OMRTreeEvaluator.cpp b/compiler/codegen/OMRTreeEvaluator.cpp
@@ -386,8 +386,7 @@ bool OMR::TreeEvaluator::instanceOfOrCheckCastNeedSuperTest(TR::Node * node, TR:
           !TR::Compiler->cls.isClassArray(cg->comp(), clazz) &&
           !TR::Compiler->cls.isInterfaceClass(cg->comp(), clazz) &&
           !TR::Compiler->cls.isClassFinal(cg->comp(), clazz) &&
-           helperSym->preservesAllRegisters() &&
-          !cg->comp()->getOption(TR_OptimizeForSpace))
+           helperSym->preservesAllRegisters())
          return true;
       }
    return false;

diff --git a/compiler/compile/OMRCompilation.hpp b/compiler/compile/OMRCompilation.hpp
@@ -431,7 +431,7 @@ class OMR_EXTENSIBLE Compilation
 
    bool useRegisterMaps();
 
-   bool suppressAllocationInlining()      {return _options->getOption(TR_DisableAllocationInlining) || _options->getOption(TR_OptimizeForSpace);}
+   bool suppressAllocationInlining()      {return _options->getOption(TR_DisableAllocationInlining);}
 
    // ==========================================================================
    // OMR utility

diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp
@@ -97,7 +97,7 @@ enum TR_CompilationOptions
    TR_StrictFPCompares           = 0x00000800,
    TR_RegisterMaps               = 0x00001000,
    TR_CreatePCMaps               = 0x00002000,
-   TR_OptimizeForSpace           = 0x00004000,
+   // Available                  = 0x00004000,
    TR_MimicInterpreterFrameShape = 0x00008000,
 
    TR_TraceBC                    = 0x00010000,

diff --git a/compiler/p/codegen/ControlFlowEvaluator.cpp b/compiler/p/codegen/ControlFlowEvaluator.cpp
@@ -1932,8 +1932,7 @@ if (cg->profiledPointersRequireRelocation() && secondChild->getOpCodeValue() ==
    int64_t      value = secondChild->getOpCode().isLoadConst() ? secondChild->get64bitIntegralValue() : 0;
    bool         cannotInline = false;
     if ((firstChild->getOpCodeValue() == TR::instanceof) &&
-        !(comp->getOption(TR_OptimizeForSpace) ||
-          comp->getOption(TR_DisableInlineIfInstanceOf)) &&
+        !comp->getOption(TR_DisableInlineIfInstanceOf) &&
         (firstChild->getRegister() == NULL) &&
         (node->getReferenceCount() <=1) &&
         secondChild->getOpCode().isLoadConst() &&

diff --git a/compiler/p/codegen/PPCSystemLinkage.cpp b/compiler/p/codegen/PPCSystemLinkage.cpp
@@ -681,8 +681,7 @@ TR::PPCSystemLinkage::createPrologue(
    if (savedFirst <= TR::RealRegister::LastGPR)
       {
       if (cg()->comp()->target().cpu.is(OMR_PROCESSOR_PPC_GP) || cg()->comp()->target().is64Bit() ||
-          (!comp()->getOption(TR_OptimizeForSpace) &&
-           TR::RealRegister::LastGPR - savedFirst <= 3))
+          (TR::RealRegister::LastGPR - savedFirst <= 3))
          for (regIndex=TR::RealRegister::LastGPR; regIndex>=savedFirst; regIndex=(TR::RealRegister::RegNum)((uint32_t)regIndex-1))
             {
             argSize = argSize - TR::Compiler->om.sizeofReferenceAddress();
@@ -783,8 +782,7 @@ TR::PPCSystemLinkage::createEpilogue(TR::Instruction *cursor)
    if (savedFirst <= TR::RealRegister::LastGPR)
       {
       if (cg()->comp()->target().cpu.is(OMR_PROCESSOR_PPC_GP) || cg()->comp()->target().is64Bit() ||
-          (!comp()->getOption(TR_OptimizeForSpace) &&
-           TR::RealRegister::LastGPR - savedFirst <= 3))
+          (TR::RealRegister::LastGPR - savedFirst <= 3))
          for (regIndex=TR::RealRegister::LastGPR; regIndex>=savedFirst; regIndex=(TR::RealRegister::RegNum)((uint32_t)regIndex-1))
             {
             saveSize = saveSize - TR::Compiler->om.sizeofReferenceAddress();

diff --git a/compiler/x/codegen/OMRTreeEvaluator.cpp b/compiler/x/codegen/OMRTreeEvaluator.cpp
@@ -902,17 +902,9 @@ TR::Register *OMR::X86::TreeEvaluator::integerStoreEvaluator(TR::Node *node, TR:
             }
          else
             {
-            // Memory update is a win if there is register pressure or if we are
-            // optimizing for space
-            //
-            if (comp->getOption(TR_OptimizeForSpace))
+            int32_t numRegs = cg->getLiveRegisters(TR_GPR)->getNumberOfLiveRegisters();
+            if (numRegs >= TR::RealRegister::LastAssignableGPR - 2) // -1 for VM thread reg, -1 fudge
                valueChild->setDirectMemoryUpdate(true);
-            else
-               {
-               int32_t numRegs = cg->getLiveRegisters(TR_GPR)->getNumberOfLiveRegisters();
-               if (numRegs >= TR::RealRegister::LastAssignableGPR - 2) // -1 for VM thread reg, -1 fudge
-                  valueChild->setDirectMemoryUpdate(true);
-               }
             }
          }
 

diff --git a/compiler/z/codegen/ControlFlowEvaluator.cpp b/compiler/z/codegen/ControlFlowEvaluator.cpp
@@ -878,7 +878,7 @@ OMR::Z::TreeEvaluator::ificmpeqEvaluator(TR::Node * node, TR::CodeGenerator * cg
 
 #ifdef J9_PROJECT_SPECIFIC
    if ((firstChild->getOpCodeValue() == TR::instanceof) &&
-      !(comp->getOption(TR_OptimizeForSpace) || debug("noInlineIfInstanceOf")) &&
+      !(debug("noInlineIfInstanceOf")) &&
       (firstChild->getRegister() == NULL) &&
       (node->getReferenceCount() <= 1) &&
       secondChild->getOpCode().isLoadConst() &&