Merge pull request #4514 from simonameng/x86DsqrtEvaluator

Adding `dsqrtEvaluator` on X86
eclipse-openj9 · Nov 20, 2019 · 1e4b624 · 1e4b624
2 parents 9747d58 + 48d13f2
commit 1e4b624
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/compiler/x/amd64/codegen/OMRTreeEvaluatorTable.hpp b/compiler/x/amd64/codegen/OMRTreeEvaluatorTable.hpp
@@ -708,7 +708,7 @@
    TR::TreeEvaluator::unImpOpEvaluator,                                // TR::fnint
    TR::TreeEvaluator::unImpOpEvaluator,                                // TR::dnint
    TR::TreeEvaluator::fpSqrtEvaluator,                                 // TR::fsqrt
-   TR::TreeEvaluator::fpSqrtEvaluator,                                 // TR::dsqrt
+   TR::TreeEvaluator::dsqrtEvaluator,                                  // TR::dsqrt
    TR::TreeEvaluator::unImpOpEvaluator,                                // TR::getstack
    TR::TreeEvaluator::unImpOpEvaluator,                                // TR::dealloca
    TR::TreeEvaluator::unImpOpEvaluator,                                // TR::idoz

diff --git a/compiler/x/codegen/FPTreeEvaluator.cpp b/compiler/x/codegen/FPTreeEvaluator.cpp
@@ -722,6 +722,19 @@ TR::Register *OMR::X86::TreeEvaluator::fpSqrtEvaluator(TR::Node *node, TR::CodeG
    return result;
    }
 
+TR::Register *OMR::X86::TreeEvaluator::dsqrtEvaluator(TR::Node *node, TR::CodeGenerator *cg)
+   {
+   TR::Node *operand = node->getFirstChild();
+   TR::Register *opRegister = cg->evaluate(operand);
+   TR::Register *targetRegister = cg->allocateRegister(TR_FPR);
+
+   generateRegRegInstruction(SQRTSDRegReg, node, targetRegister, opRegister, cg);
+
+   node->setRegister(targetRegister);
+   cg->decReferenceCount(operand);
+   return targetRegister;
+   }
+
 TR::Register *OMR::X86::TreeEvaluator::faddEvaluator(TR::Node *node, TR::CodeGenerator *cg)
    {
    return TR::TreeEvaluator::fpBinaryArithmeticEvaluator(node, true, cg);

diff --git a/compiler/x/codegen/OMRTreeEvaluator.hpp b/compiler/x/codegen/OMRTreeEvaluator.hpp
@@ -279,6 +279,7 @@ class OMR_EXTENSIBLE TreeEvaluator: public OMR::TreeEvaluator
    static TR::Register *fpReturnEvaluator(TR::Node *node, TR::CodeGenerator *cg);
    static TR::Register *fpRemEvaluator(TR::Node *node, TR::CodeGenerator *cg);
    static TR::Register *fpSqrtEvaluator(TR::Node *node, TR::CodeGenerator *cg);
+   static TR::Register *dsqrtEvaluator(TR::Node *node, TR::CodeGenerator *cg);
 
    // routines for floating point values that can fit in one GPR
    static TR::Register *floatingPointStoreEvaluator(TR::Node *node, TR::CodeGenerator *cg);

diff --git a/compiler/x/env/OMRCPU.cpp b/compiler/x/env/OMRCPU.cpp
@@ -108,6 +108,12 @@ OMR::X86::CPU::getX86ProcessorFeatureFlags8()
    return self()->queryX86TargetCPUID()->_featureFlags8;
    }
 
+bool
+OMR::X86::CPU::getSupportsHardwareSQRT()
+   {
+   return true;
+   }
+
 bool
 OMR::X86::CPU::testOSForSSESupport()
    {

diff --git a/compiler/x/env/OMRCPU.hpp b/compiler/x/env/OMRCPU.hpp
@@ -62,6 +62,8 @@ class CPU : public OMR::CPU
    uint32_t getX86ProcessorFeatureFlags2();
    uint32_t getX86ProcessorFeatureFlags8();
 
+   bool getSupportsHardwareSQRT();
+
    bool testOSForSSESupport();