summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bootstraptest/test_mjit.rb6
-rw-r--r--lib/ruby_vm/mjit/insn_compiler.rb90
-rw-r--r--lib/ruby_vm/mjit/jit_state.rb1
3 files changed, 49 insertions, 48 deletions
diff --git a/bootstraptest/test_mjit.rb b/bootstraptest/test_mjit.rb
index 420b15aa19..c00c742318 100644
--- a/bootstraptest/test_mjit.rb
+++ b/bootstraptest/test_mjit.rb
@@ -8,3 +8,9 @@ assert_equal 'true', %q{
lt(1, 2)
lt('a', 'b')
}
+
+assert_equal '3', %q{
+ def foo = 2
+ def bar = 1 + foo + nil.to_i
+ bar
+}
diff --git a/lib/ruby_vm/mjit/insn_compiler.rb b/lib/ruby_vm/mjit/insn_compiler.rb
index 43fd1e9648..e1fbdf233f 100644
--- a/lib/ruby_vm/mjit/insn_compiler.rb
+++ b/lib/ruby_vm/mjit/insn_compiler.rb
@@ -175,20 +175,16 @@ module RubyVM::MJIT
# @param ctx [RubyVM::MJIT::Context]
# @param asm [RubyVM::MJIT::Assembler]
def putnil(jit, ctx, asm)
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
- asm.mov([SP, C.VALUE.size * ctx.stack_size], Qnil)
- ctx.stack_push(1)
- KeepCompiling
+ putobject(jit, ctx, asm, val: Qnil)
end
# @param jit [RubyVM::MJIT::JITState]
# @param ctx [RubyVM::MJIT::Context]
# @param asm [RubyVM::MJIT::Assembler]
def putself(jit, ctx, asm)
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
+ stack_top = ctx.stack_push
asm.mov(:rax, [CFP, C.rb_control_frame_t.offsetof(:self)])
- asm.mov([SP, C.VALUE.size * ctx.stack_size], :rax)
- ctx.stack_push(1)
+ asm.mov(stack_top, :rax)
KeepCompiling
end
@@ -197,16 +193,15 @@ module RubyVM::MJIT
# @param asm [RubyVM::MJIT::Assembler]
def putobject(jit, ctx, asm, val: jit.operand(0))
# Push it to the stack
- # TODO: GC offsets
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
+ stack_top = ctx.stack_push
if asm.imm32?(val)
- asm.mov([SP, C.VALUE.size * ctx.stack_size], val)
+ asm.mov(stack_top, val)
else # 64-bit immediates can't be directly written to memory
asm.mov(:rax, val)
- asm.mov([SP, C.VALUE.size * ctx.stack_size], :rax)
+ asm.mov(stack_top, :rax)
end
+ # TODO: GC offsets?
- ctx.stack_push(1)
KeepCompiling
end
@@ -397,35 +392,37 @@ module RubyVM::MJIT
return EndBlock
end
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
comptime_recv = jit.peek_at_stack(1)
comptime_obj = jit.peek_at_stack(0)
if fixnum?(comptime_recv) && fixnum?(comptime_obj)
+ # Generate a side exit before popping operands
+ side_exit = side_exit(jit, ctx)
+
unless @invariants.assume_bop_not_redefined(jit, C.INTEGER_REDEFINED_OP_FLAG, C.BOP_MINUS)
return CantCompile
end
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
- recv_index = ctx.stack_size - 2
- obj_index = ctx.stack_size - 1
+ obj_opnd = ctx.stack_pop
+ recv_opnd = ctx.stack_pop
asm.comment('guard recv is fixnum') # TODO: skip this with type information
- asm.test([SP, C.VALUE.size * recv_index], C.RUBY_FIXNUM_FLAG)
- asm.jz(side_exit(jit, ctx))
+ asm.test(recv_opnd, C.RUBY_FIXNUM_FLAG)
+ asm.jz(side_exit)
asm.comment('guard obj is fixnum') # TODO: skip this with type information
- asm.test([SP, C.VALUE.size * obj_index], C.RUBY_FIXNUM_FLAG)
- asm.jz(side_exit(jit, ctx))
+ asm.test(obj_opnd, C.RUBY_FIXNUM_FLAG)
+ asm.jz(side_exit)
- asm.mov(:rax, [SP, C.VALUE.size * recv_index])
- asm.mov(:rcx, [SP, C.VALUE.size * obj_index])
+ asm.mov(:rax, recv_opnd)
+ asm.mov(:rcx, obj_opnd)
asm.sub(:rax, :rcx)
- asm.jo(side_exit(jit, ctx))
+ asm.jo(side_exit)
asm.add(:rax, 1) # re-tag
- asm.mov([SP, C.VALUE.size * recv_index], :rax)
- ctx.stack_pop(1)
+ dst_opnd = ctx.stack_push
+ asm.mov(dst_opnd, :rax)
+
KeepCompiling
else
CantCompile # TODO: delegate to send
@@ -447,35 +444,37 @@ module RubyVM::MJIT
return EndBlock
end
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
comptime_recv = jit.peek_at_stack(1)
comptime_obj = jit.peek_at_stack(0)
if fixnum?(comptime_recv) && fixnum?(comptime_obj)
+ # Generate a side exit before popping operands
+ side_exit = side_exit(jit, ctx)
+
unless @invariants.assume_bop_not_redefined(jit, C.INTEGER_REDEFINED_OP_FLAG, C.BOP_LT)
return CantCompile
end
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
- recv_index = ctx.stack_size - 2
- obj_index = ctx.stack_size - 1
+ obj_opnd = ctx.stack_pop
+ recv_opnd = ctx.stack_pop
asm.comment('guard recv is fixnum') # TODO: skip this with type information
- asm.test([SP, C.VALUE.size * recv_index], C.RUBY_FIXNUM_FLAG)
- asm.jz(side_exit(jit, ctx))
+ asm.test(recv_opnd, C.RUBY_FIXNUM_FLAG)
+ asm.jz(side_exit)
asm.comment('guard obj is fixnum') # TODO: skip this with type information
- asm.test([SP, C.VALUE.size * obj_index], C.RUBY_FIXNUM_FLAG)
- asm.jz(side_exit(jit, ctx))
+ asm.test(obj_opnd, C.RUBY_FIXNUM_FLAG)
+ asm.jz(side_exit)
- asm.mov(:rax, [SP, C.VALUE.size * obj_index])
- asm.cmp([SP, C.VALUE.size * recv_index], :rax)
+ asm.mov(:rax, obj_opnd)
+ asm.cmp(recv_opnd, :rax)
asm.mov(:rax, Qfalse)
asm.mov(:rcx, Qtrue)
asm.cmovl(:rax, :rcx)
- asm.mov([SP, C.VALUE.size * recv_index], :rax)
- ctx.stack_pop(1)
+ dst_opnd = ctx.stack_push
+ asm.mov(dst_opnd, :rax)
+
KeepCompiling
else
CantCompile # TODO: delegate to send
@@ -725,18 +724,16 @@ module RubyVM::MJIT
asm.incr_counter(:send_kw_splat)
return CantCompile
end
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
- recv_depth = argc + ((flags & C.VM_CALL_ARGS_BLOCKARG == 0) ? 0 : 1)
- recv_index = ctx.stack_size - 1 - recv_depth
+ recv_index = argc + ((flags & C.VM_CALL_ARGS_BLOCKARG == 0) ? 0 : 1)
- comptime_recv = jit.peek_at_stack(recv_depth)
+ comptime_recv = jit.peek_at_stack(recv_index)
comptime_recv_klass = C.rb_class_of(comptime_recv)
# Guard the receiver class (part of vm_search_method_fastpath)
if comptime_recv_klass.singleton_class?
asm.comment('guard known object with singleton class')
asm.mov(:rax, C.to_value(comptime_recv))
- asm.cmp([SP, C.VALUE.size * recv_index], :rax)
+ asm.cmp([SP, C.VALUE.size * (ctx.sp_offset - 1 - recv_index)], :rax)
asm.jne(side_exit(jit, ctx))
else
# TODO: support more classes
@@ -813,8 +810,7 @@ module RubyVM::MJIT
def jit_call_iseq_setup_normal(jit, ctx, asm, ci, cme, flags, argc, iseq)
# Save caller SP and PC before pushing a callee frame for backtrace and side exits
asm.comment('save SP to caller CFP')
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
- sp_index = ctx.stack_size - 1 - argc - ((flags & C.VM_CALL_ARGS_BLOCKARG == 0) ? 0 : 1) # Pop receiver and arguments for side exits
+ sp_index = ctx.sp_offset - 1 - argc - ((flags & C.VM_CALL_ARGS_BLOCKARG == 0) ? 0 : 1) # Pop receiver and arguments for side exits
asm.lea(:rax, [SP, C.VALUE.size * sp_index])
asm.mov([CFP, C.rb_control_frame_t.offsetof(:sp)], :rax)
@@ -837,13 +833,11 @@ module RubyVM::MJIT
local_size = iseq.body.local_table_size - iseq.body.param.size
local_size.times do |i|
asm.comment('set local variables') if i == 0
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
- local_index = ctx.stack_size + i
+ local_index = ctx.sp_offset + i
asm.mov([SP, C.VALUE.size * local_index], Qnil)
end
- assert_equal(ctx.sp_offset, ctx.stack_size) # TODO: support SP motion
- sp_offset = ctx.stack_size + local_size + 3
+ sp_offset = ctx.sp_offset + local_size + 3
asm.add(SP, C.VALUE.size * sp_offset)
asm.comment('set cme')
diff --git a/lib/ruby_vm/mjit/jit_state.rb b/lib/ruby_vm/mjit/jit_state.rb
index cf1ec2bbd1..6cc14020dc 100644
--- a/lib/ruby_vm/mjit/jit_state.rb
+++ b/lib/ruby_vm/mjit/jit_state.rb
@@ -23,6 +23,7 @@ module RubyVM::MJIT
def peek_at_stack(depth_from_top)
raise 'not at current insn' unless at_current_insn?
offset = -(1 + depth_from_top)
+ # rb_mjit_branch_stub_hit updates SP, so you don't need to worry about sp_offset
value = (cfp.sp + offset).*
C.to_ruby(value)
end
View Lorry Controller Status