Merge pull request #677 from eregon/fix-benchmarks

Fix benchmarks and harness, compile libtest automatically
ffi · Feb 18, 2019 · 476b9a8 · 476b9a8
2 parents a26e88c + 90d0d1c
commit 476b9a8
Show file tree

Hide file tree

Showing 43 changed files with 151 additions and 170 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ language: ruby
 script:
   - bundle exec rake compile || bundle exec rake compile
   - bundle exec rake test
+  - ITER=10 bundle exec rake bench:all
 os:
   - linux
   - osx

diff --git a/Rakefile b/Rakefile
@@ -56,8 +56,8 @@ task :test => [ :spec ]
 
 namespace :bench do
   ITER = ENV['ITER'] ? ENV['ITER'].to_i : 100000
-  bench_libs = "-Ilib -I#{BUILD_DIR}" unless RUBY_PLATFORM == "java"
-  bench_files = Dir["bench/bench_*.rb"].reject { |f| f == "bench_helper.rb" }
+  bench_libs = "-Ilib" unless RUBY_PLATFORM == "java"
+  bench_files = Dir["bench/bench_*.rb"].reject { |f| f == "bench/bench_helper.rb" }
   bench_files.each do |bench|
     task File.basename(bench, ".rb")[6..-1] => TEST_DEPS do
       sh %{#{Gem.ruby} #{bench_libs} #{bench} #{ITER}}

diff --git a/bench/bench_FFFrV.rb b/bench/bench_FFFrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_FrV.rb b/bench/bench_FrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_IIIIIIrV.rb b/bench/bench_IIIIIIrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_IIIrI.rb b/bench/bench_IIIrI.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library
@@ -7,11 +7,9 @@ module LibTest
 end
 
 
-puts "Benchmark [ :int, :int, :int ], :void performance, #{ITER}x calls"
-
+puts "Benchmark [ :int, :int, :int ], :int performance, #{ITER}x calls"
 10.times {
   puts Benchmark.measure {
     ITER.times { LibTest.bench(0, 1, 2) }
   }
 }
-puts "Benchmark Invoker.call [ :int, :int, :int ], :void performance, #{ITER}x calls"
diff --git a/bench/bench_IIIrV.rb b/bench/bench_IIIrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_IrV.rb b/bench/bench_IrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_LLLrV.rb b/bench/bench_LLLrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_PPPrV.rb b/bench/bench_PPPrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_PPrV.rb b/bench/bench_PPrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_PrV.rb b/bench/bench_PrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_SrV.rb b/bench/bench_SrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_VrI.rb b/bench/bench_VrI.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_VrV.rb b/bench/bench_VrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_autoptr.rb b/bench/bench_autoptr.rb
@@ -1,7 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
-require 'benchmark'
-require 'ffi'
 iter = ITER
 
 class Ptr < FFI::AutoPointer
@@ -16,7 +14,7 @@ module LibC
   attach_function :malloc, [ :long ], Ptr, :ignore_error => true
   attach_function :malloc2, :malloc, [ :long ], :pointer, :ignore_error => true
   attach_function :free, [ :pointer ], :void, :ignore_error => true
-  def self.finalizer(ptr) 
+  def self.finalizer(ptr)
     proc { LibC.free(ptr) }
   end
 end
@@ -32,11 +30,10 @@ def self.finalizer(ptr)
 puts "Benchmark ObjectSpace finalizer performance, #{iter}x"
 10.times {
   puts Benchmark.measure {
-    iter.times { 
+    iter.times {
       ptr = LibC.malloc2(4)
       ptr2 = FFI::Pointer.new(ptr)
       ObjectSpace.define_finalizer(ptr2, LibC.finalizer(ptr))
     }
   }
 }
-
diff --git a/bench/bench_buffer.rb b/bench/bench_buffer.rb
@@ -1,7 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
-require 'benchmark'
-require 'ffi'
 iter = ITER
 
 module BufferBench
@@ -109,4 +107,3 @@ class IntStruct < FFI::Struct
     iter.times { BufferBench.bench_buffer_out(FFI::Buffer.alloc_out(4, 1, true), 0) }
   }
 }
-
diff --git a/bench/bench_buffer_alloc.rb b/bench/bench_buffer_alloc.rb
@@ -1,7 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
-require 'benchmark'
-require 'ffi'
 iter = ITER
 
 puts "Benchmark Buffer.new(:int, 1, true)) performance, #{iter}x"
@@ -43,4 +41,3 @@
     end
   }
 }
-
diff --git a/bench/bench_buffer_fill.rb b/bench/bench_buffer_fill.rb
@@ -1,15 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
-require 'benchmark'
-require 'ffi'
 iter = ITER
 
 puts "Benchmark Buffer#put_array_of_float performance, #{iter}x"
 
 5.times {
   ptr = FFI::Buffer.new(:float, 8, false)
   puts Benchmark.measure {
-    iter.times { 
+    iter.times {
       ptr.put_array_of_float(0, [ 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8 ])
     }
   }
@@ -19,7 +17,7 @@
 puts "Benchmark Buffer.new(:float, 8, false)).put_array_of_float performance, #{iter}x"
 5.times {
   puts Benchmark.measure {
-    iter.times { 
+    iter.times {
       ptr = FFI::Buffer.new(:float, 8, false)
       ptr.put_array_of_float(0, [ 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8 ])
     }

diff --git a/bench/bench_chmod.rb b/bench/bench_chmod.rb
@@ -1,8 +1,6 @@
-require 'benchmark'
-require 'ffi'
-require 'ffi/platform'
+require_relative 'bench_helper'
 
-iter = 10_000
+iter = ITER
 file = "README"
 
 module Posix

diff --git a/bench/bench_closure_IIIrV.rb b/bench/bench_closure_IIIrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library
@@ -65,4 +65,3 @@ def call(a, b, c); nil; end
     ITER.times { LibTest.rb_bench(1, 2, 3) {} }
   }
 }
-
diff --git a/bench/bench_closure_IrV.rb b/bench/bench_closure_IrV.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library
@@ -37,4 +37,3 @@ def self.rb_bench(i, &block); nil; end
     ITER.times { LibTest.rb_bench(1) {} }
   }
 }
-
diff --git a/bench/bench_closure_VrV.rb b/bench/bench_closure_VrV.rb
@@ -1,14 +1,14 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library
   ffi_lib LIBTEST_PATH
   callback :closureVrV, [ ], :void
-  
+
   attach_function :ffi_bench, :testClosureVrV, [ :closureVrV ], :void
   @blocking = true
   attach_function :threaded_bench, :testThreadedClosureVrV, [ :closureVrV, :int ], :void
-  
+
   def self.rb_bench(&block)
     yield
   end
@@ -51,4 +51,3 @@ def self.rb_bench(&block)
     ITER.times { LibTest.rb_bench {} }
   }
 }
-
diff --git a/bench/bench_enum.rb b/bench/bench_enum.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library
@@ -43,4 +43,3 @@ def self.rb_bench(i0); nil; end
     ITER.times { LibTest.rb_bench(:a) }
   }
 }
-
diff --git a/bench/bench_enum_i.rb b/bench/bench_enum_i.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module LibTest
   extend FFI::Library

diff --git a/bench/bench_getlogin.rb b/bench/bench_getlogin.rb
@@ -1,8 +1,7 @@
-require 'benchmark'
-require 'ffi'
+require_relative 'bench_helper'
 require 'etc'
 
-iter = 1000000
+iter = ITER
 
 module Posix
   extend FFI::Library
@@ -13,15 +12,15 @@ module Posix
   raise ArgumentError, "FFI getlogin returned incorrect value"
 end
 
-puts "Benchmark FFI getlogin(2) performance, #{iter}x"
+puts "Benchmark FFI getlogin(2) performance, #{ITER}x"
 
 10.times {
   puts Benchmark.measure {
     iter.times { Posix.getlogin }
   }
 }
 
-puts "Benchmark Etc.getlogin performance, #{iter}x"
+puts "Benchmark Etc.getlogin performance, #{ITER}x"
 10.times {
   puts Benchmark.measure {
     iter.times { Etc.getlogin }

diff --git a/bench/bench_getpid.rb b/bench/bench_getpid.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 iter = ITER
 

diff --git a/bench/bench_gettimeofday.rb b/bench/bench_gettimeofday.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module Posix
   extend FFI::Library

diff --git a/bench/bench_getuid.rb b/bench/bench_getuid.rb
@@ -1,7 +1,6 @@
-require 'benchmark'
-require 'ffi'
+require_relative 'bench_helper'
 
-iter = 100000
+iter = ITER
 
 module Posix
   extend FFI::Library

diff --git a/bench/bench_helper.rb b/bench/bench_helper.rb
@@ -1,6 +1,18 @@
-require "rubygems"
-#require 'ffi/times' if RUBY_PLATFORM =~ /java/
 require 'benchmark'
+require 'rbconfig'
+
+lib = File.expand_path('../../lib', __FILE__)
+
+cext = "#{lib}/ffi_c.#{RbConfig::CONFIG['DLEXT']}"
+unless File.exist?(cext)
+  abort "#{cext} is not compiled. Compile it with 'rake compile' first."
+end
+
+$LOAD_PATH.unshift(lib)
 require 'ffi'
-ITER = ENV['ITER'] ? ENV['ITER'].to_i : 100000
-LIBTEST_PATH = File.expand_path("../../spec/ffi/fixtures/libtest.#{FFI::Platform::LIBSUFFIX}", __FILE__)
+
+require_relative '../spec/ffi/fixtures/compile'
+
+ITER = ENV['ITER'] ? ENV['ITER'].to_i : 100_000
+
+LIBTEST_PATH = TestLibrary::PATH
diff --git a/bench/bench_math.rb b/bench/bench_math.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
 module FFIMath
   extend FFI::Library

diff --git a/bench/bench_memptr_alloc.rb b/bench/bench_memptr_alloc.rb
@@ -1,7 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
-require 'benchmark'
-require 'ffi'
 iter = ITER
 
 module LibC
@@ -54,9 +52,8 @@ module LibC
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
   require 'java'
   puts "calling java gc"
-  10.times { 
-    java.lang.System.gc 
+  10.times {
+    java.lang.System.gc
     sleep 1
   }
 end
-
diff --git a/bench/bench_memptr_fill.rb b/bench/bench_memptr_fill.rb
@@ -1,15 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper"))
+require_relative 'bench_helper'
 
-require 'benchmark'
-require 'ffi'
 iter = ITER
 
 puts "Benchmark MemoryPointer#put_array_of_float performance, #{iter}x"
 
 5.times {
   ptr = FFI::MemoryPointer.new(:float, 8, false)
   puts Benchmark.measure {
-    iter.times { 
+    iter.times {
       ptr.put_array_of_float(0, [ 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8 ])
     }
   }
@@ -19,7 +17,7 @@
 puts "Benchmark MemoryPointer.new(:float, 8, false)).put_array_of_float performance, #{iter}x"
 5.times {
   puts Benchmark.measure {
-    iter.times { 
+    iter.times {
       ptr = FFI::MemoryPointer.new(:float, 8, false)
       ptr.put_array_of_float(0, [ 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8 ])
     }