Improve ractor harness and update other harnesses to be compatible

Author: luke-gruber

harness-bips/harness.rb

@@ -3,8 +3,9 @@
 
 puts RUBY_DESCRIPTION
 
-def run_benchmark(_, &block)
+def run_benchmark(_, **, &block)
   Benchmark.ips do |x|
     x.report 'benchmark', &block
   end
+  return_results([], [1.0])
 end

harness-chain/harness.rb

@@ -0,0 +1,23 @@
+require_relative '../harness/harness-common'
+
+CHAIN = ENV['HARNESS_CHAIN'].to_s.split(',')
+CHAIN.reject! { |el| el.to_s.strip.empty? }
+if CHAIN.size < 2
+  $stderr.puts "You need to chain at least 2 harnesses. Exiting."
+  exit 1
+end
+
+def run_benchmark(n, **kwargs, &block)
+  CHAIN.each do |h|
+    begin
+      path = "../harness-#{h}/harness"
+      require_relative path
+    rescue LoadError => e
+      if e.path == path
+        $stderr.puts "Can't find harness harness-#{h}/harness.rb. Exiting."
+        exit 1
+      end
+      raise
+    end
+  end
+end

harness-continuous/harness.rb

@@ -2,14 +2,12 @@
 
 puts RUBY_DESCRIPTION
 
-def run_benchmark(_)
+def run_benchmark(n, **, &blk)
   iterations = 1
   start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
   loop do
-    iterations.times do
-      yield
-    end
+    iterations.times(&blk)
 
     end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     round_time = end_time - start_time

harness-mplr/harness.rb

@@ -10,7 +10,7 @@
 puts RUBY_DESCRIPTION
 
 # Takes a block as input
-def run_benchmark(_num_itrs_hint)
+def run_benchmark(_num_itrs_hint, **, &blk)
   times = []
   total_time = 0
   num_itrs = 0

harness-once/harness.rb

@@ -7,7 +7,7 @@
 
 require_relative '../harness/harness-common'
 
-def run_benchmark(_hint)
+def run_benchmark(_hint, **)
   yield
   return_results([], [0.001]) # bogus timing
 end

harness-perf/harness.rb

@@ -20,7 +20,7 @@
 # the number of benchmark iterations. For example, if the default harness runs
 # 10 benchmark iterations (after 15 warmup iterations) for a benchmark with
 # the default MIN_BENCH_TIME, the benchmark should have 10 as `num_itrs_hint`.
-def run_benchmark(num_itrs_hint)
+def run_benchmark(num_itrs_hint, **, &blk)
   warmup_itrs = Integer(ENV.fetch('WARMUP_ITRS', 10))
   bench_itrs = Integer(ENV.fetch('MIN_BENCH_ITRS', num_itrs_hint))
 

harness-ractor/harness.rb

@@ -1,12 +1,21 @@
+# frozen_string_literal: true
 require_relative '../harness/harness-common'
 
 Warning[:experimental] = false
 ENV["YJIT_BENCH_RACTOR_HARNESS"] = "1"
 
-RACTORS = [
+default_ractors = [
   0, # without ractor
   1, 2, 4, 6, 8, 12, 16, 32
-].freeze
+]
+if rs = ENV["YJIT_BENCH_RACTORS"]
+  rs = rs.split(",").map(&:to_i) # If you want to include 0, you have to specify
+  rs = rs.sort.uniq
+  if rs.any?
+    ractors = rs
+  end
+end
+RACTORS = (ractors || default_ractors).freeze
 
 unless Ractor.method_defined?(:join)
   class Ractor
@@ -32,25 +41,23 @@ def run_benchmark(num_itrs_hint, ractor_args: [], &block)
     args = if ractor_args.empty?
       []
     else
-      Ractor.make_shareable(ractor_args, copy: true)
+      ractor_deep_dup(ractor_args)
     end
-    block.call *args
+    block.call *([0] + args)
     i += 1
   end
 
   blk = Ractor.make_shareable(block)
   RACTORS.each do |rs|
     num_itrs = 0
     while num_itrs < bench_itrs
-      # copy args before we begin measuring the time so it's not included
-      shareable_args = ractor_args.empty? ? [] : Ractor.make_shareable(ractor_args, copy: true)
       before = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       if rs.zero?
-        block.call *shareable_args
+        block.call *([rs] + ractor_deep_dup(ractor_args))
       else
         rs_list = []
         rs.times do
-          rs_list << Ractor.new(*shareable_args, &block)
+          rs_list << Ractor.new(*([rs] + ractor_args), &block)
         end
         while rs_list.any?
           r, _obj = Ractor.select(*rs_list)
@@ -68,4 +75,22 @@ def run_benchmark(num_itrs_hint, ractor_args: [], &block)
   return_results([], stats.values.flatten)
 end
 
+def ractor_deep_dup(args)
+  if Array === args
+    ret = []
+    args.each do |el|
+      ret << ractor_deep_dup(el)
+    end
+    ret
+  elsif Hash === args
+    ret = {}
+    args.each do |k,v|
+      ret[ractor_deep_dup(k)] = ractor_deep_dup(v)
+    end
+    ret
+  else
+    args.dup
+  end
+end
+
 Ractor.make_shareable(self)

harness-stackprof/harness.rb

@@ -61,7 +61,7 @@ def stackprof_opts
   opts
 end
 
-def run_benchmark(n, &block)
+def run_benchmark(n, **, &block)
   require "stackprof"
 
   opts = stackprof_opts

harness-stats/harness.rb

@@ -3,7 +3,7 @@
 # Using Module#prepend to enable TracePoint right before #run_benchmark
 # while also reusing the original implementation.
 self.singleton_class.prepend Module.new {
-  def run_benchmark(*)
+  def run_benchmark(n, **, &block)
     frames = []
     c_calls = Hash.new { 0 }
     c_blocks = Hash.new { 0 }
@@ -43,7 +43,7 @@ def run_benchmark(*)
 
     method_trace.enable
     block_trace.enable
-    super
+    super(n, &block)
   ensure
     block_trace.disable
     method_trace.disable

harness-vernier/harness.rb

@@ -12,12 +12,12 @@
 ensure_global_gem("vernier")
 ensure_global_gem_exe("profile-viewer")
 
-def run_benchmark(n, &block)
+def run_benchmark(n, **kwargs, &block)
   require "vernier"
 
   out = output_file_path(ext: "json")
   Vernier.profile(out: out) do
-    run_enough_to_profile(n, &block)
+    run_enough_to_profile(n, **kwargs, &block)
   end
 
   puts "Vernier profile:\n#{out}"