BOAST 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5eb4ec74e14155954a1ecc7c3004e79088160c4
-  data.tar.gz: a4226683ccc72753105a61c2af6a9ddb0ce69bc3
+  metadata.gz: 36ff960759ff464e552e84ee45f3245cec255920
+  data.tar.gz: f52d3d583ba030d9affb8bd4e903c10c7a6ddd97
 SHA512:
-  metadata.gz: 7f1ac4576270947a645a2b8878f771d0c2dde7974d963b6c57a29eda1dc7a48be24003dc6df38f05e6f17fa9689ebf820634c0007495fecbe4c75bfddec8f5f0
-  data.tar.gz: fc98fd3ce8322e5c995167f043170ef42b61b49b14409d1c66d7cdea0a019e19cbef085012f8341f4add6b254b28e6d660094ffcf65676acdc3316b0bcc7051c
+  metadata.gz: 49d7f2414f2b8703c1cef9e13945c8d6eb19a28dc728d25d8bef58238fef5aa1707397f5ad49948a9696a308cf1b57fffe9c43f96d03f45721386ab785642a09
+  data.tar.gz: a2d91030cb407b63743e24112eace210ae077865014567dd7f6d1e114e64dcc06e1830d471b11c932369ee1e65a565b0e17b24f0d4d1d539e04194dcdae3d169

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "1.0.4"
+  s.version = "1.0.5"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/boast"

data/lib/BOAST/Runtime/CKernel.rb

@@ -55,12 +55,14 @@ module BOAST
         extend OpenCLRuntime
       when CUDA
         extend CUDARuntime
+        @probes = []
       when FORTRAN
         extend FORTRANRuntime
         extend FFIRuntime if ffi?
       else
         if @architecture == MPPA then
           extend MPPARuntime
+          @probes = [MPPAProbe]
         else
           extend CRuntime
           extend FFIRuntime if ffi?

data/lib/BOAST/Runtime/CUDARuntime.rb

@@ -9,6 +9,7 @@ module BOAST
     alias get_params_value_old get_params_value
     alias fill_decl_module_params_old fill_decl_module_params
     alias create_procedure_call_parameters_old create_procedure_call_parameters
+    alias store_results_old store_results
 
     def fill_module_header
       fill_module_header_old
@@ -64,6 +65,7 @@ EOF
       get_output.print <<EOF
   size_t _boast_block_size[3] = {1,1,1};
   size_t _boast_block_number[3] = {1,1,1};
+  int64_t _boast_duration;
 EOF
     end
 
@@ -153,6 +155,11 @@ EOF
 EOF
     end
 
+    def store_results
+      store_results_old
+      get_output.print "  rb_hash_aset(_boast_stats,ID2SYM(rb_intern(\"duration\")),rb_float_new((double)_boast_duration*(double)1e-9));\n"
+    end
+
   end
 
 end

data/lib/BOAST/Runtime/CompiledRuntime.rb

@@ -318,10 +318,10 @@ EOF
 
       @probes.map(&:stop)
 
-      @probes.map(&:compute)
-
       get_results
 
+      @probes.map(&:compute)
+
       store_results
 
       get_output.puts "  return _boast_stats;"

data/lib/BOAST/Runtime/MPPARuntime.rb

@@ -1,5 +1,59 @@
 module BOAST
 
+  module MPPAProbe
+    extend PrivateStateAccessor
+
+    module_function
+
+    # Monitoring has to be started before transfer begin and after transfers end as we don't have sync points in between.
+    def header
+      get_output.puts "#include <mppa_mon.h>"
+    end
+
+    def decl
+      get_output.print <<EOF
+  float _mppa_avg_pwr;
+  float _mppa_energy;
+  float _mppa_duration;
+  mppa_mon_ctx_t * _mppa_ctx;
+  mppa_mon_sensor_t _mppa_pwr_sensor[] = {MPPA_MON_PWR_MPPA0};
+  mppa_mon_measure_report_t * _mppa_report;
+  mppa_mon_open(0, &_mppa_ctx);
+  mppa_mon_measure_set_sensors(_mppa_ctx, _mppa_pwr_sensor, 1);
+  mppa_mon_measure_start(_mppa_ctx);
+EOF
+    end
+
+    def configure
+    end
+
+    def start
+    end
+
+    def stop
+    end
+
+    def compute
+      get_output.print <<EOF
+  mppa_mon_measure_stop(_mppa_ctx, &_mppa_report);
+  _mppa_avg_pwr = 0;
+  _mppa_energy = 0;
+  for(_mppa_i=0; _mppa_i < _mppa_report->count; _mppa_i++){
+    _mppa_avg_pwr += _mppa_report->measures[_mppa_i].avg_power;
+    _mppa_energy += _mppa_report->measures[_mppa_i].total_energy;
+  }
+  _mppa_avg_pwr = _mppa_avg_pwr/(float) _mppa_report->count;
+  _mppa_duration = _mppa_report->total_time;
+  mppa_mon_measure_free_report(_mppa_report);
+  mppa_mon_close(_mppa_ctx);
+  rb_hash_aset(_boast_stats,ID2SYM(rb_intern("mppa_avg_pwr")),rb_float_new(_mppa_avg_pwr));
+  rb_hash_aset(_boast_stats,ID2SYM(rb_intern("mppa_energy")),rb_float_new(_mppa_energy));
+  rb_hash_aset(_boast_stats,ID2SYM(rb_intern("mppa_duration")), rb_float_new(_mppa_duration));
+EOF
+    end
+
+  end
+
   module MPPARuntime
     include CRuntime
 
@@ -95,10 +149,11 @@ module BOAST
       fill_library_header
       get_output.puts "#include <mppaipc.h>"
       get_output.puts "#include <mppa/osconfig.h>"
+      get_output.puts "#include <time.h>"
     end
 
     def copy_array_param_from_host( param )
-      get_output.write <<EOF
+      get_output.print <<EOF
   mppa_read(_mppa_from_host_size, &_mppa_#{param}_size, sizeof(_mppa_#{param}_size));
   #{param} = malloc(_mppa_#{param}_size);
   mppa_read(_mppa_from_host_var, #{param}, _mppa_#{param}_size);
@@ -106,13 +161,13 @@ EOF
     end
 
     def copy_scalar_param_from_host( param )
-      get_output.write  <<EOF
+      get_output.print  <<EOF
   mppa_read(_mppa_from_host_var, &#{param}, sizeof(#{param}));
 EOF
     end
 
     def get_cluster_list_from_host
-      get_output.write <<EOF
+      get_output.print <<EOF
   mppa_read(_mppa_from_host_size, &_mppa_clust_list_size, sizeof(_mppa_clust_list_size));
   _clust_list = malloc(_mppa_clust_list_size);
   _nb_clust = _mppa_clust_list_size / sizeof(*_clust_list);
@@ -121,13 +176,13 @@ EOF
     end
 
     def copy_array_param_to_host(param)
-      get_output.write <<EOF
+      get_output.print <<EOF
   mppa_write(_mppa_to_host_var, #{param}, _mppa_#{param}_size);
 EOF
     end
 
     def copy_scalar_param_to_host(param)
-      get_output.write <<EOF
+      get_output.print <<EOF
   mppa_write(_mppa_to_host_var, &#{param}, sizeof(#{param}));
 EOF
     end
@@ -135,8 +190,8 @@ EOF
     def multibinary_main_io_source_decl
       #Parameters declaration
       @procedure.parameters.each { |param|
-        get_output.write "  #{param.type.decl} "
-        get_output.write "*" if param.dimension or param.scalar_output?
+        get_output.print "  #{param.type.decl} "
+        get_output.print "*" if param.dimension or param.scalar_output?
         get_output.puts "#{param.name};"
         if param.dimension then
           get_output.puts "  size_t _mppa_#{param}_size;"
@@ -147,14 +202,20 @@ EOF
       get_output.puts "  #{@procedure.properties[:return].type.decl} _mppa_ret;" if @procedure.properties[:return]
 
       #Cluster list declaration
-      get_output.write <<EOF
+      get_output.print <<EOF
   uint32_t *_clust_list;
   int _nb_clust;
   int _mppa_clust_list_size;
 EOF
 
+      #Timer
+      get_output.print <<EOF
+  struct timespec _mppa_start, _mppa_stop;
+  int64_t _mppa_duration;
+EOF
+
       #Communication variables
-      get_output.write <<EOF
+      get_output.print <<EOF
   int _mppa_from_host_size, _mppa_from_host_var;
   int _mppa_to_host_size,   _mppa_to_host_var;
   int _mppa_pid[16], _mppa_i;
@@ -163,7 +224,7 @@ EOF
 
     def multibinary_main_io_source_get_params
       #Receiving parameters from Host
-      get_output.write <<EOF
+      get_output.print <<EOF
   _mppa_from_host_size = mppa_open("/mppa/buffer/board0#mppa0#pcie0#2/host#2", O_RDONLY);
   _mppa_from_host_var = mppa_open("/mppa/buffer/board0#mppa0#pcie0#3/host#3", O_RDONLY);
 EOF
@@ -178,7 +239,7 @@ EOF
       #Receiving cluster list
       get_cluster_list_from_host
 
-      get_output.write <<EOF
+      get_output.print <<EOF
   mppa_close(_mppa_from_host_size);
   mppa_close(_mppa_from_host_var);
 EOF
@@ -186,7 +247,7 @@ EOF
 
     def multibinary_main_io_source_send_results
       #Sending results to Host
-      get_output.write <<EOF
+      get_output.print <<EOF
   _mppa_to_host_var = mppa_open("/mppa/buffer/host#4/board0#mppa0#pcie0#4", O_WRONLY);
 EOF
       @procedure.parameters.each { |param| 
@@ -199,7 +260,8 @@ EOF
         end
       }
       copy_scalar_param_to_host("_mppa_ret") if @procedure.properties[:return]
-      get_output.write <<EOF
+      copy_scalar_param_to_host("_mppa_duration")
+      get_output.print <<EOF
   mppa_close(_mppa_to_host_var);
 EOF
     end
@@ -210,22 +272,26 @@ EOF
       multibinary_main_io_source_get_params
 
       #Spawning cluster
-      get_output.write <<EOF
+      get_output.print <<EOF
+
+  clock_gettime(CLOCK_REALTIME, &_mppa_start);
   for(_mppa_i=0; _mppa_i<_nb_clust; _mppa_i++){
     _mppa_pid[_mppa_i] = mppa_spawn(_clust_list[_mppa_i], NULL, "comp-part", NULL, NULL);
   }
 EOF
       #Calling IO procedure
-      get_output.write "  _mppa_ret =" if @procedure.properties[:return]
-      get_output.write "  #{@procedure.name}("
-      get_output.write @procedure.parameters.map(&:name).join(", ")
+      get_output.print "  _mppa_ret =" if @procedure.properties[:return]
+      get_output.print "  #{@procedure.name}("
+      get_output.print @procedure.parameters.map(&:name).join(", ")
       get_output.puts ");"
 
       #Waiting for clusters
-      get_output.write <<EOF
+      get_output.print <<EOF
   for(_mppa_i=0; _mppa_i<_nb_clust; _mppa_i++){
     mppa_waitpid(_mppa_pid[_mppa_i], NULL, 0);
   }
+  clock_gettime(CLOCK_REALTIME, &_mppa_stop);
+  _mppa_duration = (int64_t)(_mppa_stop.tv_sec - _mppa_start.tv_sec) * 1000000000ll + _mppa_stop.tv_nsec - _mppa_start.tv_nsec;
 EOF
 
       multibinary_main_io_source_send_results
@@ -247,7 +313,7 @@ EOF
       end
       if code then
         code.rewind
-        get_output.write code.read
+        get_output.print code.read
       end
       get_output.puts "int main(int argc, const char* argv[]) {"
       if mode == :io then
@@ -255,7 +321,7 @@ EOF
       else
         fill_multibinary_main_comp_source
       end
-      get_output.write <<EOF
+      get_output.print <<EOF
   mppa_exit(0);
   return 0;
 }
@@ -293,7 +359,6 @@ EOF
     def fill_module_header
       fill_module_header_old
       get_output.puts "#include <mppaipc.h>"
-      get_output.puts "#include <mppa_mon.h>"
     end
 
     def fill_decl_module_params
@@ -304,19 +369,11 @@ EOF
   int _mppa_pid;
   int _mppa_fd_size;
   int _mppa_fd_var;
-  float _mppa_avg_pwr;
-  float _mppa_energy;
-  float _mppa_duration;
   int _mppa_clust_list_size;
   int _mppa_clust_nb;
+  int64_t _boast_duration;
   uint32_t * _mppa_clust_list;
-  mppa_mon_ctx_t * _mppa_ctx;
-  mppa_mon_sensor_t _mppa_pwr_sensor[] = {MPPA_MON_PWR_MPPA0};
-  mppa_mon_measure_report_t * _mppa_report;
-  mppa_mon_open(0, &_mppa_ctx);
-  mppa_mon_measure_set_sensors(_mppa_ctx, _mppa_pwr_sensor, 1);
   _mppa_load_id = mppa_load(0, 0, 0, \"#{multibinary_path}\");
-  mppa_mon_measure_start(_mppa_ctx);
   _mppa_pid = mppa_spawn(_mppa_load_id, NULL, \"io-part\", NULL, NULL);
 EOF
     end
@@ -431,32 +488,18 @@ EOF
   _mppa_fd_var = mppa_open(\"/mppa/buffer/host#4/board0#mppa0#pcie0#4\", O_RDONLY);
 EOF
       get_results_old
-      get_output.puts "mppa_read(_mppa_fd_var, &#{_boast_ret}, sizeof(#{_boast_ret}));" if @procedure.properties[:return]
+      get_output.puts "  mppa_read(_mppa_fd_var, &_boast_ret, sizeof(_boast_ret));" if @procedure.properties[:return]
+      get_output.puts "  mppa_read(_mppa_fd_var, &_boast_duration, sizeof(_boast_duration));"
       get_output.print <<EOF
   mppa_close(_mppa_fd_var);
   mppa_waitpid(_mppa_pid, NULL, 0);
-  mppa_mon_measure_stop(_mppa_ctx, &_mppa_report);
   mppa_unload(_mppa_load_id);
-  _mppa_avg_pwr = 0;
-  _mppa_energy = 0;
-  for(_mppa_i=0; _mppa_i < _mppa_report->count; _mppa_i++){
-    _mppa_avg_pwr += _mppa_report->measures[_mppa_i].avg_power;
-    _mppa_energy += _mppa_report->measures[_mppa_i].total_energy;
-  } 
-  _mppa_avg_pwr = _mppa_avg_pwr/(float) _mppa_report->count;
-  _mppa_duration = _mppa_report->total_time;
-  mppa_mon_measure_free_report(_mppa_report);
-  mppa_mon_close(_mppa_ctx);
 EOF
     end
 
     def store_results
       store_results_old
-      get_output.print <<EOF
-  rb_hash_aset(_boast_stats,ID2SYM(rb_intern("mppa_avg_pwr")),rb_float_new(_mppa_avg_pwr));
-  rb_hash_aset(_boast_stats,ID2SYM(rb_intern("mppa_energy")),rb_float_new(_mppa_energy));
-  rb_hash_aset(_boast_stats,ID2SYM(rb_intern("mppa_duration")), rb_float_new(_mppa_duration));
-EOF
+      get_output.print "  rb_hash_aset(_boast_stats,ID2SYM(rb_intern(\"duration\")),rb_float_new((double)_boast_duration*(double)1e-9));\n"
     end
 
   end

data/lib/BOAST/Runtime/Probe.rb

@@ -53,15 +53,13 @@ EOF
     end
 
     def compute
-      if @lang != CUDA then
-        if OS.mac? then
-          get_output.print "  mach_timebase_info(&_mac_boast_timebase_info);\n"
-          get_output.print "  #{RESULT} = (_mac_boast_stop - _mac_boast_start) * _mac_boast_timebase_info.numer / _mac_boast_timebase_info.denom;\n"
-        else
-          get_output.print "  #{RESULT} = (_boast_stop.tv_sec - _boast_start.tv_sec) * (unsigned long long int)1000000000 + _boast_stop.tv_nsec - _boast_start.tv_nsec;\n"
-        end
-          get_output.print "  rb_hash_aset(_boast_stats,ID2SYM(rb_intern(\"duration\")),rb_float_new((double)#{RESULT}*(double)1e-9));\n"
+      if OS.mac? then
+        get_output.print "  mach_timebase_info(&_mac_boast_timebase_info);\n"
+        get_output.print "  #{RESULT} = (_mac_boast_stop - _mac_boast_start) * _mac_boast_timebase_info.numer / _mac_boast_timebase_info.denom;\n"
+      else
+        get_output.print "  #{RESULT} = (int64_t)(_boast_stop.tv_sec - _boast_start.tv_sec) * 1000000000ll + _boast_stop.tv_nsec - _boast_start.tv_nsec;\n"
       end
+      get_output.print "  rb_hash_aset(_boast_stats,ID2SYM(rb_intern(\"duration\")),rb_float_new((double)#{RESULT}*(double)1e-9));\n"
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray