1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Skip assert_linear_performance for RJIT

Browse Source
This commit is contained in:
Takashi Kokubun 2023-04-02 12:23:22 -07:00
parent bf7587748d
commit 3fe134759c
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ruby_vm/rjit/insn_compiler.rb
View File

@ -1366,7 +1366,7 @@ module RubyVM::RJIT
# calling->ci # calling->ci
mid = C.vm_ci_mid(cd.ci) mid = C.vm_ci_mid(cd.ci)
calling = build_calling(ci: cd.ci, block_handler:) calling = build_calling(ci: cd.ci, block_handler: blockiseq)
# vm_sendish # vm_sendish
cme, comptime_recv_klass = jit_search_method(jit, ctx, asm, mid, calling) cme, comptime_recv_klass = jit_search_method(jit, ctx, asm, mid, calling)
@ -3941,13 +3941,6 @@ module RubyVM::RJIT
return blockiseq return blockiseq
else else
if is_super if is_super
# GET_BLOCK_HANDLER();
# Guard no block passed. Only handle that case for now.
asm.comment('guard no block given')
jit_get_lep(jit, asm, reg: :rax)
asm.cmp([:rax, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL], C::VM_BLOCK_HANDLER_NONE)
asm.jne(counted_exit(side_exit, :send_block_handler))
return C::VM_BLOCK_HANDLER_NONE
else else
# Not implemented yet. Is this even necessary? # Not implemented yet. Is this even necessary?
asm.incr_counter(:send_block_setup) asm.incr_counter(:send_block_setup)

7
tool/lib/core_assertions.rb
View File

@ -744,13 +744,16 @@ eom
# #
# :yield: each elements of +seq+. # :yield: each elements of +seq+.
def assert_linear_performance(seq, rehearsal: nil, pre: ->(n) {n}) def assert_linear_performance(seq, rehearsal: nil, pre: ->(n) {n})
# Timeout testing generally doesn't work when RJIT compilation happens.
rjit_enabled = defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
first = seq.first first = seq.first
*arg = pre.call(first) *arg = pre.call(first)
times = (0..(rehearsal || (2 * first))).map do times = (0..(rehearsal || (2 * first))).map do
st = Process.clock_gettime(Process::CLOCK_MONOTONIC) st = Process.clock_gettime(Process::CLOCK_MONOTONIC)
yield(*arg) yield(*arg)
t = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st) t = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st)
assert_operator 0, :<=, t assert_operator 0, :<=, t unless rjit_enabled
t.nonzero? t.nonzero?
end end
times.compact! times.compact!
@ -766,7 +769,7 @@ eom
Timeout.timeout(t, Timeout::Error, message) do Timeout.timeout(t, Timeout::Error, message) do
st = Process.clock_gettime(Process::CLOCK_MONOTONIC) st = Process.clock_gettime(Process::CLOCK_MONOTONIC)
yield(*arg) yield(*arg)
assert_operator (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st), :<=, t, message assert_operator (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st), :<=, t, message unless rjit_enabled
end end
end end
end end