mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
8a15857a7f
if catch_except_p is FALSE. If catch_except_p is TRUE, stack values should be on VM's stack when exception is thrown and the JIT-ed frame is re-executed by VM's exception handler. If it's FALSE, the JIT-ed frame won't be re-executed and don't need to keep values on VM's stack. Using local variables allows us to reduce cfp->sp motion. Moving cfp->sp is needed only for insns whose handles_frame? is false. So it improves performance. _mjit_compile_insn.erb: Prepare `stack_size` variable for GET_SP, STACK_ADDR_FROM_TOP, TOPN macros. Share pc and sp motion partial view. Use cancel handler created in mjit_compile.c. _mjit_compile_send.erb: ditto. Also, when iseq->body->catch_except_p is TRUE, this stops to call mjit_exec directly. I described the reason in vm_insnhelper.h's comment for EXEC_EC_CFP. _mjit_compile_pc_and_sp.erb: Shared logic for moving sp and pc. As you can see from thsi file, when status->local_stack_p is TRUE and insn.handles_frame? is false, moving sp is skipped. But if insn.handles_frame? is true, values should be rolled back to VM's stack. common.mk: add dependency for the file _mjit_compile_insn_body.erb: Set sp value before canceling JIT on DISPATCH_ORIGINAL_INSN. Replace GET_SP, STACK_ADDR_FROM_TOP, TOPN macros for the case ocal_stack_p is TRUE and insn.handles_frame? is false. In that case, values are not available on VM's stack and those macros should be replaced. mjit_compile.inc.erb: updated comments of macros which are supported by JIT compiler. All references to `cfp->sp` should be replaced and thus INC_SP, SET_SV, PUSH are no longer supported for now, because they are not used now. vm_exec.h: moved EXEC_EC_CFP definition to vm_insnhelper.h because it's tighly coupled to CALL_METHOD. vm_insnhelper.h: Have revised EXEC_EC_CFP definition moved from vm_exec.h. Now it triggers mjit_exec for VM, and has the guard for catch_except_p on JIT-ed code. See comments for details. CALL_METHOD delegates triggering mjit_exec to EXEC_EC_CFP. insns.def: Stopped using EXEC_EC_CFP for the case we don't want to trigger mjit_exec. Those insns (defineclass, opt_call_c_function) are not supported by JIT and it's safe to use RESTORE_REGS(), NEXT_INSN(). expandarray is changed to pass GET_SP() to replace the macro in _mjit_compile_insn_body.erb. vm_insnhelper.c: change to take sp for the above reason. [close https://github.com/ruby/ruby/pull/1828] This patch resurrects the performance which was attached in [Feature #14235]. * Benchmark Optcarrot (with configuration for benchmark_driver.gem) https://github.com/benchmark-driver/optcarrot $ benchmark-driver benchmark.yml --verbose 1 --rbenv 'before;before+JIT::before,--jit;after;after+JIT::after,--jit' --repeat-count 10 before: ruby 2.6.0dev (2018-03-04 trunk 62652) [x86_64-linux] before+JIT: ruby 2.6.0dev (2018-03-04 trunk 62652) +JIT [x86_64-linux] after: ruby 2.6.0dev (2018-03-04 local-variable.. 62652) [x86_64-linux] last_commit=mjit_compile.c: use local variables for stack after+JIT: ruby 2.6.0dev (2018-03-04 local-variable.. 62652) +JIT [x86_64-linux] last_commit=mjit_compile.c: use local variables for stack Calculating ------------------------------------- before before+JIT after after+JIT optcarrot 53.552 59.680 53.697 63.358 fps Comparison: optcarrot after+JIT: 63.4 fps before+JIT: 59.7 fps - 1.06x slower after: 53.7 fps - 1.18x slower before: 53.6 fps - 1.18x slower git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
202 lines
4.9 KiB
C
202 lines
4.9 KiB
C
/**********************************************************************
|
|
|
|
vm.h -
|
|
|
|
$Author$
|
|
created at: 04/01/01 16:56:59 JST
|
|
|
|
Copyright (C) 2004-2007 Koichi Sasada
|
|
|
|
**********************************************************************/
|
|
|
|
#ifndef RUBY_VM_EXEC_H
|
|
#define RUBY_VM_EXEC_H
|
|
|
|
typedef long OFFSET;
|
|
typedef unsigned long lindex_t;
|
|
typedef VALUE GENTRY;
|
|
typedef rb_iseq_t *ISEQ;
|
|
|
|
#ifdef __GCC__
|
|
/* TODO: machine dependent prefetch instruction */
|
|
#define PREFETCH(pc)
|
|
#else
|
|
#define PREFETCH(pc)
|
|
#endif
|
|
|
|
#if VMDEBUG > 0
|
|
#define debugs printf
|
|
#define DEBUG_ENTER_INSN(insn) \
|
|
rb_vmdebug_debug_print_pre(ec, GET_CFP(), GET_PC());
|
|
|
|
#if OPT_STACK_CACHING
|
|
#define SC_REGS() , reg_a, reg_b
|
|
#else
|
|
#define SC_REGS()
|
|
#endif
|
|
|
|
#define DEBUG_END_INSN() \
|
|
rb_vmdebug_debug_print_post(th, GET_CFP() SC_REGS());
|
|
|
|
#else
|
|
|
|
#define debugs
|
|
#define DEBUG_ENTER_INSN(insn)
|
|
#define DEBUG_END_INSN()
|
|
#endif
|
|
|
|
#define throwdebug if(0)printf
|
|
/* #define throwdebug printf */
|
|
|
|
/************************************************/
|
|
#if defined(DISPATCH_XXX)
|
|
error !
|
|
/************************************************/
|
|
#elif OPT_CALL_THREADED_CODE
|
|
|
|
#define LABEL(x) insn_func_##x
|
|
#define ELABEL(x)
|
|
#define LABEL_PTR(x) &LABEL(x)
|
|
|
|
#define INSN_ENTRY(insn) \
|
|
static rb_control_frame_t * \
|
|
FUNC_FASTCALL(LABEL(insn))(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp) {
|
|
|
|
#define END_INSN(insn) return reg_cfp;}
|
|
|
|
#define NEXT_INSN() return reg_cfp;
|
|
|
|
#define START_OF_ORIGINAL_INSN(x) /* ignore */
|
|
#define DISPATCH_ORIGINAL_INSN(x) return LABEL(x)(ec, reg_cfp);
|
|
|
|
/************************************************/
|
|
#elif OPT_TOKEN_THREADED_CODE || OPT_DIRECT_THREADED_CODE
|
|
/* threaded code with gcc */
|
|
|
|
#define LABEL(x) INSN_LABEL_##x
|
|
#define ELABEL(x) INSN_ELABEL_##x
|
|
#define LABEL_PTR(x) RB_GNUC_EXTENSION(&&LABEL(x))
|
|
|
|
#define INSN_ENTRY_SIG(insn) \
|
|
if (0) fprintf(stderr, "exec: %s@(%d, %d)@%s:%d\n", #insn, \
|
|
(int)(reg_pc - reg_cfp->iseq->body->iseq_encoded), \
|
|
(int)(reg_cfp->pc - reg_cfp->iseq->body->iseq_encoded), \
|
|
RSTRING_PTR(rb_iseq_path(reg_cfp->iseq)), \
|
|
(int)(rb_iseq_line_no(reg_cfp->iseq, reg_pc - reg_cfp->iseq->body->iseq_encoded)));
|
|
|
|
#define INSN_DISPATCH_SIG(insn)
|
|
|
|
#define INSN_ENTRY(insn) \
|
|
LABEL(insn): \
|
|
INSN_ENTRY_SIG(insn); \
|
|
|
|
/* dispatcher */
|
|
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && __GNUC__ == 3
|
|
#define DISPATCH_ARCH_DEPEND_WAY(addr) \
|
|
__asm__ __volatile__("jmp *%0;\t# -- inserted by vm.h\t[length = 2]" : : "r" (addr))
|
|
|
|
#else
|
|
#define DISPATCH_ARCH_DEPEND_WAY(addr) \
|
|
/* do nothing */
|
|
#endif
|
|
|
|
/**********************************/
|
|
#if OPT_DIRECT_THREADED_CODE
|
|
|
|
/* for GCC 3.4.x */
|
|
#define TC_DISPATCH(insn) \
|
|
INSN_DISPATCH_SIG(insn); \
|
|
RB_GNUC_EXTENSION_BLOCK(goto *(void const *)GET_CURRENT_INSN()); \
|
|
;
|
|
|
|
#else
|
|
/* token threaded code */
|
|
|
|
#define TC_DISPATCH(insn) \
|
|
DISPATCH_ARCH_DEPEND_WAY(insns_address_table[GET_CURRENT_INSN()]); \
|
|
INSN_DISPATCH_SIG(insn); \
|
|
RB_GNUC_EXTENSION_BLOCK(goto *insns_address_table[GET_CURRENT_INSN()]); \
|
|
rb_bug("tc error");
|
|
|
|
|
|
#endif /* DISPATCH_DIRECT_THREADED_CODE */
|
|
|
|
#define END_INSN(insn) \
|
|
DEBUG_END_INSN(); \
|
|
TC_DISPATCH(insn);
|
|
|
|
#define INSN_DISPATCH() \
|
|
TC_DISPATCH(__START__) \
|
|
{
|
|
|
|
#define END_INSNS_DISPATCH() \
|
|
rb_bug("unknown insn: %"PRIdVALUE, GET_CURRENT_INSN()); \
|
|
} /* end of while loop */ \
|
|
|
|
#define NEXT_INSN() TC_DISPATCH(__NEXT_INSN__)
|
|
|
|
#define START_OF_ORIGINAL_INSN(x) start_of_##x:
|
|
#define DISPATCH_ORIGINAL_INSN(x) goto start_of_##x;
|
|
|
|
/************************************************/
|
|
#else /* no threaded code */
|
|
/* most common method */
|
|
|
|
#define INSN_ENTRY(insn) \
|
|
case BIN(insn):
|
|
|
|
#define END_INSN(insn) \
|
|
DEBUG_END_INSN(); \
|
|
break;
|
|
|
|
#define INSN_DISPATCH() \
|
|
while (1) { \
|
|
switch (GET_CURRENT_INSN()) {
|
|
|
|
#define END_INSNS_DISPATCH() \
|
|
default: \
|
|
SDR(); \
|
|
rb_bug("unknown insn: %ld", GET_CURRENT_INSN()); \
|
|
} /* end of switch */ \
|
|
} /* end of while loop */ \
|
|
|
|
#define NEXT_INSN() goto first
|
|
|
|
#define START_OF_ORIGINAL_INSN(x) start_of_##x:
|
|
#define DISPATCH_ORIGINAL_INSN(x) goto start_of_##x;
|
|
|
|
#endif
|
|
|
|
#define VM_SP_CNT(ec, sp) ((sp) - (ec)->vm_stack)
|
|
|
|
#ifdef MJIT_HEADER
|
|
#define THROW_EXCEPTION(exc) do { \
|
|
ec->errinfo = (VALUE)(exc); \
|
|
EC_JUMP_TAG(ec, ec->tag->state); \
|
|
} while (0)
|
|
#else
|
|
#if OPT_CALL_THREADED_CODE
|
|
#define THROW_EXCEPTION(exc) do { \
|
|
ec->errinfo = (VALUE)(exc); \
|
|
return 0; \
|
|
} while (0)
|
|
#else
|
|
#define THROW_EXCEPTION(exc) return (VALUE)(exc)
|
|
#endif
|
|
#endif
|
|
|
|
#define SCREG(r) (reg_##r)
|
|
|
|
#define VM_DEBUG_STACKOVERFLOW 0
|
|
|
|
#if VM_DEBUG_STACKOVERFLOW
|
|
#define CHECK_VM_STACK_OVERFLOW_FOR_INSN(cfp, margin) \
|
|
WHEN_VM_STACK_OVERFLOWED(cfp, (cfp)->sp, margin) vm_stack_overflow_for_insn()
|
|
#else
|
|
#define CHECK_VM_STACK_OVERFLOW_FOR_INSN(cfp, margin)
|
|
#endif
|
|
|
|
#define INSN_LABEL2(insn, name) INSN_LABEL_ ## insn ## _ ## name
|
|
#define INSN_LABEL(x) INSN_LABEL2(NAME_OF_CURRENT_INSN, x)
|
|
|
|
#endif /* RUBY_VM_EXEC_H */
|