mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
ed935aa5be
which has been developed by Takashi Kokubun <takashikkbn@gmail> as YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>. This JIT compiler is designed to be a safe migration path to introduce JIT compiler to MRI. So this commit does not include any bytecode changes or dynamic instruction modifications, which are done in original MJIT. This commit even strips off some aggressive optimizations from YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still fairly faster than Ruby 2.5 in some benchmarks (attached below). Note that this JIT compiler passes `make test`, `make test-all`, `make test-spec` without JIT, and even with JIT. Not only it's perfectly safe with JIT disabled because it does not replace VM instructions unlike MJIT, but also with JIT enabled it stably runs Ruby applications including Rails applications. I'm expecting this version as just "initial" JIT compiler. I have many optimization ideas which are skipped for initial merging, and you may easily replace this JIT compiler with a faster one by just replacing mjit_compile.c. `mjit_compile` interface is designed for the purpose. common.mk: update dependencies for mjit_compile.c. internal.h: declare `rb_vm_insn_addr2insn` for MJIT. vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to compiler. This avoids to include some functions which take a long time to compile, e.g. vm_exec_core. Some of the purpose is achieved in transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are manually resolved for now. Load mjit_helper.h for MJIT header. mjit_helper.h: New. This is a file used only by JIT-ed code. I'll refactor `mjit_call_cfunc` later. vm_eval.c: add some #ifdef switches to skip compiling some functions like Init_vm_eval. win32/mkexports.rb: export thread/ec functions, which are used by MJIT. include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify that a function is exported only for MJIT. array.c: export a function used by MJIT. bignum.c: ditto. class.c: ditto. compile.c: ditto. error.c: ditto. gc.c: ditto. hash.c: ditto. iseq.c: ditto. numeric.c: ditto. object.c: ditto. proc.c: ditto. re.c: ditto. st.c: ditto. string.c: ditto. thread.c: ditto. variable.c: ditto. vm_backtrace.c: ditto. vm_insnhelper.c: ditto. vm_method.c: ditto. I would like to improve maintainability of function exports, but I believe this way is acceptable as initial merging if we clarify the new exports are for MJIT (so that we can use them as TODO list to fix) and add unit tests to detect unresolved symbols. I'll add unit tests of JIT compilations in succeeding commits. Author: Takashi Kokubun <takashikkbn@gmail.com> Contributor: wanabe <s.wanabe@gmail.com> Part of [Feature #14235] --- * Known issues * Code generated by gcc is faster than clang. The benchmark may be worse in macOS. Following benchmark result is provided by gcc w/ Linux. * Performance is decreased when Google Chrome is running * JIT can work on MinGW, but it doesn't improve performance at least in short running benchmark. * Currently it doesn't perform well with Rails. We'll try to fix this before release. --- * Benchmark reslts Benchmarked with: Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores - 2.0.0-p0: Ruby 2.0.0-p0 - r62186: Ruby trunk (early 2.6.0), before MJIT changes - JIT off: On this commit, but without `--jit` option - JIT on: On this commit, and with `--jit` option ** Optcarrot fps Benchmark: https://github.com/mame/optcarrot | |2.0.0-p0 |r62186 |JIT off |JIT on | |:--------|:--------|:--------|:--------|:--------| |fps |37.32 |51.46 |51.31 |58.88 | |vs 2.0.0 |1.00x |1.38x |1.37x |1.58x | ** MJIT benchmarks Benchmark: https://github.com/benchmark-driver/mjit-benchmarks (Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks) | |2.0.0-p0 |r62186 |JIT off |JIT on | |:----------|:--------|:--------|:--------|:--------| |aread |1.00 |1.09 |1.07 |2.19 | |aref |1.00 |1.13 |1.11 |2.22 | |aset |1.00 |1.50 |1.45 |2.64 | |awrite |1.00 |1.17 |1.13 |2.20 | |call |1.00 |1.29 |1.26 |2.02 | |const2 |1.00 |1.10 |1.10 |2.19 | |const |1.00 |1.11 |1.10 |2.19 | |fannk |1.00 |1.04 |1.02 |1.00 | |fib |1.00 |1.32 |1.31 |1.84 | |ivread |1.00 |1.13 |1.12 |2.43 | |ivwrite |1.00 |1.23 |1.21 |2.40 | |mandelbrot |1.00 |1.13 |1.16 |1.28 | |meteor |1.00 |2.97 |2.92 |3.17 | |nbody |1.00 |1.17 |1.15 |1.49 | |nest-ntimes|1.00 |1.22 |1.20 |1.39 | |nest-while |1.00 |1.10 |1.10 |1.37 | |norm |1.00 |1.18 |1.16 |1.24 | |nsvb |1.00 |1.16 |1.16 |1.17 | |red-black |1.00 |1.02 |0.99 |1.12 | |sieve |1.00 |1.30 |1.28 |1.62 | |trees |1.00 |1.14 |1.13 |1.19 | |while |1.00 |1.12 |1.11 |2.41 | ** Discourse's script/bench.rb Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb NOTE: Rails performance was somehow a little degraded with JIT for now. We should fix this. (At least I know opt_aref is performing badly in JIT and I have an idea to fix it. Please wait for the fix.) *** JIT off Your Results: (note for timings- percentile is first, duration is second in millisecs) categories_admin: 50: 17 75: 18 90: 22 99: 29 home_admin: 50: 21 75: 21 90: 27 99: 40 topic_admin: 50: 17 75: 18 90: 22 99: 32 categories: 50: 35 75: 41 90: 43 99: 77 home: 50: 39 75: 46 90: 49 99: 95 topic: 50: 46 75: 52 90: 56 99: 101 *** JIT on Your Results: (note for timings- percentile is first, duration is second in millisecs) categories_admin: 50: 19 75: 21 90: 25 99: 33 home_admin: 50: 24 75: 26 90: 30 99: 35 topic_admin: 50: 19 75: 20 90: 25 99: 30 categories: 50: 40 75: 44 90: 48 99: 76 home: 50: 42 75: 48 90: 51 99: 89 topic: 50: 49 75: 55 90: 58 99: 99 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
141 lines
4.7 KiB
C
141 lines
4.7 KiB
C
/**********************************************************************
|
|
|
|
mjit.h - Interface to MRI method JIT compiler
|
|
|
|
Copyright (C) 2017 Vladimir Makarov <vmakarov@redhat.com>.
|
|
|
|
**********************************************************************/
|
|
|
|
#ifndef RUBY_MJIT_H
|
|
#define RUBY_MJIT_H 1
|
|
|
|
#include "ruby.h"
|
|
|
|
/* Special address values of a function generated from the
|
|
corresponding iseq by MJIT: */
|
|
enum rb_mjit_iseq_func {
|
|
/* ISEQ was not queued yet for the machine code generation */
|
|
NOT_ADDED_JIT_ISEQ_FUNC = 0,
|
|
/* ISEQ is already queued for the machine code generation but the
|
|
code is not ready yet for the execution */
|
|
NOT_READY_JIT_ISEQ_FUNC = 1,
|
|
/* ISEQ included not compilable insn or some assertion failed */
|
|
NOT_COMPILABLE_JIT_ISEQ_FUNC = 2,
|
|
/* End mark */
|
|
LAST_JIT_ISEQ_FUNC = 3,
|
|
};
|
|
|
|
/* C compiler used to generate native code. */
|
|
enum rb_mjit_cc {
|
|
/* Not selected */
|
|
MJIT_CC_DEFAULT = 0,
|
|
/* GNU Compiler Collection */
|
|
MJIT_CC_GCC = 1,
|
|
/* LLVM/Clang */
|
|
MJIT_CC_CLANG = 2,
|
|
};
|
|
|
|
/* MJIT options which can be defined on the MRI command line. */
|
|
struct mjit_options {
|
|
char on; /* flag of MJIT usage */
|
|
/* Default: clang for macOS, cl for Windows, gcc for others. */
|
|
enum rb_mjit_cc cc;
|
|
/* Save temporary files after MRI finish. The temporary files
|
|
include the pre-compiled header, C code file generated for ISEQ,
|
|
and the corresponding object file. */
|
|
char save_temps;
|
|
/* Print MJIT warnings to stderr. */
|
|
char warnings;
|
|
/* Disable compiler optimization and add debug symbols. It can be
|
|
very slow. */
|
|
char debug;
|
|
/* If not 0, all ISeqs are synchronously compiled. For testing. */
|
|
unsigned int wait;
|
|
/* Number of calls to trigger JIT compilation. For testing. */
|
|
unsigned int min_calls;
|
|
/* Force printing info about MJIT work of level VERBOSE or
|
|
less. 0=silence, 1=medium, 2=verbose. */
|
|
int verbose;
|
|
/* Maximal permitted number of iseq JIT codes in a MJIT memory
|
|
cache. */
|
|
int max_cache_size;
|
|
};
|
|
|
|
typedef VALUE (*mjit_func_t)(rb_execution_context_t *, rb_control_frame_t *);
|
|
|
|
RUBY_SYMBOL_EXPORT_BEGIN
|
|
extern struct mjit_options mjit_opts;
|
|
extern int mjit_init_p;
|
|
|
|
extern void mjit_add_iseq_to_process(const rb_iseq_t *iseq);
|
|
extern mjit_func_t mjit_get_iseq_func(const struct rb_iseq_constant_body *body);
|
|
RUBY_SYMBOL_EXPORT_END
|
|
|
|
extern int mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *funcname);
|
|
extern void mjit_init(struct mjit_options *opts);
|
|
extern void mjit_finish(void);
|
|
extern void mjit_gc_start_hook(void);
|
|
extern void mjit_gc_finish_hook(void);
|
|
extern void mjit_free_iseq(const rb_iseq_t *iseq);
|
|
extern void mjit_mark(void);
|
|
extern struct mjit_cont *mjit_cont_new(rb_execution_context_t *ec);
|
|
extern void mjit_cont_free(struct mjit_cont *cont);
|
|
extern void mjit_add_class_serial(rb_serial_t class_serial);
|
|
extern void mjit_remove_class_serial(rb_serial_t class_serial);
|
|
extern int mjit_valid_class_serial_p(rb_serial_t class_serial);
|
|
|
|
/* A threshold used to reject long iseqs from JITting as such iseqs
|
|
takes too much time to be compiled. */
|
|
#define JIT_ISEQ_SIZE_THRESHOLD 1000
|
|
|
|
/* Return TRUE if given ISeq body should be compiled by MJIT */
|
|
static inline int
|
|
mjit_target_iseq_p(struct rb_iseq_constant_body *body)
|
|
{
|
|
return (body->type == ISEQ_TYPE_METHOD || body->type == ISEQ_TYPE_BLOCK)
|
|
&& body->iseq_size < JIT_ISEQ_SIZE_THRESHOLD;
|
|
}
|
|
|
|
/* Try to execute the current iseq in ec. Use JIT code if it is ready.
|
|
If it is not, add ISEQ to the compilation queue and return Qundef. */
|
|
static inline VALUE
|
|
mjit_exec(rb_execution_context_t *ec)
|
|
{
|
|
const rb_iseq_t *iseq;
|
|
struct rb_iseq_constant_body *body;
|
|
long unsigned total_calls;
|
|
mjit_func_t func;
|
|
|
|
if (!mjit_init_p)
|
|
return Qundef;
|
|
|
|
iseq = ec->cfp->iseq;
|
|
body = iseq->body;
|
|
total_calls = ++body->total_calls;
|
|
|
|
func = body->jit_func;
|
|
if (UNLIKELY(mjit_opts.wait && mjit_opts.min_calls == total_calls && mjit_target_iseq_p(body)
|
|
&& (enum rb_mjit_iseq_func)func == NOT_ADDED_JIT_ISEQ_FUNC)) {
|
|
mjit_add_iseq_to_process(iseq);
|
|
func = mjit_get_iseq_func(body);
|
|
}
|
|
|
|
if (UNLIKELY((ptrdiff_t)func <= (ptrdiff_t)LAST_JIT_ISEQ_FUNC)) {
|
|
switch ((enum rb_mjit_iseq_func)func) {
|
|
case NOT_ADDED_JIT_ISEQ_FUNC:
|
|
if (total_calls == mjit_opts.min_calls && mjit_target_iseq_p(body)) {
|
|
mjit_add_iseq_to_process(iseq);
|
|
}
|
|
return Qundef;
|
|
case NOT_READY_JIT_ISEQ_FUNC:
|
|
case NOT_COMPILABLE_JIT_ISEQ_FUNC:
|
|
return Qundef;
|
|
default: /* to avoid warning with LAST_JIT_ISEQ_FUNC */
|
|
break;
|
|
}
|
|
}
|
|
|
|
return func(ec, ec->cfp);
|
|
}
|
|
|
|
#endif /* RUBY_MJIT_H */
|