From a8e7fee80129b0ba360c2671582117c8e18a6464 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 16 Mar 2023 09:22:42 -0700 Subject: Revert "core_assertions.rb: Refine `assert_linear_performance`" This reverts commit cae4342dd559e34c1ce6219593f77f0ad80286da. This is failing a lot of CIs and nobody is actively looking into fixing it. Let me revert this until we have a solution to it. --- tool/lib/core_assertions.rb | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'tool/lib/core_assertions.rb') diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb index c195c91482..119deccb9f 100644 --- a/tool/lib/core_assertions.rb +++ b/tool/lib/core_assertions.rb @@ -738,28 +738,23 @@ eom end alias all_assertions_foreach assert_all_assertions_foreach - # Expect +seq+ to respond to +first+ and +each+ methods, e.g., - # Array, Range, Enumerator::ArithmeticSequence and other - # Enumerable-s, and each elements should be size factors. - # - # :yield: each elements of +seq+. - def assert_linear_performance(seq, rehearsal: nil, pre: ->(n) {n}) - first = seq.first - *arg = pre.call(first) - tmax = (0..(rehearsal || first)).map do + def assert_linear_performance(factor: 10_000, first: factor, max: 2, rehearsal: first, pre: ->(n) {n}) + n = first + arg = pre.call(n) + tmax = (0..rehearsal).map do st = Process.clock_gettime(Process::CLOCK_MONOTONIC) - yield(*arg) + yield arg (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st) end.max - seq.each do |i| - next if i == first - t = tmax * i / first - *arg = pre.call(i) - message = "[#{i}]: in #{t}s" + (first >= factor ? 2 : 1).upto(max) do |i| + n = i * factor + t = tmax * factor + arg = pre.call(n) + message = "[#{i}]: #{n} in #{t}s" Timeout.timeout(t, nil, message) do st = Process.clock_gettime(Process::CLOCK_MONOTONIC) - yield(*arg) + yield arg assert_operator (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st), :<=, t, message end end -- cgit v1.2.3