зеркало из https://github.com/github/ruby.git
Implement opt_le, opt_ge, and opt_gt
This commit is contained in:
Takashi Kokubun
Родитель
1b0fbd137f
Коммит
51d36c7b34
|
|
@ -146,6 +146,38 @@ module RubyVM::MJIT
|
|||
end
|
||||
end
|
||||
|
||||
def cmovg(dst, src)
|
||||
case [dst, src]
|
||||
# CMOVG r64, r/m64 (Mod 11: reg)
|
||||
in [Symbol => dst_reg, Symbol => src_reg]
|
||||
# REX.W + 0F 4F /r
|
||||
# RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
|
||||
insn(
|
||||
prefix: REX_W,
|
||||
opcode: [0x0f, 0x4f],
|
||||
mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
|
||||
)
|
||||
else
|
||||
raise NotImplementedError, "cmovg: not-implemented operands: #{dst.inspect}, #{src.inspect}"
|
||||
end
|
||||
end
|
||||
|
||||
def cmovge(dst, src)
|
||||
case [dst, src]
|
||||
# CMOVGE r64, r/m64 (Mod 11: reg)
|
||||
in [Symbol => dst_reg, Symbol => src_reg]
|
||||
# REX.W + 0F 4D /r
|
||||
# RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
|
||||
insn(
|
||||
prefix: REX_W,
|
||||
opcode: [0x0f, 0x4d],
|
||||
mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
|
||||
)
|
||||
else
|
||||
raise NotImplementedError, "cmovge: not-implemented operands: #{dst.inspect}, #{src.inspect}"
|
||||
end
|
||||
end
|
||||
|
||||
def cmovl(dst, src)
|
||||
case [dst, src]
|
||||
# CMOVL r64, r/m64 (Mod 11: reg)
|
||||
|
|
@ -162,6 +194,22 @@ module RubyVM::MJIT
|
|||
end
|
||||
end
|
||||
|
||||
def cmovle(dst, src)
|
||||
case [dst, src]
|
||||
# CMOVLE r64, r/m64 (Mod 11: reg)
|
||||
in [Symbol => dst_reg, Symbol => src_reg]
|
||||
# REX.W + 0F 4E /r
|
||||
# RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
|
||||
insn(
|
||||
prefix: REX_W,
|
||||
opcode: [0x0f, 0x4e],
|
||||
mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
|
||||
)
|
||||
else
|
||||
raise NotImplementedError, "cmovle: not-implemented operands: #{dst.inspect}, #{src.inspect}"
|
||||
end
|
||||
end
|
||||
|
||||
def cmp(left, right)
|
||||
case [left, right]
|
||||
# CMP r/m32, imm32 (Mod 01: [reg]+disp8)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ module RubyVM::MJIT
|
|||
asm.incr_counter(:mjit_insns_count)
|
||||
asm.comment("Insn: #{insn.name}")
|
||||
|
||||
# 31/101
|
||||
# 34/101
|
||||
case insn.name
|
||||
when :nop then nop(jit, ctx, asm)
|
||||
# getlocal
|
||||
|
|
@ -101,9 +101,9 @@ module RubyVM::MJIT
|
|||
# opt_eq
|
||||
# opt_neq
|
||||
when :opt_lt then opt_lt(jit, ctx, asm)
|
||||
# opt_le
|
||||
# opt_gt
|
||||
# opt_ge
|
||||
when :opt_le then opt_le(jit, ctx, asm)
|
||||
when :opt_gt then opt_gt(jit, ctx, asm)
|
||||
when :opt_ge then opt_ge(jit, ctx, asm)
|
||||
when :opt_ltlt then opt_ltlt(jit, ctx, asm)
|
||||
# opt_and
|
||||
# opt_or
|
||||
|
|
@ -574,51 +574,29 @@ module RubyVM::MJIT
|
|||
# @param ctx [RubyVM::MJIT::Context]
|
||||
# @param asm [RubyVM::MJIT::Assembler]
|
||||
def opt_lt(jit, ctx, asm)
|
||||
unless jit.at_current_insn?
|
||||
defer_compilation(jit, ctx, asm)
|
||||
return EndBlock
|
||||
end
|
||||
|
||||
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
|
||||
|
||||
obj_opnd = ctx.stack_pop
|
||||
recv_opnd = ctx.stack_pop
|
||||
|
||||
asm.comment('guard recv is fixnum') # TODO: skip this with type information
|
||||
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(obj_opnd, C.RUBY_FIXNUM_FLAG)
|
||||
asm.jz(side_exit)
|
||||
|
||||
asm.mov(:rax, obj_opnd)
|
||||
asm.cmp(recv_opnd, :rax)
|
||||
asm.mov(:rax, Qfalse)
|
||||
asm.mov(:rcx, Qtrue)
|
||||
asm.cmovl(:rax, :rcx)
|
||||
|
||||
dst_opnd = ctx.stack_push
|
||||
asm.mov(dst_opnd, :rax)
|
||||
|
||||
KeepCompiling
|
||||
else
|
||||
opt_send_without_block(jit, ctx, asm)
|
||||
end
|
||||
jit_fixnum_cmp(jit, ctx, asm, opcode: :cmovl, bop: C.BOP_LT)
|
||||
end
|
||||
|
||||
# opt_le
|
||||
# opt_gt
|
||||
# opt_ge
|
||||
# @param jit [RubyVM::MJIT::JITState]
|
||||
# @param ctx [RubyVM::MJIT::Context]
|
||||
# @param asm [RubyVM::MJIT::Assembler]
|
||||
def opt_le(jit, ctx, asm)
|
||||
jit_fixnum_cmp(jit, ctx, asm, opcode: :cmovle, bop: C.BOP_LE)
|
||||
end
|
||||
|
||||
# @param jit [RubyVM::MJIT::JITState]
|
||||
# @param ctx [RubyVM::MJIT::Context]
|
||||
# @param asm [RubyVM::MJIT::Assembler]
|
||||
def opt_gt(jit, ctx, asm)
|
||||
jit_fixnum_cmp(jit, ctx, asm, opcode: :cmovg, bop: C.BOP_GT)
|
||||
end
|
||||
|
||||
# @param jit [RubyVM::MJIT::JITState]
|
||||
# @param ctx [RubyVM::MJIT::Context]
|
||||
# @param asm [RubyVM::MJIT::Assembler]
|
||||
def opt_ge(jit, ctx, asm)
|
||||
jit_fixnum_cmp(jit, ctx, asm, opcode: :cmovge, bop: C.BOP_GE)
|
||||
end
|
||||
|
||||
# @param jit [RubyVM::MJIT::JITState]
|
||||
# @param ctx [RubyVM::MJIT::Context]
|
||||
|
|
@ -819,12 +797,7 @@ module RubyVM::MJIT
|
|||
# @param ctx [RubyVM::MJIT::Context]
|
||||
# @param asm [RubyVM::MJIT::Assembler]
|
||||
def jit_chain_guard(opcode, jit, ctx, asm, side_exit, limit: 10)
|
||||
case opcode
|
||||
when :je, :jne, :jnz, :jz
|
||||
# ok
|
||||
else
|
||||
raise ArgumentError, "jit_chain_guard: unexpected opcode #{opcode.inspect}"
|
||||
end
|
||||
opcode => :je | :jne | :jnz | :jz
|
||||
|
||||
if ctx.chain_depth < limit
|
||||
deeper = ctx.dup
|
||||
|
|
@ -910,6 +883,54 @@ module RubyVM::MJIT
|
|||
end
|
||||
end
|
||||
|
||||
# @param jit [RubyVM::MJIT::JITState]
|
||||
# @param ctx [RubyVM::MJIT::Context]
|
||||
# @param asm [RubyVM::MJIT::Assembler]
|
||||
def jit_fixnum_cmp(jit, ctx, asm, opcode:, bop:)
|
||||
opcode => :cmovl | :cmovle | :cmovg | :cmovge
|
||||
|
||||
unless jit.at_current_insn?
|
||||
defer_compilation(jit, ctx, asm)
|
||||
return EndBlock
|
||||
end
|
||||
|
||||
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, bop)
|
||||
return CantCompile
|
||||
end
|
||||
|
||||
obj_opnd = ctx.stack_pop
|
||||
recv_opnd = ctx.stack_pop
|
||||
|
||||
asm.comment('guard recv is fixnum') # TODO: skip this with type information
|
||||
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(obj_opnd, C.RUBY_FIXNUM_FLAG)
|
||||
asm.jz(side_exit)
|
||||
|
||||
asm.mov(:rax, obj_opnd)
|
||||
asm.cmp(recv_opnd, :rax)
|
||||
asm.mov(:rax, Qfalse)
|
||||
asm.mov(:rcx, Qtrue)
|
||||
asm.public_send(opcode, :rax, :rcx)
|
||||
|
||||
dst_opnd = ctx.stack_push
|
||||
asm.mov(dst_opnd, :rax)
|
||||
|
||||
KeepCompiling
|
||||
else
|
||||
opt_send_without_block(jit, ctx, asm)
|
||||
end
|
||||
end
|
||||
|
||||
# @param jit [RubyVM::MJIT::JITState]
|
||||
# @param ctx [RubyVM::MJIT::Context]
|
||||
# @param asm [RubyVM::MJIT::Assembler]
|
||||
|
|
|
|||
12
mjit_c.rb
12
mjit_c.rb
|
|
@ -321,6 +321,18 @@ module RubyVM::MJIT # :nodoc: all
|
|||
Primitive.cexpr! %q{ UINT2NUM(BOP_AREF) }
|
||||
end
|
||||
|
||||
def C.BOP_GE
|
||||
Primitive.cexpr! %q{ UINT2NUM(BOP_GE) }
|
||||
end
|
||||
|
||||
def C.BOP_GT
|
||||
Primitive.cexpr! %q{ UINT2NUM(BOP_GT) }
|
||||
end
|
||||
|
||||
def C.BOP_LE
|
||||
Primitive.cexpr! %q{ UINT2NUM(BOP_LE) }
|
||||
end
|
||||
|
||||
def C.BOP_LT
|
||||
Primitive.cexpr! %q{ UINT2NUM(BOP_LT) }
|
||||
end
|
||||
|
|
|
|||
|
|
@ -349,6 +349,9 @@ generator = BindingGenerator.new(
|
|||
],
|
||||
UINT: %w[
|
||||
BOP_AREF
|
||||
BOP_GE
|
||||
BOP_GT
|
||||
BOP_LE
|
||||
BOP_LT
|
||||
BOP_MINUS
|
||||
BOP_PLUS
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче