benchcc 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7748c9c22e06d6b849fe2b2bcbfb0b656da2d86
-  data.tar.gz: f16027a06f20dd5f994c5c64935c2acdc4dae328
+  metadata.gz: 3bb8d387e7a5f6c86297ad57e1e8cef520ded506
+  data.tar.gz: 0693559053329ba387136023760b898bec78af3e
 SHA512:
-  metadata.gz: cf8617a11e5eae06eefa8f77579373d74edb09fa34a5a8d2d481edc41da1c75e2db5077ab35c384b51460bbb84ccccfbfaff2bc10f887c8380982e80fbbf7dca
-  data.tar.gz: c3cbc63365ebfe9b75b7a9169f99fdbb4eb332dc3328bc597c27c2289d051d36a80fc03371f4b2c62213d51c4f04f191e62ac0ef2794ad20ea23188539e3c3f8
+  metadata.gz: 8c8bd11227604ebf4b60c99c3d3c8a2bfb69149c2f8d30541a62a456a3ea58e823a402882ade758b78567ebedb385d849ccd84b6b7131578624e7914846a24d1
+  data.tar.gz: 8548773c56e151949d22450a9feda4726e562cae055bbfe9f21b32a4d8545458c4cacda482a7b6850b92b73a9ee6294b60831b47c4774255e1b5a74e63732c84

data/lib/benchcc/benchmark.rb

@@ -57,12 +57,18 @@ module Benchcc
             )
           end
 
-          csv << row
-        rescue ExecutionError, CompilationError, Timeout::Error => e
+        rescue CompilationError, CompilationTimeout => e
           $stderr << e
           break
+
+        rescue ExecutionError, ExecutionTimeout => e
+          $stderr << e
+          break unless features.include?(:compilation_time) || features.include?(:memory_usage)
+
+        ensure
+          csv << row
+          progress.increment
         end
-        progress.increment
       end
     end
     return data

data/lib/benchcc/compiler.rb

@@ -10,9 +10,15 @@ module Benchcc
   class CompilationError < RuntimeError
   end
 
+  class CompilationTimeout < RuntimeError
+  end
+
   class ExecutionError < RuntimeError
   end
 
+  class ExecutionTimeout < RuntimeError
+  end
+
   class Clang
     def call(input_file:, features:, compiler_executable:, compiler_options:,
              compilation_timeout:, execution_timeout:)
@@ -34,7 +40,7 @@ module Benchcc
         end
 
         command = "#{compiler_executable} #{compiler_options.join(' ')} #{input_file}"
-        stdout, stderr, status = Timeout::timeout(compilation_timeout) {
+        stdout, stderr, status = Timeout::timeout(compilation_timeout, CompilationTimeout) {
           Open3.capture3(command)
         }
 
@@ -77,7 +83,7 @@ module Benchcc
 
         if features.include?(:execution_time)
           command = "#{tmp_dir}/a.out"
-          stdout, stderr, status = Timeout::timeout(execution_timeout) {
+          stdout, stderr, status = Timeout::timeout(execution_timeout, ExecutionTimeout) {
             Open3.capture3(command)
           }
           if status.success?

data/lib/benchcc/plot.rb

@@ -46,7 +46,19 @@ module Benchcc
         plot.output   output
         plot.data = curves.map { |curve|
           csv = CSV.table(curve[:input])
-          Gnuplot::DataSet.new([csv[x_feature], csv[y_feature]]) { |ds|
+          ys = csv[y_feature]
+          xs = csv[x_feature]
+
+          # Remove trailing nils from the y-axis. nils can arise when e.g.
+          # runtime execution failed but we still kept on gathering info
+          # for the compilation, so the execution_time column has some
+          # trailing empty values.
+          ys.pop until ys.last
+
+          # Restrict the x-axis to the number of valid y-axis values.
+          xs = xs[0...ys.size]
+
+          Gnuplot::DataSet.new([xs, ys]) { |ds|
             ds.title = curve[:title]
             ds.with = 'lines'
           }

data/lib/benchcc/version.rb

@@ -1,3 +1,3 @@
 module Benchcc
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/spec/plot_spec.rb

@@ -9,6 +9,7 @@ describe 'plots' do
     @tmpdir = Dir.mktmpdir
     @out = File.join(@tmpdir, 'plot.png')
     @csv = Pathname.new('src/plot.csv').expand_path(File.dirname(__FILE__))
+    @partial_csv = Pathname.new('src/partial_plot.csv').expand_path(File.dirname(__FILE__))
   end
 
   after :each do
@@ -17,12 +18,19 @@ describe 'plots' do
 
   describe Benchcc.method(:plot) do
     Benchcc::Y_FEATURES.each do |feature|
-      it {
+      it ("does not explode") {
         curves = [{title: 'curve title', input: @csv}]
         expect {
           Benchcc.plot('plot title', @out, curves, y_feature: feature)
         }.not_to raise_error
       }
+
+      it ("does not explode when points are missing") {
+        curves = [{title: 'curve title', input: @partial_csv}]
+        expect {
+          Benchcc.plot('plot title', @out, curves, y_feature: feature)
+        }.not_to raise_error
+      }
     end
   end
 end

data/spec/src/plot.csv

@@ -1,3 +1,31 @@
-input_size, memory_usage, compilation_time, run_time
-1, 2, 3, 4
-5, 6, 7, 8
+input_size,compilation_time,execution_time,memory_usage
+1,0.8664,145,41852928
+2,0.8108,292,42033152
+3,0.8633,444,42160128
+4,0.8075,583,42364928
+5,0.8311,738,42688512
+6,0.8262,903,43081728
+7,0.9357,1041,43544576
+8,0.9197,1290,44019712
+9,0.9823,1341,43995136
+10,0.9425,1473,44441600
+11,1.0235,1636,44896256
+12,0.9284,1765,45076480
+13,0.9273,1973,45666304
+14,1.0337,2087,45592576
+15,1.0129,2210,46215168
+16,0.9669,2372,46510080
+17,1.0574,2545,46915584
+18,1.0452,2647,46895104
+19,1.0269,2814,47517696
+20,1.0387,2971,47865856
+21,1.0649,3664,48504832
+22,1.3542,3469,48812032
+23,1.5643,3488,49229824
+24,1.1309,3568,49364992
+25,1.1786,3774,49541120
+26,1.5452,4005,50216960
+27,1.2139,3989,50528256
+28,1.1758,4208,51191808
+29,1.2415,4343,51441664
+30,1.3232,4472,51580928

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchcc
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Louis Dionne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gnuplot