Get ractor-only benchmarks running with recent changes.

Author: luke-gruber

benchmarks/ractor/gemfiles/Gemfile_json_parse.rb.lock

@@ -1,4 +1,4 @@
-require_relative "../../harness/loader"
+require_relative "../../../harness/loader"
 
 run_benchmark(5) do |num_rs, ractor_args|
   output = File.open("/dev/null", "wb")

benchmarks/ractor/gvl_release_acquire.rb renamed to benchmarks/ractor/gvl_release_acquire/benchmark.rb

@@ -1,10 +1,11 @@
-require_relative "../../harness/loader"
+require_relative "../../../harness/loader"
 
-use_ractor_gemfile("json_parse")
-puts "JSON #{JSON::VERSION}"
+Dir.chdir(__dir__)
+use_gemfile
+require "json"
+puts "json v#{JSON::VERSION}"
 
 ELEMENTS = 100_000
-
 list = ELEMENTS.times.map do
   {
     rand => rand,

benchmarks/ractor/gemfiles/Gemfile_json_parse.rb renamed to benchmarks/ractor/json_parse_float/Gemfile

@@ -0,0 +1 @@
+gem "json", "2.13.2"

benchmarks/ractor/json_parse_float.rb renamed to benchmarks/ractor/json_parse_float/benchmark.rb

@@ -1,7 +1,9 @@
-require_relative "../../harness/loader"
+require_relative "../../../harness/loader"
 
-use_ractor_gemfile("json_parse")
-puts "JSON #{JSON::VERSION}"
+Dir.chdir(__dir__)
+use_gemfile
+require "json"
+puts "json v#{JSON::VERSION}"
 
 ELEMENTS = 300_000
 list = ELEMENTS.times.map do |i|

benchmarks/ractor/json_parse_string/Gemfile

@@ -4,7 +4,7 @@
 # k-nucleotide benchmark - Ractor implementation
 # Mirrors the Process.fork version structure as closely as possible
 
-require_relative "../../harness/loader"
+require_relative "../../../harness/loader"
 
 def frequency(seq, length)
   frequencies = Hash.new(0)

benchmarks/ractor/json_parse_string.rb renamed to benchmarks/ractor/json_parse_string/benchmark.rb

@@ -6,7 +6,7 @@
 
 default_ractors = [
   0, # without ractor
-  1, 2, 4, 6, 8, 12, 16, 32
+  1, 2, 4, 6, 8#, 12, 16, 32
 ]
 if rs = ENV["YJIT_BENCH_RACTORS"]
   rs = rs.split(",").map(&:to_i) # If you want to include 0, you have to specify
@@ -31,6 +31,7 @@ def use_ractor_gemfile(filename)
   filename = File.expand_path("Gemfile_#{filename}.rb", "benchmarks/ractor/gemfiles")
   raise "Gemfile #{filename} doesn't exist" unless  File.exist?(filename)
   use_inline_gemfile do
+    gem "fiddle" # for maxrss
     instance_eval File.read(filename), filename, 1
   end
 end
@@ -70,7 +71,7 @@ def run_benchmark(num_itrs_hint, ractor_args: [], &block)
       else
         rs_list = []
         rs.times do
-          rs_list << Ractor.new(*([rs] + ractor_args), &block)
+          rs_list << Ractor.new(*([rs] + ractor_args), &block) # ractor_args are copied
         end
         while rs_list.any?
           r, _obj = Ractor.select(*rs_list)
@@ -88,6 +89,10 @@ def run_benchmark(num_itrs_hint, ractor_args: [], &block)
   return_results([], stats.values.flatten)
 end
 
+# NOTE: we use `ractor_deep_dup` instead of `Ractor.make_shareable(copy: true)` for the case of
+# sending args to the block without a ractor because the arguments passed to `run_benchmark` are
+# sometimes modified, and we want to allow that because it improves compatibility. We don't want
+# it to be deeply frozen.
 def ractor_deep_dup(args)
   if Array === args
     ret = []

benchmarks/ractor/knucleotide.rb renamed to benchmarks/ractor/knucleotide/benchmark.rb

@@ -47,19 +47,11 @@ def use_gemfile(extra_setup_cmd: nil)
   require "bundler"
   # Use Bundler.setup instead of require 'bundler/setup' to avoid bundler's autoswitch restarting the
   # process and messing with LOAD_PATH. Autoswitching occurs when the BUNDLED_WITH in the Gemfile.lock
-  # is a different version than the loaded version of bundler.
+  # is a different version than the loaded version of bundler. This can happen in development when
+  # switching between ruby versions.
   Bundler.setup
 end
 
-def use_inline_gemfile(&block)
-  raise  "Block must be given" unless block
-  require "bundler/inline"
-  gemfile(install=true) do
-    source "https://rubygems.org"
-    instance_eval(&block)
-  end
-end
-
 # This returns its best estimate of the Resident Set Size in bytes.
 # That's roughly the amount of memory the process takes, including shareable resources.
 # RSS reference: https://stackoverflow.com/questions/7880784/what-is-rss-and-vsz-in-linux-memory-management

harness-ractor/harness.rb

@@ -260,7 +260,7 @@ def run_benchmarks(ruby:, ruby_description:, categories:, name_filters:, out_pat
 
   bench_dir = "benchmarks"
 
-  if categories == ['ractor-only']
+  if categories == ["ractor-only"]
     bench_dir = File.join(bench_dir, "ractor")
     harness = "harness-ractor"
     categories = []