mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
c86fc2bba5
This retries r62655, which was reverted at r63863 for r63763. tool/ruby_vm/views/_mjit_compile_insn.erb: revert the revert. tool/ruby_vm/views/_mjit_compile_insn_body.erb: ditto. tool/ruby_vm/views/_mjit_compile_pc_and_sp.erb: ditto. tool/ruby_vm/views/_mjit_compile_send.erb: ditto. tool/ruby_vm/views/mjit_compile.inc.erb: ditto. tool/ruby_vm/views/_insn_entry.erb: revert half of r63763. The commit was originally reverted since changing pc motion was bad for tracing, but changing sp motion was totally fine. For JIT, I wanna resurrect the sp motion change in r62051. tool/ruby_vm/models/bare_instructions.rb: ditto. insns.def: ditto. vm_insnhelper.c: ditto. vm_insnhelper.h: ditto. * benchmark $ benchmark-driver benchmark.yml --rbenv 'before;after;before --jit;after --jit' --repeat-count 12 -v before: ruby 2.6.0dev (2018-07-19 trunk 63998) [x86_64-linux] after: ruby 2.6.0dev (2018-07-19 add-sp 63998) [x86_64-linux] last_commit=mjit_compile.c: reduce sp motion on JIT before --jit: ruby 2.6.0dev (2018-07-19 trunk 63998) +JIT [x86_64-linux] after --jit: ruby 2.6.0dev (2018-07-19 add-sp 63998) +JIT [x86_64-linux] last_commit=mjit_compile.c: reduce sp motion on JIT Calculating ------------------------------------- before after before --jit after --jit Optcarrot Lan_Master.nes 51.354 50.238 70.010 72.139 fps Comparison: Optcarrot Lan_Master.nes after --jit: 72.1 fps before --jit: 70.0 fps - 1.03x slower before: 51.4 fps - 1.40x slower after: 50.2 fps - 1.44x slower git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
105 lines
4.5 KiB
Text
105 lines
4.5 KiB
Text
% # -*- mode:c; style:ruby; coding: utf-8; indent-tabs-mode: nil -*-
|
|
% # Copyright (c) 2018 Takashi Kokubun. All rights reserved.
|
|
% #
|
|
% # This file is a part of the programming language Ruby. Permission is hereby
|
|
% # granted, to either redistribute and/or modify this file, provided that the
|
|
% # conditions mentioned in the file COPYING are met. Consult the file for
|
|
% # details.
|
|
%
|
|
% to_cstr = lambda do |line|
|
|
% normalized = line.gsub(/\t/, ' ' * 8)
|
|
% indented = normalized.sub(/\A(?!#)/, ' ') # avoid indenting preprocessor
|
|
% rstring2cstr(indented.rstrip).sub(/"\z/, '\\n"')
|
|
% end
|
|
%
|
|
% #
|
|
% # Expand simple macro, which doesn't require dynamic C code.
|
|
% #
|
|
% expand_simple_macros = lambda do |arg_expr|
|
|
% arg_expr.dup.tap do |expr|
|
|
% # For `leave`. We can't proceed next ISeq in the same JIT function.
|
|
% expr.gsub!(/^(?<indent>\s*)RESTORE_REGS\(\);\n/) do
|
|
% indent = Regexp.last_match[:indent]
|
|
% <<-RESTORE_REGS.gsub(/^ +/, '')
|
|
% #if OPT_CALL_THREADED_CODE
|
|
% #{indent}rb_ec_thread_ptr(ec)->retval = val;
|
|
% #{indent}return 0;
|
|
% #else
|
|
% #{indent}return val;
|
|
% #endif
|
|
% RESTORE_REGS
|
|
% end
|
|
% end
|
|
% end
|
|
%
|
|
% #
|
|
% # Print a body of insn, but with macro expansion.
|
|
% #
|
|
% expand_simple_macros.call(insn.expr.expr).each_line do |line|
|
|
% #
|
|
% # Expand dynamic macro here (only JUMP for now)
|
|
% #
|
|
% # TODO: support combination of following macros in the same line
|
|
% case line
|
|
% when /\A\s+JUMP\((?<dest>[^)]+)\);\s+\z/
|
|
% dest = Regexp.last_match[:dest]
|
|
%
|
|
% if insn.name == 'opt_case_dispatch' # special case... TODO: use another macro to avoid checking name
|
|
{
|
|
struct case_dispatch_var arg;
|
|
arg.f = f;
|
|
arg.base_pos = pos + insn_len(insn);
|
|
arg.last_value = Qundef;
|
|
|
|
fprintf(f, " switch (<%= dest %>) {\n");
|
|
st_foreach(RHASH_TBL_RAW(hash), compile_case_dispatch_each, (VALUE)&arg);
|
|
fprintf(f, " case %lu:\n", else_offset);
|
|
fprintf(f, " goto label_%lu;\n", arg.base_pos + else_offset);
|
|
fprintf(f, " }\n");
|
|
}
|
|
% else
|
|
% # Before we `goto` next insn, we need to set return values, especially for getinlinecache
|
|
% insn.rets.reverse_each.with_index do |ret, i|
|
|
% # TOPN(n) = ...
|
|
fprintf(f, " stack[%d] = <%= ret.fetch(:name) %>;\n", b->stack_size + (int)<%= insn.call_attribute('sp_inc') %> - <%= i + 1 %>);
|
|
% end
|
|
%
|
|
next_pos = pos + insn_len(insn) + (unsigned int)<%= dest %>;
|
|
fprintf(f, " goto label_%d;\n", next_pos);
|
|
% end
|
|
% when /\A\s+DISPATCH_ORIGINAL_INSN\([^)]+\);\s+\z/
|
|
% # For `opt_xxx`'s fallbacks.
|
|
if (status->local_stack_p) {
|
|
fprintf(f, " reg_cfp->sp = (VALUE *)reg_cfp->bp + %d;\n", b->stack_size + 1);
|
|
}
|
|
fprintf(f, " reg_cfp->pc = original_body_iseq + %d;\n", pos);
|
|
fprintf(f, " goto cancel;\n");
|
|
% else
|
|
% if insn.handles_frame?
|
|
% # If insn.handles_frame? is true, cfp->sp might be changed inside insns (like vm_caller_setup_arg_block)
|
|
% # and thus we need to use cfp->sp, even when local_stack_p is TRUE. When insn.handles_frame? is true,
|
|
% # cfp->sp should be available too because _mjit_compile_pc_and_sp.erb sets it.
|
|
fprintf(f, <%= to_cstr.call(line) %>);
|
|
% else
|
|
% # If local_stack_p is TRUE and insn.handles_frame? is false, stack values are only available in local variables
|
|
% # for stack. So we need to replace those macros if local_stack_p is TRUE here.
|
|
% case line
|
|
% when /\bGET_SP\(\)/
|
|
% # reg_cfp->sp
|
|
fprintf(f, <%= to_cstr.call(line.sub(/\bGET_SP\(\)/, '%s')) %>, (status->local_stack_p ? "(stack + stack_size)" : "GET_SP()"));
|
|
% when /\bSTACK_ADDR_FROM_TOP\((?<num>[^)]+)\)/
|
|
% # #define STACK_ADDR_FROM_TOP(n) (GET_SP()-(n))
|
|
% num = Regexp.last_match[:num]
|
|
fprintf(f, <%= to_cstr.call(line.sub(/\bSTACK_ADDR_FROM_TOP\(([^)]+)\)/, '%s')) %>,
|
|
(status->local_stack_p ? "stack + (stack_size - (<%= num %>))" : "STACK_ADDR_FROM_TOP(<%= num %>)"));
|
|
% when /\bTOPN\((?<num>[^)]+)\)/
|
|
% # #define TOPN(n) (*(GET_SP()-(n)-1))
|
|
% num = Regexp.last_match[:num]
|
|
fprintf(f, <%= to_cstr.call(line.sub(/\bTOPN\(([^)]+)\)/, '%s')) %>,
|
|
(status->local_stack_p ? "*(stack + (stack_size - (<%= num %>) - 1))" : "TOPN(<%= num %>)"));
|
|
% else
|
|
fprintf(f, <%= to_cstr.call(line) %>);
|
|
% end
|
|
% end
|
|
% end
|
|
% end
|