Merge pull request #1115 from jruby/ips

[chore] update scripts to benchmark-ips

Author: enebo

bench/benchmark_create.rb

@@ -25,30 +25,23 @@
     'a_timestamp' => Time.now
 }
 
-Benchmark.bmbm do |x|
+Benchmark.ips do |x|
+  x.config(:suite => BenchTestHelper::Suite::INSTANCE)
 
-  x.report("BenchRecord.create() [#{TIMES}x]") do
-    TIMES.times do
-      BenchRecord.create()
-    end
+  x.report("BenchRecord.create()") do
+    BenchRecord.create()
   end
 
   fields.each do |field, value|
     label = value
     label = "#{value[0,16]}...(#{value.size})" if value.is_a?(String) && value.size > 16
-    x.report("BenchRecord.create('#{field}' => #{label.inspect}) [#{TIMES}x]") do
-      attrs = Hash.new; attrs[field] = value
-      TIMES.times do
-        BenchRecord.create(attrs)
-      end
+    x.report("BenchRecord.create('#{field}' => #{label.inspect})") do
+      BenchRecord.create(field => value)
     end
   end
 
-  x.report("BenchRecord.create(...) [#{TIMES}x]") do
-    attrs = fields.dup
-    TIMES.times do
-      BenchRecord.create(attrs)
-    end
+  x.report("BenchRecord.create(...)") do
+    BenchRecord.create(fields.dup)
   end
 
 end

bench/benchmark_find_all.rb

@@ -4,26 +4,21 @@
 
 BenchTestHelper.gc
 
-Benchmark.bmbm do |x|
+Benchmark.ips do |x|
+  x.config(:suite => BenchTestHelper::Suite::INSTANCE)
 
   total = BenchRecord.count
 
-  x.report("BenchRecord.first(10) [#{TIMES}x]") do
-    TIMES.times do
-      BenchRecord.first(10)
-    end
+  x.report("BenchRecord.first(10)") do
+    BenchRecord.first(10)
   end
 
-  x.report("BenchRecord.last(100) [#{TIMES}x]") do
-    TIMES.times do
-      BenchRecord.last(100)
-    end
+  x.report("BenchRecord.last(100)") do
+    BenchRecord.last(100)
   end
 
-  x.report("BenchRecord.limit(100).load [#{TIMES}x]") do
-    TIMES.times do
-      BenchRecord.limit(100).load
-    end
+  x.report("BenchRecord.limit(100).load") do
+    BenchRecord.limit(100).load
   end
 
 end

bench/benchmark_find_attributes.rb

@@ -4,20 +4,17 @@
 
 BenchTestHelper.gc
 
-Benchmark.bmbm do |x|
+Benchmark.ips do |x|
+  x.config(:suite => BenchTestHelper::Suite::INSTANCE)
 
   an_id = BenchRecord.last.id
 
-  x.report("BenchRecord.find( an_id ) [#{TIMES}x]") do
-    TIMES.times do
-      BenchRecord.find( an_id )
-    end
+  x.report("BenchRecord.find(an_id)") do
+    BenchRecord.find( an_id )
   end
 
-  x.report("BenchRecord.find( an_id ).attributes [#{TIMES}x]") do
-    TIMES.times do
-      BenchRecord.find( an_id ).attributes
-    end
+  x.report("BenchRecord.find(an_id).attributes") do
+    BenchRecord.find( an_id ).attributes
   end
 
 end

bench/benchmark_helpers.rb

@@ -1,9 +1,9 @@
 require File.expand_path('setup', File.dirname(__FILE__))
 
-Benchmark.bmbm do |x|
-  x.report("ActiveRecord::ConnectionAdapters::Column.string_to_time [#{TIMES}x]") do
-    TIMES.times do
-      ActiveRecord::ConnectionAdapters::Column.string_to_time("Wed, 04 Sep 2013 03:00:00 EAT")
-    end
+Benchmark.ips do |x|
+  x.config(:suite => BenchTestHelper::Suite::INSTANCE)
+
+  x.report("ActiveRecord::ConnectionAdapters::Column.string_to_time") do
+    ActiveRecord::ConnectionAdapters::Column.string_to_time("Wed, 04 Sep 2013 03:00:00 EAT")
   end
-end
+end

bench/benchmark_selects.rb

@@ -19,24 +19,21 @@
     '*'
 ]
 
-Benchmark.bmbm do |x|
+Benchmark.ips do |x|
+  x.config(:suite => BenchTestHelper::Suite::INSTANCE)
 
   total = BenchRecord.count
   an_id = BenchRecord.last.id
 
   selects.each do |select|
-    x.report("BenchRecord.select('#{select}').where(id: i).first [#{TIMES}x]") do
-      TIMES.times do |i|
-        BenchRecord.select(select).where(id: i % total).first
-      end
+    x.report("BenchRecord.select('#{select}').where(id: i).first") do
+      BenchRecord.select(select).where(id: i % total).first
     end
   end
 
   selects.each do |select|
-    x.report("BenchRecord.select('#{select}').where(['id = ?', an_id]).first [#{TIMES}x]") do
-      TIMES.times do
-        BenchRecord.select(select).where(['id = ?', an_id]).first
-      end
+    x.report("BenchRecord.select('#{select}').where(['id = ?', an_id]).first") do
+      BenchRecord.select(select).where(['id = ?', an_id]).first
     end
   end
 

bench/benchmark_update.rb

@@ -27,34 +27,25 @@
 
 empty = {}
 
-records = []; TIMES.times { records << BenchRecord.create.reload }
+Benchmark.ips do |x|
+  x.config(:suite => BenchTestHelper::Suite::INSTANCE)
 
-Benchmark.bmbm do |x|
-
-  x.report("BenchRecord#update() [#{TIMES}x]") do
-    TIMES.times do |i|
-      records[i].update empty
-    end
+  record = BenchRecord.create.reload
+  x.report("BenchRecord#update()") do
+    record.update empty
   end
 
   fields.each do |field, value|
     label = value
     label = "#{value[0,16]}...(#{value.size})" if value.is_a?(String) && value.size > 16
-    attrs = Hash.new; attrs[field] = value
-    x.report("BenchRecord#update('#{field}' => #{label.inspect}) [#{TIMES}x]") do
-      # attrs = Hash.new; attrs[field] = value
-      TIMES.times do |i|
-        records[i].update(attrs)
-      end
+    record = BenchRecord.create.reload
+    x.report("BenchRecord#update('#{field}' => #{label.inspect})") do
+      record.update(field => value)
     end
   end
 
-  attrs = fields
-  x.report("BenchRecord#update(...) [#{TIMES}x]") do
-    # attrs = fields.dup
-    TIMES.times do |i|
-      records[i].update(attrs)
-    end
+  x.report("BenchRecord#update(...)") do
+    record.update(fields)
   end
 
 end

bench/setup.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 
-require 'rubygems' unless defined? Gem
+require 'benchmark/ips'
 
 if ENV['RAILS']  # Use local clone of Rails
   rails_dir = ENV['RAILS']
@@ -120,6 +120,26 @@ def gc; GC.start end
 
   end
 
+  class Suite # for Benchmar.ips
+
+    def warming(*)
+      BenchTestHelper.gc
+    end
+
+    def running(*)
+      BenchTestHelper.gc
+    end
+
+    def warmup_stats(*)
+    end
+
+    def add_report(*)
+    end
+
+    INSTANCE = self.new
+
+  end
+
 end
 
 def do_profile_data(&block)