kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

benchmark/driver.rb: fully obsolete this

Browse source 
in favor of just using benchmark_driver.gem.

common.mk: The new `make benchmark` covers the both usages for old `make
benchmark` and old `make benchmark-each`. So `make benchmark-each` is
dropped now.

benchmark/README.md: Explain its details

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-07-09 16:31:35 +00:00
parent 0b519e110f
commit 7bed459a26
3 changed files with 14 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
benchmark/README.md
View file

@ -31,19 +31,16 @@ make benchmark
# Or compare with specific ruby binary
make benchmark COMPARE_RUBY="/path/to/ruby --jit"
# Run vm1 benchmarks
make benchmark ITEM=vm1
# Run some limited benchmarks in ITEM-matched files
make benchmark ITEM=vm1 OPTS=--filter=block
# You can specify the benchmark by an exact filename instead of using
# the default argument: ARGS=$(srcdir)/benchmark/*$(ITEM)*.yml
make benchmark ARGS=../benchmark/erb_render.yml
# You can specify any option via $OPTS
make benchmark OPTS="--help"
```
## make benchmark-each
`make benchmark-each` is similar to `make benchmark`, but it allows to execute
some specific benchmarks.
```bash
# Run vm1 benchmarks
make benchmark-each ITEM=vm1
# Match erb but exclude app_erb to run only erb_render
make benchmark-each ITEM=erb OPTS="--exclude=app_erb"
```

105
benchmark/driver.rb
View file

@ -1,105 +0,0 @@
#!/usr/bin/env ruby
#
# Wrapper of benchmark-driver command for `make benchmark` and `make benchmark-each`.
#
begin
require 'optparse'
rescue LoadError
$:.unshift File.join(File.dirname(__FILE__), '../lib')
require 'optparse'
end
require 'shellwords'
class BenchmarkDriver
# Run benchmark-driver prepared by `make update-benchmark-driver`
def self.run(*args)
benchmark_driver = File.expand_path('./benchmark-driver/exe/benchmark-driver', __dir__)
command = [benchmark_driver, *args]
unless system(command.shelljoin)
abort "Failed to execute: #{command.shelljoin}"
end
end
def initialize(opt = {})
@dir = opt[:dir]
@pattern = opt[:pattern]
@exclude = opt[:exclude]
end
def files
Dir.glob(File.join(@dir, '*.yml')).map{|file|
next if @pattern && /#{@pattern}/ !~ File.basename(file)
next if @exclude && /#{@exclude}/ =~ File.basename(file)
file
}.compact.sort
end
end
if __FILE__ == $0
opt = {
runner: 'ips',
output: 'compare',
execs: [],
rbenvs: [],
repeat: 1,
verbose: [],
dir: File.dirname(__FILE__),
}
parser = OptionParser.new{|o|
#
# Original benchmark-driver imitation
#
o.on('-r', '--runner [TYPE]', 'Specify runner type: ips, time, memory, once (default: ips)'){|r|
abort '-r, --runner must take argument but not given' if r.nil?
opt[:runner] = r
}
o.on('-o', '--output [TYPE]', 'Specify output type: compare, simple, markdown, record (default: compare)'){|o|
abort '-o, --output must take argument but not given' if o.nil?
opt[:output] = o
}
o.on('-e', '--executables [EXECS]',
"Specify benchmark one or more targets (e1::path1; e2::path2; e3::path3;...)"){|e|
e.split(/;/).each{|path|
opt[:execs] << path
}
}
o.on('--rbenv [VERSIONS]', 'Specify benchmark targets with rbenv version (vX.X.X;vX.X.X;...)'){|v|
opt[:rbenvs] << v
}
o.on('--repeat-count [NUM]', "Repeat count"){|n|
opt[:repeat] = n.to_i
}
o.on('-v', '--verbose', 'Verbose mode. Multiple -v options increase visilibity (max: 2)'){|v|
opt[:verbose] << '-v'
}
#
# benchmark/driver.rb original (deprecated, to be removed later)
#
o.on('--directory [DIRECTORY]', "Benchmark suites directory"){|d|
opt[:dir] = d
}
o.on('--pattern [PATTERN]', "Benchmark name pattern"){|p|
opt[:pattern] = p
}
o.on('--exclude [PATTERN]', "Benchmark exclude pattern"){|e|
opt[:exclude] = e
}
}
yamls = parser.parse!(ARGV)
yamls += BenchmarkDriver.new(opt).files
# Many variables in Makefile are not `foo,bar` but `foo bar`. So it's converted here.
execs = opt[:execs].map { |exec| ['--executables', exec] }.flatten
rbenv = opt[:rbenvs].map { |r| ['--rbenv', r] }
BenchmarkDriver.run(
*yamls, *execs, *rbenv, *opt[:verbose],
"--runner=#{opt[:runner]}", "--output=#{opt[:output]}",
"--repeat-count=#{opt[:repeat]}",
)
end

13
common.mk
View file

@ -1113,24 +1113,19 @@ bisect-ruby: PHONY
COMPARE_RUBY = $(BASERUBY)
ITEM =
ARGS = $(srcdir)/benchmark/*$(ITEM)*.yml
OPTS =
# You can pass several options through OPTS environment variable.
# $ make benchmark OPTS="--help" displays more detail.
# $ make benchmark ARGS="--help" displays more detail.
# for example,
# $ make benchmark COMPARE_RUBY="ruby-trunk" OPTS="-e ruby-2.2.2"
# This command compares trunk and built-ruby and 2.2.2
benchmark: miniruby$(EXEEXT) update-benchmark-driver PHONY
$(BASERUBY) $(srcdir)/benchmark/driver.rb \
$(BASERUBY) -rrubygems $(srcdir)/benchmark/benchmark-driver/exe/benchmark-driver \
--executables="compare-ruby::$(COMPARE_RUBY) -I$(EXTOUT)/common --disable-gem" \
--executables="built-ruby::$(MINIRUBY) -r$(srcdir)/prelude --disable-gem" \
--directory=$(srcdir)/benchmark $(OPTS)
benchmark-each: miniruby$(EXEEXT) update-benchmark-driver PHONY
$(BASERUBY) $(srcdir)/benchmark/driver.rb \
--executables="compare-ruby::$(COMPARE_RUBY) -I$(EXTOUT)/common --disable-gem" \
--executables="built-ruby::$(MINIRUBY) -r$(srcdir)/prelude --disable-gem" \
--pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
$(ARGS) $(OPTS)
run.gdb:
echo set breakpoint pending on > run.gdb