diff options
author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-12 15:25:58 +0000 |
---|---|---|
committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-12 15:25:58 +0000 |
commit | 1fd816803b3c7c2d0b138e06be578b833a132718 (patch) | |
tree | 3d0173cf8af5949767e7c3e6375d188e3277e530 | |
parent | 1012e50ac7c7cf42b8806f427e587ec4163bbea8 (diff) |
vm_insnhelper.c: inline array aref with integer
internal.h: define inlinable rb_ary_entry_internal.
array.c: use rb_ary_entry_internal.
* Benchmark
ruby --jit mame/optcarrot/bin/optcarrot --benchmark mame/optcarrot/examples/Lan_Master.nes
** Before
checksum: 59662
fps: 58.095175012159686
** After
fps: 59.874751599221526
checksum: 59662
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | array.c | 12 | ||||
-rw-r--r-- | internal.h | 16 | ||||
-rw-r--r-- | vm_insnhelper.c | 7 |
3 files changed, 23 insertions, 12 deletions
@@ -1209,17 +1209,7 @@ rb_ary_elt(VALUE ary, long offset) VALUE rb_ary_entry(VALUE ary, long offset) { - long len = RARRAY_LEN(ary); - const VALUE *ptr = RARRAY_CONST_PTR(ary); - if (len == 0) return Qnil; - if (offset < 0) { - offset += len; - if (offset < 0) return Qnil; - } - else if (len <= offset) { - return Qnil; - } - return ptr[offset]; + return rb_ary_entry_internal(ary, offset); } VALUE diff --git a/internal.h b/internal.h index 88a1f9210e..3ca1352505 100644 --- a/internal.h +++ b/internal.h @@ -1093,6 +1093,22 @@ VALUE rb_check_to_array(VALUE ary); }) #endif +static inline VALUE +rb_ary_entry_internal(VALUE ary, long offset) +{ + long len = RARRAY_LEN(ary); + const VALUE *ptr = RARRAY_CONST_PTR(ary); + if (len == 0) return Qnil; + if (offset < 0) { + offset += len; + if (offset < 0) return Qnil; + } + else if (len <= offset) { + return Qnil; + } + return ptr[offset]; +} + /* bignum.c */ extern const char ruby_digitmap[]; double rb_big_fdiv_double(VALUE x, VALUE y); diff --git a/vm_insnhelper.c b/vm_insnhelper.c index a0f63dfbc4..415070f852 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3647,7 +3647,12 @@ vm_opt_aref(VALUE recv, VALUE obj) } else if (RBASIC_CLASS(recv) == rb_cArray && BASIC_OP_UNREDEFINED_P(BOP_AREF, ARRAY_REDEFINED_OP_FLAG)) { - return rb_ary_aref1(recv, obj); + if (FIXNUM_P(obj)) { + return rb_ary_entry_internal(recv, FIX2LONG(obj)); + } + else { + return rb_ary_aref1(recv, obj); + } } else if (RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG)) { |