mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
6a4bb345df
This optimization was reverted on r63863, but this commit resurrects the
optimization to skip some sp motions on JIT execution.
tool/ruby_vm/views/_mjit_compile_insn_body.erb: ditto
tool/ruby_vm/views/_mjit_compile_insn.erb: ditto
insns.def: resurrect handles_frame as handles_stack, which was deleted
on r63763.
tool/ruby_vm/models/bare_instructions.rb: ditto
vm_insnhelper.c: prevent moving sp outside insns.def to allow modifying
it by JIT.
* Optcarrot benchmark
$ benchmark-driver benchmark.yml --rbenv 'before --jit;after --jit' --repeat-count 12 -v
before --jit: ruby 2.6.0dev (2018-07-17 trunk 63987) +JIT [x86_64-linux]
after --jit: ruby 2.6.0dev (2018-07-17 local-stack 63987) +JIT [x86_64-linux]
last_commit=mjit_compile.c: resurrect local variable stack
Calculating -------------------------------------
before --jit after --jit
Optcarrot Lan_Master.nes 70.518 72.144 fps
Comparison:
Optcarrot Lan_Master.nes
after --jit: 72.1 fps
before --jit: 70.5 fps - 1.02x slower
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
98 lines
3.9 KiB
Text
98 lines
3.9 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.
|
|
%
|
|
% trace_enablable_insns = [
|
|
% 'opt_send_without_block',
|
|
% 'send',
|
|
% 'invokeblock',
|
|
% 'invokesuper',
|
|
% ]
|
|
%
|
|
fprintf(f, "{\n");
|
|
{
|
|
% # compiler: Prepare operands which may be used by `insn.call_attribute`
|
|
% insn.opes.each_with_index do |ope, i|
|
|
MAYBE_UNUSED(<%= ope.fetch(:decl) %>) = (<%= ope.fetch(:type) %>)operands[<%= i %>];
|
|
% end
|
|
%
|
|
% # JIT: Declare stack_size to be used in some macro of _mjit_compile_insn_body.erb
|
|
if (status->local_stack_p) {
|
|
% # TODO: can we use some functions to calculate this?
|
|
% if insn.name == 'send' || insn.name == 'invokesuper'
|
|
fprintf(f, " MAYBE_UNUSED(unsigned int) stack_size = %u;\n", b->stack_size - <%= insn.pops.size %> - ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
|
|
% else
|
|
fprintf(f, " MAYBE_UNUSED(unsigned int) stack_size = %u;\n", b->stack_size - <%= insn.pops.size %>);
|
|
% end
|
|
}
|
|
%
|
|
% # JIT: Declare variables for operands, popped values and return values
|
|
% insn.declarations.each do |decl|
|
|
fprintf(f, " <%= decl %>;\n");
|
|
% end
|
|
|
|
% # JIT: Set const expressions for `RubyVM::OperandsUnifications` insn
|
|
% insn.preamble.each do |amble|
|
|
fprintf(f, "<%= amble.expr %>\n");
|
|
% end
|
|
%
|
|
% # JIT: Initialize operands
|
|
% insn.opes.each_with_index do |ope, i|
|
|
fprintf(f, " <%= ope.fetch(:name) %> = (<%= ope.fetch(:type) %>)0x%"PRIxVALUE";", operands[<%= i %>]);
|
|
% case ope.fetch(:type)
|
|
% when 'ID'
|
|
comment_id(f, (ID)operands[<%= i %>]);
|
|
% when 'CALL_INFO'
|
|
comment_id(f, ((CALL_INFO)operands[<%= i %>])->mid);
|
|
% when 'VALUE'
|
|
if (SYMBOL_P((VALUE)operands[<%= i %>])) comment_id(f, SYM2ID((VALUE)operands[<%= i %>]));
|
|
% end
|
|
fprintf(f, "\n");
|
|
% end
|
|
%
|
|
% # JIT: Initialize popped values
|
|
% insn.pops.reverse_each.with_index.reverse_each do |pop, i|
|
|
fprintf(f, " <%= pop.fetch(:name) %> = stack[%d];\n", b->stack_size - <%= i + 1 %>);
|
|
% end
|
|
%
|
|
% # JIT: move sp and pc if necessary
|
|
<%= render 'mjit_compile_pc_and_sp', locals: { insn: insn } -%>
|
|
%
|
|
% # JIT: Print insn body in insns.def
|
|
<%= render 'mjit_compile_insn_body', locals: { insn: insn } -%>
|
|
%
|
|
% # JIT: Set return values
|
|
% 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
|
|
%
|
|
% # JIT: We should evaluate ISeq modified for TracePoint if it's enabled. Note: This is slow.
|
|
% if trace_enablable_insns.include?(insn.name)
|
|
fprintf(f, " if (UNLIKELY(ruby_vm_event_enabled_flags & ISEQ_TRACE_EVENTS)) {\n");
|
|
fprintf(f, " reg_cfp->sp = (VALUE *)reg_cfp->bp + %d;\n", b->stack_size + (int)<%= insn.call_attribute('sp_inc') %> + 1);
|
|
if (!body->catch_except_p) {
|
|
fprintf(f, " reg_cfp->pc = original_body_iseq + %d;\n", next_pos);
|
|
}
|
|
fprintf(f, " goto cancel;\n");
|
|
fprintf(f, " }\n");
|
|
% end
|
|
%
|
|
% # compiler: Move JIT compiler's internal stack pointer
|
|
b->stack_size += <%= insn.call_attribute('sp_inc') %>;
|
|
}
|
|
fprintf(f, "}\n");
|
|
%
|
|
% # compiler: If insn has conditional JUMP, the branch which is not targeted by JUMP should be compiled too.
|
|
% if insn.expr.expr =~ /if\s+\([^{}]+\)\s+\{[^{}]+JUMP\([^)]+\);[^{}]+\}/
|
|
compile_insns(f, body, b->stack_size, pos + insn_len(insn), status);
|
|
% end
|
|
%
|
|
% # compiler: If insn returns (leave) or does longjmp (throw), the branch should no longer be compiled. TODO: create attr for it?
|
|
% if insn.expr.expr =~ /\sTHROW_EXCEPTION\([^)]+\);/ || insn.expr.expr =~ /\sRESTORE_REGS\(\);/
|
|
b->finish_p = TRUE;
|
|
% end
|