kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

insns.def: float comparison

Browse source 
* insns.def (opt_lt, opt_le, opt_gt, opt_ge): optimize flonum and
  on-heap float comparison.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-01-13 05:49:43 +00:00
parent c2c0157040
commit 5dc87d5ba3
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
insns.def
View file

@ -1645,17 +1645,11 @@ opt_lt
/* flonum is not NaN */ /* flonum is not NaN */
val = RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj) ? Qtrue : Qfalse; val = RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
} }
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) { else if (FLOAT_INSTANCE_P(recv) && FLOAT_INSTANCE_P(obj) &&
if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat && BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) {
BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) { val = double_cmp_lt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj));
val = double_cmp_lt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj));
}
else {
goto INSN_LABEL(normal_dispatch);
}
} }
else { else {
INSN_LABEL(normal_dispatch):
PUSH(recv); PUSH(recv);
PUSH(obj); PUSH(obj);
CALL_SIMPLE_METHOD(recv); CALL_SIMPLE_METHOD(recv);
@ -1689,6 +1683,10 @@ opt_le
/* flonum is not NaN */ /* flonum is not NaN */
val = RFLOAT_VALUE(recv) <= RFLOAT_VALUE(obj) ? Qtrue : Qfalse; val = RFLOAT_VALUE(recv) <= RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
} }
else if (FLOAT_INSTANCE_P(recv) && FLOAT_INSTANCE_P(obj) &&
BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) {
val = double_cmp_le(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj));
}
else { else {
/* other */ /* other */
PUSH(recv); PUSH(recv);
@ -1724,17 +1722,11 @@ opt_gt
/* flonum is not NaN */ /* flonum is not NaN */
val = RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj) ? Qtrue : Qfalse; val = RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
} }
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) { else if (FLOAT_INSTANCE_P(recv) && FLOAT_INSTANCE_P(obj) &&
if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat && BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) {
BASIC_OP_UNREDEFINED_P(BOP_GT, FLOAT_REDEFINED_OP_FLAG)) { val = double_cmp_gt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj));
val = double_cmp_gt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj));
}
else {
goto INSN_LABEL(normal_dispatch);
}
} }
else { else {
INSN_LABEL(normal_dispatch):
PUSH(recv); PUSH(recv);
PUSH(obj); PUSH(obj);
CALL_SIMPLE_METHOD(recv); CALL_SIMPLE_METHOD(recv);
@ -1768,6 +1760,10 @@ opt_ge
/* flonum is not NaN */ /* flonum is not NaN */
val = RFLOAT_VALUE(recv) >= RFLOAT_VALUE(obj) ? Qtrue : Qfalse; val = RFLOAT_VALUE(recv) >= RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
} }
else if (FLOAT_INSTANCE_P(recv) && FLOAT_INSTANCE_P(obj) &&
BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) {
val = double_cmp_ge(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj));
}
else { else {
PUSH(recv); PUSH(recv);
PUSH(obj); PUSH(obj);

2
vm_insnhelper.h
View file

@ -166,6 +166,8 @@ enum vm_regan_acttype {
#else #else
#define FLONUM_2_P(a, b) 0 #define FLONUM_2_P(a, b) 0
#endif #endif
#define FLOAT_HEAP_P(x) (!SPECIAL_CONST_P(x) && RBASIC_CLASS(x) == rb_cFloat)
#define FLOAT_INSTANCE_P(x) (FLONUM_P(x) || FLOAT_HEAP_P(x))
#ifndef USE_IC_FOR_SPECIALIZED_METHOD #ifndef USE_IC_FOR_SPECIALIZED_METHOD
#define USE_IC_FOR_SPECIALIZED_METHOD 1 #define USE_IC_FOR_SPECIALIZED_METHOD 1