benchcc 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07b5d40f9fee0b3fb681ad158ad178b59f7c3836
-  data.tar.gz: 5031ce36ea4b4019f516a1cc70f1a57a5f50585e
+  metadata.gz: 54612ab25b2af557fc641b9ccfaefcbc043ff5eb
+  data.tar.gz: ae13a4cbd526c90c51dc19f3db4e942903f5fc93
 SHA512:
-  metadata.gz: 4598c095d3c2be82c288c45be30f8358bbf128e4d0ca21ec31cbbb4475ab8e58d30a1be3a04c6fe6c68c2631641eef26c88aa43abdd680db6fa9cee26a70bd27
-  data.tar.gz: 0b4ba5c9acf0cecf64e09d48a5b32efbe14aa54315ba223e08c23fdbe9c2729ff11e244ba3ee276b0ba9273455473fae511cecad204a122dcc9b646d12413cbc
+  metadata.gz: b8ecedf598268b9173a0031521608bd5f8113a889790eab123281266b08611f046b448ce67f8f50edf0fa51d31d34cb8bf4671dcfc20ca00e4b32fd588dd4fe5
+  data.tar.gz: d6fe33c29a832ef6c1bf9e050d7bdd159a87e1d2ecc631dd856713cfcc545e85dc70be2c2e915162e593119cfad92e03dda5030095aa92f747fb4eab6d5d9666

data/benchcc.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'gnuplot', "~> 2.6"
   s.add_dependency 'rake', "~> 10.2"
   s.add_dependency 'ruby-progressbar', "~> 1.4"
-  s.add_dependency 'tilt', '~> 2.0.1'
+  s.add_dependency 'tilt', '~> 2.0'
 end

data/lib/benchcc/benchmark.rb

@@ -20,19 +20,17 @@ module Benchcc
     end
   end
 
-  def benchmark(file, envs, timeout: 10, relative_to: File.dirname(file), &block)
+  def benchmark(file, envs, timeout: 10, relative_to: File.dirname(file), stderr: $stderr, &block)
     progress = ProgressBar.create(format: "#{file} %p%% | %B |",
                                   total: envs.size)
-    consecutive_errors, data = 0, []
+    data = []
     envs.each do |env|
-      break if consecutive_errors >= 2
       code = Renderer.new(relative_to).render(file, **env)
       begin
         Timeout::timeout(timeout) { data << env.merge(block.call(code).to_h) }
-        consecutive_errors = 0
       rescue CompilationError, Timeout::Error => e
-        $stderr << e
-        consecutive_errors += 1
+        stderr << e
+        break
       end
       progress.increment
     end

data/lib/benchcc/version.rb

@@ -1,3 +1,3 @@
 module Benchcc
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/benchmark_spec.rb

@@ -6,18 +6,18 @@ require 'timeout'
 
 
 describe Benchcc.method(:benchmark) do
-  it('should ignore timeouts') {
+  it('should stop on timeout') {
     timeout = 0.3
-    envs = [{time: timeout + 0.1}, {time: timeout - 0.1},
-            {time: timeout + 0.2}, {time: timeout - 0.2}]
+    envs = [{time: timeout - 0.1}, {time: timeout + 0.1}, {time: timeout - 0.2}]
     Tempfile.create('') do |file|
-      file.write('<%= time %>')
-      file.flush
-      data = Benchcc.benchmark(file.path, envs, timeout: timeout) do |code|
+      file.write('<%= time %>') && file.flush
+      devnull = File.open(File::NULL, 'w')
+
+      data = Benchcc.benchmark(file.path, envs, timeout: timeout, stderr: devnull) do |code|
         sleep(code.to_f)
         {time: code.to_f}
       end
-      expect(data).to eq(envs.select { |env| env[:time] < timeout })
+      expect(data).to eq(envs.take_while { |env| env[:time] < timeout })
     end
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchcc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Louis Dionne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gnuplot
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 description: Benchcc is a collection of utilities to make easier the task of benchmarking
   C++ metaprograms
 email:
@@ -82,12 +82,6 @@ files:
 - Rakefile
 - benchcc.gemspec
 - benchmarks/Rakefile
-- benchmarks/fmap/_env.rb
-- benchmarks/fmap/_main.erb
-- benchmarks/fmap/hana_list.erb.cpp
-- benchmarks/fmap/mpl11_list.erb.cpp
-- benchmarks/fmap/mpl_list.erb.cpp
-- benchmarks/fmap/mpl_vector.erb.cpp
 - benchmarks/include/_env.rb
 - benchmarks/include/hana.erb.cpp
 - benchmarks/include/mpl.erb.cpp
@@ -97,16 +91,6 @@ files:
 - benchmarks/sum/_main.erb
 - benchmarks/sum/constexpr.erb.cpp
 - benchmarks/sum/mpl11_variadic_foldl.erb.cpp
-- benchmarks/tuple_create/_env.rb
-- benchmarks/tuple_create/boost_tuple.erb.cpp
-- benchmarks/tuple_create/fusion_tuple.erb.cpp
-- benchmarks/tuple_create/hana_list.erb.cpp
-- benchmarks/tuple_create/std_tuple.erb.cpp
-- benchmarks/tuple_last/_env.rb
-- benchmarks/tuple_last/boost_tuple.erb.cpp
-- benchmarks/tuple_last/fusion_tuple.erb.cpp
-- benchmarks/tuple_last/hana_list.erb.cpp
-- benchmarks/tuple_last/std_tuple.erb.cpp
 - benchmarks/type_foldl/_env.rb
 - benchmarks/type_foldl/_main.erb
 - benchmarks/type_foldl/hana_list.erb.cpp
@@ -114,12 +98,6 @@ files:
 - benchmarks/type_foldl/mpl11_list.erb.cpp
 - benchmarks/type_foldl/mpl_list.erb.cpp
 - benchmarks/type_foldl/mpl_vector.erb.cpp
-- benchmarks/value_foldl/_env.rb
-- benchmarks/value_foldl/_main.erb
-- benchmarks/value_foldl/fusion_cons.erb.cpp
-- benchmarks/value_foldl/fusion_list.erb.cpp
-- benchmarks/value_foldl/fusion_vector.erb.cpp
-- benchmarks/value_foldl/hana_list.erb.cpp
 - lib/benchcc.rb
 - lib/benchcc/benchmark.rb
 - lib/benchcc/compiler.rb

data/benchmarks/fmap/_env.rb

@@ -1,3 +0,0 @@
-(0...1000).map { |depth|
-  { breadth: 1, depth: depth }
-}

data/benchmarks/fmap/_main.erb

@@ -1,7 +0,0 @@
-<%= (0...breadth).map { |breadth|
-    xs = (0...depth).map { |depth| "x#{breadth}<#{depth}>" }
-    <<-EOS
-    template <int> struct x#{breadth} { using type = x#{breadth}; };
-    #{yield xs, breadth, depth}
-    EOS
-}.join("\n") %>

data/benchmarks/fmap/hana_list.erb.cpp

@@ -1,18 +0,0 @@
-#include <boost/hana/list.hpp>
-
-
-template <typename X>
-struct _f { };
-
-constexpr struct {
-    template <typename X>
-    constexpr _f<X> operator()(X) const;
-} f{};
-
-<%=
-    render('_main.erb') do |xs, breadth, depth|
-        xs = xs.map { |x| "#{x}{}" }.join(', ')
-        list = "boost::hana::list(#{xs})"
-        "static const auto go#{breadth} = boost::hana::fmap(f, #{list});"
-    end
-%>

data/benchmarks/fmap/mpl11_list.erb.cpp

@@ -1,15 +0,0 @@
-#include <boost/mpl11/list.hpp>
-
-
-struct f {
-    using type = f;
-    template <typename>
-    struct apply { struct type; };
-};
-
-<%=
-    render('_main.erb') do |xs, breadth, depth|
-        list = "boost::mpl11::list<#{xs.join(', ')}>"
-        "using go#{breadth} = boost::mpl11::fmap<f, #{list}>::type;"
-    end
-%>

data/benchmarks/fmap/mpl_list.erb.cpp

@@ -1,15 +0,0 @@
-#include <boost/mpl/transform.hpp>
-<%= Benchcc::MPL::List.new(0...depth).includes %>
-
-
-struct f {
-    template <typename>
-    struct apply { struct type; };
-};
-
-<%=
-    render('_main.erb') do |xs, breadth, depth|
-        list = Benchcc::MPL::List.new(xs)
-        "using go#{breadth} = boost::mpl::transform<#{list}, f>::type;"
-    end
-%>

data/benchmarks/fmap/mpl_vector.erb.cpp

@@ -1,15 +0,0 @@
-#include <boost/mpl/transform.hpp>
-<%= Benchcc::MPL::Vector.new(0...depth).includes %>
-
-
-struct f {
-    template <typename>
-    struct apply { struct type; };
-};
-
-<%=
-    render('_main.erb') do |xs, breadth, depth|
-        vector = Benchcc::MPL::Vector.new(xs)
-        "using go#{breadth} = boost::mpl::transform<#{vector}, f>::type;"
-    end
-%>

data/benchmarks/tuple_create/_env.rb

@@ -1,3 +0,0 @@
-(0...1000).map { |depth|
-  { depth: depth }
-}

data/benchmarks/tuple_create/boost_tuple.erb.cpp

@@ -1,6 +0,0 @@
-#include <boost/tuple/tuple.hpp>
-
-
-int main() {
-    auto go = boost::make_tuple(<%= (0...depth).to_a.join(', ') %>);
-}

data/benchmarks/tuple_create/fusion_tuple.erb.cpp

@@ -1,6 +0,0 @@
-#include <boost/fusion/tuple.hpp>
-
-
-int main() {
-    auto go = boost::fusion::make_tuple(<%= (0...depth).to_a.join(', ') %>);
-}

data/benchmarks/tuple_create/hana_list.erb.cpp

@@ -1,6 +0,0 @@
-#include <boost/hana/list.hpp>
-
-
-int main() {
-    auto go = boost::hana::list(<%= (0...depth).to_a.join(', ') %>);
-}

data/benchmarks/tuple_create/std_tuple.erb.cpp

@@ -1,6 +0,0 @@
-#include <tuple>
-
-
-int main() {
-    auto go = std::make_tuple(<%= (0...depth).to_a.join(', ') %>);
-}

data/benchmarks/tuple_last/_env.rb

@@ -1,3 +0,0 @@
-(1...1000).map { |depth|
-  { depth: depth }
-}

data/benchmarks/tuple_last/boost_tuple.erb.cpp

@@ -1,7 +0,0 @@
-#include <boost/tuple/tuple.hpp>
-
-
-int main() {
-    auto go = boost::make_tuple(<%= (0...depth).to_a.join(', ') %>);
-    auto last = boost::get< <%= depth - 1 %>  >(go);
-}

data/benchmarks/tuple_last/fusion_tuple.erb.cpp

@@ -1,7 +0,0 @@
-#include <boost/fusion/tuple.hpp>
-
-
-int main() {
-    auto go = boost::fusion::make_tuple(<%= (0...depth).to_a.join(', ') %>);
-    auto last = boost::fusion::get< <%= depth - 1 %>  >(go);
-}

data/benchmarks/tuple_last/hana_list.erb.cpp

@@ -1,7 +0,0 @@
-#include <boost/hana/list.hpp>
-
-
-int main() {
-    auto go = boost::hana::list(<%= (0...depth).to_a.join(', ') %>);
-    auto last = boost::hana::at(boost::hana::size_t<    <%= depth - 1 %>  >, go);
-}

data/benchmarks/tuple_last/std_tuple.erb.cpp

@@ -1,7 +0,0 @@
-#include <tuple>
-
-
-int main() {
-    auto go = std::make_tuple(<%= (0...depth).to_a.join(', ') %>);
-    auto last = std::get< <%= depth - 1 %>  >(go);
-}

data/benchmarks/value_foldl/_env.rb

@@ -1,3 +0,0 @@
-(0..1000).step(5).map { |depth|
-  { breadth: 1, depth: depth }
-}

data/benchmarks/value_foldl/_main.erb

@@ -1,17 +0,0 @@
-template <typename ...>
-struct result { };
-
-constexpr struct {
-    template <typename State, typename X>
-    constexpr result<State, X> operator()(State, X) const
-    { return {}; }
-} f{};
-
-<%= (0...breadth).map { |breadth|
-    xs = (0...depth).map { |depth| "x#{breadth}<#{depth}>" }
-    <<-EOS
-    constexpr struct { } state#{breadth}{};
-    template <int> struct x#{breadth} { };
-    static const auto go#{breadth} = #{yield 'f', "state#{breadth}", xs};
-    EOS
-}.join("\n") %>

data/benchmarks/value_foldl/fusion_cons.erb.cpp

@@ -1,8 +0,0 @@
-#include <boost/fusion/algorithm/iteration/fold.hpp>
-<%= Benchcc::Fusion::Cons.new(0...depth).includes %>
-
-
-<%= render('_main.erb') do |f, state, xs|
-    cons = Benchcc::Fusion::Cons.new(xs)
-    "boost::fusion::fold(#{cons}{}, #{state}, #{f})"
-end %>

data/benchmarks/value_foldl/fusion_list.erb.cpp

@@ -1,9 +0,0 @@
-<%= Benchcc::Fusion::List.new(0...depth).includes %>
-
-#include <boost/fusion/algorithm/iteration/fold.hpp>
-
-
-<%= render('_main.erb') do |f, state, xs|
-    list = Benchcc::Fusion::List.new(xs)
-    "boost::fusion::fold(#{list}{}, #{state}, #{f})"
-end %>

data/benchmarks/value_foldl/fusion_vector.erb.cpp

@@ -1,9 +0,0 @@
-<%= Benchcc::Fusion::Vector.new(0...depth).includes %>
-
-#include <boost/fusion/algorithm/iteration/fold.hpp>
-
-
-<%= render('_main.erb') do |f, state, xs|
-    vector = Benchcc::Fusion::Vector.new(xs)
-    "boost::fusion::fold(#{vector}{}, #{state}, #{f})"
-end %>

data/benchmarks/value_foldl/hana_list.erb.cpp

@@ -1,6 +0,0 @@
-#include <boost/hana/list.hpp>
-
-<%= render('_main.erb') do |f, state, xs|
-    xs = xs.map { |x| "#{x}{}" }.join(', ')
-    "boost::hana::foldl(#{f}, #{state}, boost::hana::list(#{xs}))"
-end %>