1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* gc.c (newobj_of): divide fast path and slow path

Browse Source 
to avoid register savings for fast path.
  This idea is given by Kazuho Oku <kazuho@natadeco.co>.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2015-10-07 11:18:17 +00:00
parent 9fe491e788
commit e2cabc22be
2 changed files with 77 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Oct 07 20:17:29 2015 Koichi Sasada <ko1@atdot.net>
* gc.c (newobj_of): divide fast path and slow path
to avoid register savings for fast path.
This idea is given by Kazuho Oku <kazuho@natadeco.co>.
Wed Oct 7 17:30:50 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Oct 7 17:30:50 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_times): optimize for the argument 0 and 1. * string.c (rb_str_times): optimize for the argument 0 and 1.

101
gc.c
View File

@ -1654,6 +1654,16 @@ heap_get_freeobj_from_next_freepage(rb_objspace_t *objspace, rb_heap_t *heap)
return p; return p;
} }
static inline VALUE
heap_get_freeobj_head(rb_objspace_t *objspace, rb_heap_t *heap)
{
RVALUE *p = heap->freelist;
if (LIKELY(p != NULL)) {
heap->freelist = p->as.free.next;
}
return (VALUE)p;
}
static inline VALUE static inline VALUE
heap_get_freeobj(rb_objspace_t *objspace, rb_heap_t *heap) heap_get_freeobj(rb_objspace_t *objspace, rb_heap_t *heap)
{ {
@ -1683,44 +1693,17 @@ gc_event_hook_body(rb_thread_t *th, rb_objspace_t *objspace, const rb_event_flag
EXEC_EVENT_HOOK(th, event, th->cfp->self, 0, 0, data); EXEC_EVENT_HOOK(th, event, th->cfp->self, 0, 0, data);
} }
#define gc_event_hook_needed_p(objspace, event) ((objspace)->hook_events & (event))
#define gc_event_hook(objspace, event, data) do { \ #define gc_event_hook(objspace, event, data) do { \
if (UNLIKELY((objspace)->hook_events & (event))) { \ if (gc_event_hook_needed_p(objspace, event)) { \
gc_event_hook_body(GET_THREAD(), (objspace), (event), (data)); \ gc_event_hook_body(GET_THREAD(), (objspace), (event), (data)); \
} \ } \
} while (0) } while (0)
static VALUE static inline VALUE
newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3) newobj_of_init(rb_objspace_t *objspace, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, VALUE obj, int hook_needed)
{ {
rb_objspace_t *objspace = &rb_objspace;
VALUE obj;
#if GC_DEBUG_STRESS_TO_CLASS
if (UNLIKELY(stress_to_class)) {
long i, cnt = RARRAY_LEN(stress_to_class);
const VALUE *ptr = RARRAY_CONST_PTR(stress_to_class);
for (i = 0; i < cnt; ++i) {
if (klass == ptr[i]) rb_memerror();
}
}
#endif
if (UNLIKELY(during_gc || ruby_gc_stressful)) {
if (during_gc) {
dont_gc = 1;
during_gc = 0;
rb_bug("object allocation during garbage collection phase");
}
if (ruby_gc_stressful) {
if (!garbage_collect(objspace, FALSE, FALSE, FALSE, GPR_FLAG_NEWOBJ)) {
rb_memerror();
}
}
}
obj = heap_get_freeobj(objspace, heap_eden);
if (RGENGC_CHECK_MODE > 0) assert(BUILTIN_TYPE(obj) == T_NONE); if (RGENGC_CHECK_MODE > 0) assert(BUILTIN_TYPE(obj) == T_NONE);
/* OBJSETUP */ /* OBJSETUP */
@ -1773,7 +1756,10 @@ newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3)
#endif #endif
objspace->total_allocated_objects++; objspace->total_allocated_objects++;
if (hook_needed) {
gc_event_hook(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj); gc_event_hook(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj);
}
gc_report(5, objspace, "newobj: %s\n", obj_info(obj)); gc_report(5, objspace, "newobj: %s\n", obj_info(obj));
#if RGENGC_OLD_NEWOBJ_CHECK > 0 #if RGENGC_OLD_NEWOBJ_CHECK > 0
@ -1798,6 +1784,57 @@ newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3)
return obj; return obj;
} }
NOINLINE(static VALUE newobj_of_slowpass(rb_objspace_t *objspace, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int hook_needed));
static VALUE
newobj_of_slowpass(rb_objspace_t *objspace, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int hook_needed)
{
VALUE obj;
if (UNLIKELY(during_gc || ruby_gc_stressful)) {
if (during_gc) {
dont_gc = 1;
during_gc = 0;
rb_bug("object allocation during garbage collection phase");
}
if (ruby_gc_stressful) {
if (!garbage_collect(objspace, FALSE, FALSE, FALSE, GPR_FLAG_NEWOBJ)) {
rb_memerror();
}
}
}
obj = heap_get_freeobj(objspace, heap_eden);
return newobj_of_init(objspace, klass, flags, v1, v2, v3, obj, hook_needed);
}
static VALUE
newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3)
{
rb_objspace_t *objspace = &rb_objspace;
VALUE obj;
int hook_needed = gc_event_hook_needed_p(objspace, RUBY_INTERNAL_EVENT_NEWOBJ);
#if GC_DEBUG_STRESS_TO_CLASS
if (UNLIKELY(stress_to_class)) {
long i, cnt = RARRAY_LEN(stress_to_class);
const VALUE *ptr = RARRAY_CONST_PTR(stress_to_class);
for (i = 0; i < cnt; ++i) {
if (klass == ptr[i]) rb_memerror();
}
}
#endif
if (LIKELY(!(during_gc || ruby_gc_stressful) && hook_needed == FALSE &&
(obj = heap_get_freeobj_head(objspace, heap_eden)) != Qfalse)) {
return newobj_of_init(objspace, klass, flags, v1, v2, v3, obj, FALSE);
}
else {
return newobj_of_slowpass(objspace, klass, flags, v1, v2, v3, hook_needed);
}
}
VALUE VALUE
rb_newobj(void) rb_newobj(void)
{ {