Make -Iharness optional (#249)

* Make -Iharness optional * Add a comment about -Iharness Co-authored-by: Maxime Chevalier-Boisvert <[email protected]> * Rename harness/setup to harness/loader --------- Co-authored-by: Maxime Chevalier-Boisvert <[email protected]>
Shopify · Sep 6, 2023 · cd063d5 · cd063d5
1 parent d9cdb22
commit cd063d5
Show file tree

Hide file tree

Showing 41 changed files with 44 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -97,10 +97,9 @@ To run one or more specific benchmarks and record the data:
 This is the easiest way to run a single benchmark.
 It requires no setup at all and assumes nothing about the Ruby you are benchmarking.
 It's also convenient for profiling, debugging, etc, especially since all benchmarked code runs in that process.
-You can also use another harness or make your own by passing a different directory for `-I`.
 
 ```
-ruby -Iharness benchmarks/some_benchmark.rb
+ruby benchmarks/some_benchmark.rb
 ```
 
 ## Ruby options

diff --git a/benchmarks/30k_ifelse.rb b/benchmarks/30k_ifelse.rb
@@ -240010,7 +240010,7 @@ def inc(x)
 
 @x = 0
 
-require 'harness'
+require_relative '../harness/loader'
 
 INTERNAL_ITRS = Integer(ENV.fetch("INTERNAL_ITRS", 600))
 

diff --git a/benchmarks/30k_methods.rb b/benchmarks/30k_methods.rb
@@ -120007,7 +120007,7 @@ def inc()
   @count += 1
 end
 
-require 'harness'
+require_relative '../harness/loader'
 
 INTERNAL_ITRS = Integer(ENV.fetch("INTERNAL_ITRS", 2000))
 

diff --git a/benchmarks/activerecord/benchmark.rb b/benchmarks/activerecord/benchmark.rb
@@ -1,4 +1,4 @@
-require "harness"
+require_relative "../../harness/loader"
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/benchmarks/binarytrees/benchmark.rb b/benchmarks/binarytrees/benchmark.rb
@@ -22,7 +22,7 @@ def bottom_up_tree(depth)
 max_depth = min_depth + 2 if min_depth + 2 > max_depth
 stretch_depth = max_depth + 1
 
-require 'harness'
+require_relative '../../harness/loader'
 
 run_benchmark(1) do
   stretch_tree = bottom_up_tree(stretch_depth)

diff --git a/benchmarks/cfunc_itself.rb b/benchmarks/cfunc_itself.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../harness/loader'
 
 run_benchmark(50) do
   # 500K calls

diff --git a/benchmarks/chunky-png/benchmark.rb b/benchmarks/chunky-png/benchmark.rb
@@ -1,4 +1,4 @@
-require "harness"
+require_relative "../../harness/loader"
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/benchmarks/erubi-rails/benchmark.rb b/benchmarks/erubi-rails/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 Dir.chdir __dir__
 use_gemfile
 

diff --git a/benchmarks/erubi/benchmark.rb b/benchmarks/erubi/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 Dir.chdir __dir__
 use_gemfile
 

diff --git a/benchmarks/etanni/benchmark.rb b/benchmarks/etanni/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 Dir.chdir __dir__
 
 # This is an Etanni translation of the Erb template in the Erubi

diff --git a/benchmarks/fannkuchredux/benchmark.rb b/benchmarks/fannkuchredux/benchmark.rb
@@ -56,7 +56,7 @@ def fannkuch(n)
 #n = (ARGV[0] || 1).to_i
 n = 9 # Benchmarks Game uses n = 12, but it's too slow
 
-require 'harness'
+require_relative '../../harness/loader'
 
 run_benchmark(5) do
   5.times do

diff --git a/benchmarks/fib.rb b/benchmarks/fib.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../harness/loader'
 
 def fib(n)
   if n < 2

diff --git a/benchmarks/fluentd/benchmark.rb b/benchmarks/fluentd/benchmark.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'harness'
+require_relative '../../harness/loader'
 
 Dir.chdir(__dir__)
 use_gemfile

diff --git a/benchmarks/getivar.rb b/benchmarks/getivar.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../harness/loader'
 
 class TheClass
   def initialize

diff --git a/benchmarks/graphql-native/benchmark.rb b/benchmarks/graphql-native/benchmark.rb
@@ -1,4 +1,4 @@
-require "harness"
+require_relative "../../harness/loader"
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/benchmarks/graphql/benchmark.rb b/benchmarks/graphql/benchmark.rb
@@ -1,4 +1,4 @@
-require "harness"
+require_relative "../../harness/loader"
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/benchmarks/hexapdf/benchmark.rb b/benchmarks/hexapdf/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 Dir.chdir __dir__
 use_gemfile
 

diff --git a/benchmarks/keyword_args.rb b/benchmarks/keyword_args.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../harness/loader'
 
 def add(left:, right:)
   left + right

diff --git a/benchmarks/lee/benchmark.rb b/benchmarks/lee/benchmark.rb
@@ -83,7 +83,7 @@ def lay(depth, solution)
   end
 end
 
-require "harness"
+require_relative "../../harness/loader"
 Dir.chdir __dir__
 use_gemfile
 

diff --git a/benchmarks/liquid-c/benchmark.rb b/benchmarks/liquid-c/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/benchmarks/liquid-compile/benchmark.rb b/benchmarks/liquid-compile/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/benchmarks/liquid-render/benchmark.rb b/benchmarks/liquid-render/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/benchmarks/lobsters/benchmark.rb b/benchmarks/lobsters/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 
 ENV['RAILS_ENV'] ||= 'production'
 ENV['DISABLE_DATABASE_ENVIRONMENT_CHECK'] = '1' # Benchmarks don't really have 'production', so trash it at will.

diff --git a/benchmarks/mail/benchmark.rb b/benchmarks/mail/benchmark.rb
@@ -1,4 +1,4 @@
-require "harness"
+require_relative "../../harness/loader"
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/benchmarks/nbody/benchmark.rb b/benchmarks/nbody/benchmark.rb
@@ -133,7 +133,7 @@ def offset_momentum(bodies)
 nbodies = BODIES.size
 dt = 0.01
 
-require 'harness'
+require_relative '../../harness/loader'
 
 run_benchmark(10) do
   n.times do

diff --git a/benchmarks/optcarrot/benchmark.rb b/benchmarks/optcarrot/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 require_relative "lib/optcarrot"
 
 rom_path = File.join(__dir__, "examples/Lan_Master.nes")

diff --git a/benchmarks/psych-load/benchmark.rb b/benchmarks/psych-load/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/benchmarks/rack/benchmark.rb b/benchmarks/rack/benchmark.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "harness"
+require_relative "../../harness/loader"
 
 Dir.chdir(__dir__)
 use_gemfile

diff --git a/benchmarks/railsbench/benchmark.rb b/benchmarks/railsbench/benchmark.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../../harness/loader'
 
 ENV['RAILS_ENV'] ||= 'production'
 

diff --git a/benchmarks/respond_to.rb b/benchmarks/respond_to.rb
@@ -1,7 +1,7 @@
 # Microbenchmark to test the performance of respond_to?
 # This is one of the top most called methods in rack/railsbench
 
-require 'harness'
+require_relative '../harness/loader'
 
 class A
   def foo

diff --git a/benchmarks/ruby-json/benchmark.rb b/benchmarks/ruby-json/benchmark.rb
@@ -1,4 +1,4 @@
-require "harness"
+require_relative "../../harness/loader"
 
 require "json"
 require "strscan"

diff --git a/benchmarks/ruby-lsp/benchmark.rb b/benchmarks/ruby-lsp/benchmark.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "harness"
+require_relative "../../harness/loader"
 
 Dir.chdir(__dir__)
 use_gemfile

diff --git a/benchmarks/rubykon/benchmark.rb b/benchmarks/rubykon/benchmark.rb
@@ -2,7 +2,7 @@
 # https://github.com/benchmark-driver/sky2-bench/blob/master/benchmark/rubykon-benchmark.rb,
 # part of benchmark-driver's default benchmarking suite, by Takashi Kokubun.
 
-require 'harness'
+require_relative '../../harness/loader'
 
 require_relative 'lib/rubykon'
 

diff --git a/benchmarks/sequel/benchmark.rb b/benchmarks/sequel/benchmark.rb
@@ -1,4 +1,4 @@
-require "harness"
+require_relative "../../harness/loader"
 require "securerandom" # Provides `Random::Formatter` in Ruby 2.6+
 
 Dir.chdir __dir__

diff --git a/benchmarks/setivar.rb b/benchmarks/setivar.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../harness/loader'
 
 class TheClass
   def initialize

diff --git a/benchmarks/setivar_object.rb b/benchmarks/setivar_object.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../harness/loader'
 
 class TheClass
   def initialize

diff --git a/benchmarks/setivar_young.rb b/benchmarks/setivar_young.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../harness/loader'
 
 class TheClass
   def initialize

diff --git a/benchmarks/str_concat.rb b/benchmarks/str_concat.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'harness'
+require_relative '../harness/loader'
 
 NUM_ITERS = 10 * 1024
 TEST_STR = 'sssssséé'

diff --git a/benchmarks/throw.rb b/benchmarks/throw.rb
@@ -1,4 +1,4 @@
-require 'harness'
+require_relative '../harness/loader'
 
 def foo
   yield

diff --git a/benchmarks/tinygql/benchmark.rb b/benchmarks/tinygql/benchmark.rb
@@ -1,4 +1,4 @@
-require "harness"
+require_relative "../../harness/loader"
 
 Dir.chdir __dir__
 use_gemfile

diff --git a/harness/loader.rb b/harness/loader.rb
@@ -0,0 +1,4 @@
+# Use harness/harness.rb by default. You can change it with -I option.
+# i.e. ruby -Iharness benchmarks/railsbench/benchmark.rb
+$LOAD_PATH << File.expand_path(__dir__)
+require "harness"