summaryrefslogtreecommitdiff
path: root/tool/ruby_vm
diff options
context:
space:
mode:
author卜部昌平 <[email protected]>2020-07-09 21:43:42 +0900
committer卜部昌平 <[email protected]>2020-07-13 08:56:18 +0900
commitf66e0212efe4f6572d5e81741e831ab735cc2fee (patch)
tree94b45502a7d483489b697c3966b7d75e9cfd9b40 /tool/ruby_vm
parent5d02c1dd14648d95178ac5ec756f5b03fe00d549 (diff)
precalc invokebuiltin destinations
Noticed that struct rb_builtin_function is a purely compile-time constant. MJIT can eliminate some runtime calculations by statically generate dedicated C code generator for each builtin functions.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3305
Diffstat (limited to 'tool/ruby_vm')
-rw-r--r--tool/ruby_vm/views/_mjit_compile_insn_body.erb4
-rw-r--r--tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb23
-rw-r--r--tool/ruby_vm/views/mjit_compile.inc.erb6
3 files changed, 28 insertions, 5 deletions
diff --git a/tool/ruby_vm/views/_mjit_compile_insn_body.erb b/tool/ruby_vm/views/_mjit_compile_insn_body.erb
index bc77b02b71..eb0f8485c3 100644
--- a/tool/ruby_vm/views/_mjit_compile_insn_body.erb
+++ b/tool/ruby_vm/views/_mjit_compile_insn_body.erb
@@ -63,6 +63,10 @@
fprintf(f, " goto label_%lu;\n", arg.base_pos + else_offset);
fprintf(f, " }\n");
}
+% elsif insn.name == 'invokebuiltin' || insn.name == 'opt_invokebuiltin_delegate'
+ {
+<%= render 'mjit_compile_invokebuiltin', locals: { insn: insn } -%>
+ }
% else
% # Before we `goto` next insn, we need to set return values, especially for getinlinecache
% insn.rets.reverse_each.with_index do |ret, i|
diff --git a/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb b/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb
new file mode 100644
index 0000000000..f935f799cb
--- /dev/null
+++ b/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb
@@ -0,0 +1,23 @@
+% # -*- C -*-
+% # Copyright (c) 2020 Urabe, Shyouhei. 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.
+%
+ /* <%= insn.name %> */
+ const struct rb_builtin_function *bf = (const void *)operands[0];
+%
+% if insn.name == 'invokebuiltin' then
+ const rb_num_t index = -1;
+% else
+ const rb_num_t index = (rb_num_t)operands[1];
+% end
+%
+ if (bf->compiler) {
+ bf->compiler(f, index);
+ }
+ else {
+ mjit_invokebuiltin_default_compiler(f, bf, index);
+ }
diff --git a/tool/ruby_vm/views/mjit_compile.inc.erb b/tool/ruby_vm/views/mjit_compile.inc.erb
index c8f9aca777..e3be549181 100644
--- a/tool/ruby_vm/views/mjit_compile.inc.erb
+++ b/tool/ruby_vm/views/mjit_compile.inc.erb
@@ -67,13 +67,9 @@ switch (insn) {
{
% # opt_invokebuiltin_delegate_leave also implements leave insn. We need to handle it here for inlining.
% if insn.name == 'opt_invokebuiltin_delegate_leave'
- RB_BUILTIN bf = (RB_BUILTIN)operands[0];
- rb_num_t index = (rb_num_t)operands[0];
fprintf(f, "{\n");
fprintf(f, " VALUE val;\n");
- fprintf(f, " RB_BUILTIN bf = (RB_BUILTIN)0x%"PRIxVALUE";\n", operands[0]);
- fprintf(f, " rb_num_t index = (rb_num_t)0x%"PRIxVALUE";\n", operands[1]);
- fprintf(f, <%= rstring2cstr(insn.expr.expr.lines.find { |l| l =~ / vm_invoke_builtin_delegate\(/ }).gsub("\n", '\n') %>);
+<%= render 'mjit_compile_invokebuiltin', locals: { insn: insn } -%>
fprintf(f, " stack[0] = val;\n");
fprintf(f, "}\n");
% else