src/hotspot/share/opto/library_call.cpp

*** 225,234 ****
--- 225,235 ----
    bool inline_string_char_access(bool is_store);
    Node* round_double_node(Node* n);
    bool runtime_math(const TypeFunc* call_type, address funcAddr, const char* funcName);
    bool inline_math_native(vmIntrinsics::ID id);
    bool inline_math(vmIntrinsics::ID id);
+   bool inline_double_math(vmIntrinsics::ID id);
    template <typename OverflowOp>
    bool inline_math_overflow(Node* arg1, Node* arg2);
    void inline_math_mathExact(Node* math, Node* test);
    bool inline_math_addExactI(bool is_increment);
    bool inline_math_addExactL(bool is_increment);
*** 531,540 ****
--- 532,544 ----
  
    case vmIntrinsics::_dsin:
    case vmIntrinsics::_dcos:
    case vmIntrinsics::_dtan:
    case vmIntrinsics::_dabs:
+   case vmIntrinsics::_fabs:
+   case vmIntrinsics::_iabs:
+   case vmIntrinsics::_labs:
    case vmIntrinsics::_datan2:
    case vmIntrinsics::_dsqrt:
    case vmIntrinsics::_dexp:
    case vmIntrinsics::_dlog:
    case vmIntrinsics::_dlog10:
*** 1791,1801 ****
  //------------------------------inline_math-----------------------------------
  // public static double Math.abs(double)
  // public static double Math.sqrt(double)
  // public static double Math.log(double)
  // public static double Math.log10(double)
! bool LibraryCallKit::inline_math(vmIntrinsics::ID id) {
    Node* arg = round_double_node(argument(0));
    Node* n = NULL;
    switch (id) {
    case vmIntrinsics::_dabs:   n = new AbsDNode(                arg);  break;
    case vmIntrinsics::_dsqrt:  n = new SqrtDNode(C, control(),  arg);  break;
--- 1795,1805 ----
  //------------------------------inline_math-----------------------------------
  // public static double Math.abs(double)
  // public static double Math.sqrt(double)
  // public static double Math.log(double)
  // public static double Math.log10(double)
! bool LibraryCallKit::inline_double_math(vmIntrinsics::ID id) {
    Node* arg = round_double_node(argument(0));
    Node* n = NULL;
    switch (id) {
    case vmIntrinsics::_dabs:   n = new AbsDNode(                arg);  break;
    case vmIntrinsics::_dsqrt:  n = new SqrtDNode(C, control(),  arg);  break;
*** 1803,1812 ****
--- 1807,1833 ----
    }
    set_result(_gvn.transform(n));
    return true;
  }
  
+ //------------------------------inline_math-----------------------------------
+ // public static float Math.abs(float)
+ // public static int Math.abs(int)
+ // public static long Math.abs(long)
+ bool LibraryCallKit::inline_math(vmIntrinsics::ID id) {
+   Node* arg = argument(0);
+   Node* n = NULL;
+   switch (id) {
+   case vmIntrinsics::_fabs:   n = new AbsFNode(                arg);  break;
+   case vmIntrinsics::_iabs:   n = new AbsINode(                arg);  break;
+   case vmIntrinsics::_labs:   n = new AbsLNode(                arg);  break;
+   default:  fatal_unexpected_iid(id);  break;
+   }
+   set_result(_gvn.transform(n));
+   return true;
+ }
+ 
  //------------------------------runtime_math-----------------------------
  bool LibraryCallKit::runtime_math(const TypeFunc* call_type, address funcAddr, const char* funcName) {
    assert(call_type == OptoRuntime::Math_DD_D_Type() || call_type == OptoRuntime::Math_D_D_Type(),
           "must be (DD)D or (D)D type");
  
*** 1853,1864 ****
      return StubRoutines::dlog10() != NULL ?
        runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dlog10(), "dlog10") :
        runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dlog10), "LOG10");
  
      // These intrinsics are supported on all hardware
!   case vmIntrinsics::_dsqrt:  return Matcher::match_rule_supported(Op_SqrtD) ? inline_math(id) : false;
!   case vmIntrinsics::_dabs:   return Matcher::has_match_rule(Op_AbsD)   ? inline_math(id) : false;
  
    case vmIntrinsics::_dexp:
      return StubRoutines::dexp() != NULL ?
        runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dexp(),  "dexp") :
        runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dexp),  "EXP");
--- 1874,1888 ----
      return StubRoutines::dlog10() != NULL ?
        runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dlog10(), "dlog10") :
        runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dlog10), "LOG10");
  
      // These intrinsics are supported on all hardware
!   case vmIntrinsics::_dsqrt:  return Matcher::match_rule_supported(Op_SqrtD) ? inline_double_math(id) : false;
!   case vmIntrinsics::_dabs:   return Matcher::has_match_rule(Op_AbsD)   ? inline_double_math(id) : false;
!   case vmIntrinsics::_fabs:   return Matcher::match_rule_supported(Op_AbsF)   ? inline_math(id) : false;
!   case vmIntrinsics::_iabs:   return Matcher::match_rule_supported(Op_AbsI)   ? inline_math(id) : false;
!   case vmIntrinsics::_labs:   return Matcher::match_rule_supported(Op_AbsL)   ? inline_math(id) : false;
  
    case vmIntrinsics::_dexp:
      return StubRoutines::dexp() != NULL ?
        runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dexp(),  "dexp") :
        runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dexp),  "EXP");