Merge pull request #5618 from 0xdaryl/nox87gra

Disable x87 floating point GRA
eclipse · Oct 22, 2020 · 34e6c71 · 34e6c71
2 parents 6b0f48b + 89a6afe
commit 34e6c71
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 38 deletions.
diff --git a/compiler/arm/codegen/OMRCodeGenerator.cpp b/compiler/arm/codegen/OMRCodeGenerator.cpp
@@ -141,7 +141,7 @@ OMR::ARM::CodeGenerator::initialize()
    _numFPR = _linkageProperties->getNumAllocatableFloatRegisters();
 
    // TODO: Disable FP-GRA since current GRA does not work well with ARM linkage (where Float register usage is limited).
-   cg->setDisableFpGRA();
+   cg->setDisableFloatingPointGRA();
 
    cg->setSupportsRecompilation();
 
@@ -303,7 +303,7 @@ OMR::ARM::CodeGenerator::CodeGenerator()
    _numFPR = _linkageProperties->getNumAllocatableFloatRegisters();
 
    // TODO: Disable FP-GRA since current GRA does not work well with ARM linkage (where Float register usage is limited).
-   self()->setDisableFpGRA();
+   self()->setDisableFloatingPointGRA();
 
    self()->setSupportsRecompilation();
 

diff --git a/compiler/codegen/OMRCodeGenerator.hpp b/compiler/codegen/OMRCodeGenerator.hpp
@@ -1469,8 +1469,8 @@ class OMR_EXTENSIBLE CodeGenerator
    bool getDisableLongGRA() {return _flags1.testAny(DisableLongGRA);}
    void setDisableLongGRA() {_flags1.set(DisableLongGRA);}
 
-   bool getDisableFpGRA() {return _flags2.testAny(DisableFpGRA);}
-   void setDisableFpGRA() {_flags2.set(DisableFpGRA);}
+   bool getDisableFloatingPointGRA() {return _flags2.testAny(DisableFloatingPointGRA);}
+   void setDisableFloatingPointGRA() {_flags2.set(DisableFloatingPointGRA);}
 
    bool usesRegisterMaps() {return _flags1.testAny(UsesRegisterMaps);}
    void setUsesRegisterMaps() {_flags1.set(UsesRegisterMaps);}
@@ -1767,7 +1767,7 @@ class OMR_EXTENSIBLE CodeGenerator
       HasCCInfo                                           = 0x00200000,
       SupportsReverseLoadAndStore                         = 0x00400000,
       SupportsLoweringConstLDivPower2                     = 0x00800000,
-      DisableFpGRA                                        = 0x01000000,
+      DisableFloatingPointGRA                             = 0x01000000,
       // AVAILABLE                                        = 0x02000000,
       MethodModifiedByRA                                  = 0x04000000,
       // AVAILABLE                                        = 0x08000000,

diff --git a/compiler/optimizer/RegisterCandidate.cpp b/compiler/optimizer/RegisterCandidate.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corp. and others
+ * Copyright (c) 2000, 2020 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -2610,41 +2610,13 @@ TR_RegisterCandidates::assign(TR::Block ** cfgBlocks, int32_t numberOfBlocks, in
 
       if (isFloat)
          {
-           if (debug("disableGlobalFPRs")
-               || cg->getDisableFpGRA()
+         if (cg->getDisableFloatingPointGRA()
 #ifdef J9_PROJECT_SPECIFIC
-               || (dt == TR::DecimalLongDouble)
+             || (dt == TR::DecimalLongDouble)
 #endif
-               )
-              {
-              continue;
-              }
-
-         // Cannot keep FP values on FP stack across a switch on IA32
-         //
-         if (!comp()->cg()->getSupportsJavaFloatSemantics())
-            {
-            temp = rc->getBlocksLiveOnEntry();
-            temp |= rc->getBlocksLiveOnExit();
-            temp &= switchBlocks;
-            if (!temp.isEmpty())
-               {
-               //printf("Discarding FP candidate in %s\n", comp()->getCurrentMethod()->signature());
-               continue;
-               }
-            }
-
-         if (0 && comp()->cg()->spillsFPRegistersAcrossCalls())
+            )
             {
-            temp = rc->getBlocksLiveOnEntry();
-            temp &= rc->getBlocksLiveOnExit();
-            temp &= callBlocks;
-            if (!temp.isEmpty())
-               {
-               //dumpOptDetails(comp(), "Discarding FP candidate %d\n", rc->getSymbolReference()->getReferenceNumber());
-               //printf("Discarding FP candidate in %s\n", comp()->getCurrentMethod()->signature());
-               continue;
-               }
+            continue;
             }
 
          firstRegister = cg->getFirstGlobalFPR(), lastRegister = cg->getLastGlobalFPR();

diff --git a/compiler/x/codegen/OMRCodeGenerator.cpp b/compiler/x/codegen/OMRCodeGenerator.cpp
@@ -268,6 +268,10 @@ OMR::X86::CodeGenerator::initializeX86(TR::Compilation *comp)
       self()->setSupportsAutoSIMD();
       self()->setSupportsJavaFloatSemantics();
       }
+   else
+      {
+      self()->setDisableFloatingPointGRA();
+      }
 
    // Choose the best XMM double precision load instruction for the target architecture.
    //