BOAST 1.0.7 → 1.0.8

data/lib/BOAST/Language/Variable.rb

@@ -66,6 +66,8 @@ module BOAST
     include PrivateStateAccessor
     include Inspectable
 
+    attr_accessor :shape
+
     def initialize(array,type = nil)
       super(array)
       @type = type::new if type
@@ -77,25 +79,30 @@ module BOAST
     end
 
     def to_s_fortran
+      arr = self.flatten
       s = ""
-      return s if first.nil?
+      return s if arr.first.nil?
+      s += "reshape(" if @shape
       s += "(/ &\n"
-      s += first.to_s
+      s += arr.first.to_s
       s += @type.suffix if @type
-      self[1..-1].each { |v|
+      arr[1..-1].each { |v|
         s += ", &\n"+v.to_s
         s += @type.suffix if @type
       }
       s += " /)"
+      s += ", shape(#{@shape}))" if @shape
+      return s
     end
 
     def to_s_c
+      arr = self.flatten
       s = ""
-      return s if first.nil?
+      return s if arr.first.nil?
       s += "{\n"
-      s += first.to_s
+      s += arr.first.to_s
       s += @type.suffix if @type 
-      self[1..-1].each { |v|
+      arr[1..-1].each { |v|
         s += ",\n"+v.to_s
         s += @type.suffix if @type
       }
@@ -259,7 +266,7 @@ module BOAST
     end
 
     def set(x)
-      return Expression::new(Set, self, x)
+      return self === Set(x,self)
     end
 
     def dereference
@@ -294,13 +301,13 @@ module BOAST
       s += "const " if constant? or @direction == :in
       s += @type.decl
       if dimension? then
-        s += " *" unless use_vla?
+        s += " *" unless (use_vla? and lang != FORTRAN)
       end
       if not dimension? and ( lang == FORTRAN or @direction == :out or @direction == :inout ) then
         s += " *"
       end
       s += " #{@name}"
-      if dimension? and use_vla? then
+      if dimension? and use_vla? and lang != FORTRAN  then
         s += "["
         s += @dimension.reverse.collect { |d|
           dim = d.to_s
@@ -327,16 +334,57 @@ module BOAST
       return decl_c if [C, CL, CUDA].include?( lang )
     end
 
+    def __const?
+      return !!( constant? or @direction == :in )
+    end
+
+    def __global?
+      return !!( lang == CL and @direction and dimension? and not (@options[:register] or @options[:private] or local?) )
+    end
+
+    def __local?
+      return !!( lang == CL and local? )
+    end
+
+    def __shared?(device = false)
+      return !!( lang == CUDA and local? and not device )
+    end
+
+    def __vla_array?
+      return !!( use_vla? and dimension? and not decl_module? )
+    end
+
+    def __pointer_array?(device = false)
+      return !!( dimension? and not constant? and not ( allocate? and @allocate != :heap ) and (not local? or (local? and device)) )
+    end
+
+    def __pointer?(device = false)
+      return !!( ( not dimension? and ( @direction == :out or @direction == :inout ) ) or __pointer_array?(device) )
+    end
+
+    def __restrict?
+      return !!( restrict? and not decl_module? )
+    end
+
+    def __dimension?(device = false)
+      return !!( dimension? and ((local? and not device) or ( ( allocate? and @allocate != :heap ) and not constant?)) )
+    end
+
+    def __align?
+      return !!( dimension? and (align? or default_align > 1) and (constant? or (allocate? and @allocate != :heap ) ) )
+    end
+
     def decl_c_s(device = false)
       return decl_texture_s if texture?
       s = ""
-      s += "const " if constant? or @direction == :in
-      s += "__global " if @direction and dimension? and not (@options[:register] or @options[:private] or local?) and lang == CL
-      s += "__local " if local? and lang == CL
-      s += "__shared__ " if local? and not device and lang == CUDA
+      s += "const " if __const?
+      s += "__global " if __global?
+      s += "__local " if __local?
+      s += "__shared__ " if __shared?(device)
       s += @type.decl
-      if use_vla? and dimension? and not decl_module? then
+      if __vla_array? then
         s += " #{@name}["
+        s += "__restrict__ " if __restrict?
         s += @dimension.reverse.collect { |d|
           dim = d.to_s
           if dim then
@@ -347,30 +395,25 @@ module BOAST
         }.join("][")
         s += "]"
       else
-        if dimension? and not constant? and not ( allocate? and @allocate != :heap ) and (not local? or (local? and device)) then
-          s += " *"
-          if restrict? and not decl_module? then
-            if lang == CL
-              s += " restrict"
-            else
-              s += " __restrict__" unless use_vla?
-            end
+        s += " *" if __pointer?(device)
+        if __pointer_array?(device) and __restrict? then
+          if lang == CL
+            s += " restrict"
+          else
+            s += " __restrict__" unless use_vla?
           end
         end
-        if not dimension? and ( @direction == :out or @direction == :inout ) then
-          s += " *"
-        end
         s += " #{@name}"
         if dimension? and constant? then
           s += "[]"
         end
-        if dimension? and ((local? and not device) or ( ( allocate? and @allocate != :heap ) and not constant?)) then
+        if __dimension?(device) then
           s +="[("
           s += @dimension.collect{ |d| d.to_s }.reverse.join(")*(")
           s +=")]"
         end 
       end
-      if dimension? and (align? or default_align > 1) and (constant? or (allocate? and @allocate != :heap ) ) then
+      if __align? then
         a = ( align? ? align : 1 )
         a = ( a >= default_align ? a : default_align )
         s+= " __attribute((aligned(#{a})))"
@@ -459,10 +502,16 @@ module BOAST
       return self
     end
 
-    def alloc_c( dims = nil )
+    def alloc_c( dims = nil, align = get_address_size)
       s = ""
       s += indent
-      s += "#{name} = (#{@type.decl} *)malloc( sizeof(#{@type.decl})*("
+      if align > (OS.bits/8) then
+        # check alignment is a power of 2
+        raise "Invalid alignment #{align}!" if align & (align - 1) != 0
+        s += "(#{@type.decl} *) posix_memalign( &#{name}, #{align}, sizeof(#{@type.decl})*("
+      else
+        s += "#{name} = (#{@type.decl} *) malloc( sizeof(#{@type.decl})*("
+      end
       s += dims.collect { |d| d.to_s }.reverse.join(")*(")
       s += ") )"
       s += finalize
@@ -470,12 +519,12 @@ module BOAST
       return self
     end
 
-    def alloc( dims = nil )
+    def alloc( dims = nil, align = get_address_size )
       @dimension = [dims].flatten if dims
       dims = @dimension
       raise "Cannot allocate array with unknown dimension!" unless dims
       return alloc_fortran(dims) if lang == FORTRAN
-      return alloc_c(dims) if lang == C
+      return alloc_c(dims, align) if lang == C
     end
 
     def dealloc_fortran
@@ -525,6 +574,7 @@ module BOAST
       end
       s += " :: #{@name}"
       if constant? then
+        @constant.shape = self if dimension? and @constant.kind_of?(ConstArray)
         s += " = #{@constant}"
         s += @type.suffix if not dimension? and @type
       end

data/lib/BOAST/Runtime/CKernel.rb

@@ -77,8 +77,12 @@ module BOAST
     end
 
     def to_s
-      @code.rewind
-      return code.read
+      if @lang == FORTRAN then
+        return line_limited_source
+      else
+        @code.rewind
+        return code.read
+      end
     end
 
     def method_missing(meth, *args, &block)

data/lib/BOAST/Runtime/CRuntime.rb

@@ -4,6 +4,7 @@ module BOAST
     include CompiledRuntime
 
     def fill_library_header
+      get_output.puts "#include <stdlib.h>"
       get_output.puts "#include <inttypes.h>"
       get_output.puts "#define __assume_aligned(lvalueptr, align) lvalueptr = __builtin_assume_aligned (lvalueptr, align)" if @compiler_options[:CC].match("gcc")
     end

data/lib/BOAST/Runtime/CompiledRuntime.rb

@@ -191,7 +191,7 @@ EOF
     end
 
     def fill_decl_module_params
-      set_decl_module(true)
+      push_env(:decl_module => true)
       @procedure.parameters.each { |param|
         param_copy = param.copy
         param_copy.constant = nil
@@ -209,7 +209,7 @@ EOF
         get_output.puts "  VALUE _boast_refs = rb_hash_new();"
         get_output.puts "  rb_hash_aset(_boast_stats,ID2SYM(rb_intern(\"reference_return\")),_boast_refs);"
       end
-      set_decl_module(false)
+      pop_env(:decl_module)
     end
 
     def copy_scalar_param_from_ruby( param, ruby_param )
@@ -242,7 +242,7 @@ EOF
       argc = @procedure.parameters.length
       argv = Variable::new("_boast_argv", CustomType, :type_name => "VALUE", :dimension => [ Dimension::new(0,argc-1) ] )
       rb_ptr = Variable::new("_boast_rb_ptr", CustomType, :type_name => "VALUE")
-      set_decl_module(true)
+      push_env(:decl_module => true)
       @procedure.parameters.each_index do |i|
         param = @procedure.parameters[i]
         if not param.dimension then
@@ -251,7 +251,7 @@ EOF
           copy_array_param_from_ruby(param, argv[i])
         end
       end
-      set_decl_module(false)
+      pop_env(:decl_module)
     end
 
     def create_procedure_call
@@ -280,7 +280,7 @@ EOF
       argc = @procedure.parameters.length
       argv = Variable::new("_boast_argv", CustomType, :type_name => "VALUE", :dimension => [ Dimension::new(0,argc-1) ] )
       rb_ptr = Variable::new("_boast_rb_ptr", CustomType, :type_name => "VALUE")
-      set_decl_module(true)
+      push_env(:decl_module => true)
       @procedure.parameters.each_index do |i|
         param = @procedure.parameters[i]
         if not param.dimension then
@@ -289,7 +289,7 @@ EOF
           copy_array_param_to_ruby(param, argv[i])
         end
       end
-      set_decl_module(false)
+      pop_env(:decl_module)
     end
 
     def store_results
@@ -341,10 +341,8 @@ EOF
 
     def create_module_file_source
       f = File::open(module_file_source, "w+")
-      previous_lang = get_lang
-      previous_output = get_output
-      set_output(f)
-      set_lang(C)
+      push_env(:lang => C)
+      push_env(:output => f)
 
       fill_module_file_source
 
@@ -352,8 +350,7 @@ EOF
         f.rewind
         puts f.read
       end
-      set_output(previous_output)
-      set_lang(previous_lang)
+      pop_env(:lang, :output)
       f.close
     end
 

data/lib/BOAST/Runtime/Compilers.rb

@@ -46,6 +46,7 @@ module BOAST
       c_mppa_compiler = "k1-gcc"
       c_compiler = options[:CC]
       cflags = options[:CFLAGS]
+      cflags += " -march=#{get_model}"
       cflags += " -fPIC #{includes}"
       cflags += " -DHAVE_NARRAY_H" if narray_path
       cflags += " -I/usr/local/k1tools/include" if @architecture == MPPA
@@ -93,6 +94,7 @@ module BOAST
     def setup_fortran_compiler(options, runner)
       f_compiler = options[:FC]
       fcflags = options[:FCFLAGS]
+      fcflags += " -march=#{get_model}"
       fcflags += " -fPIC"
       fcflags += " -fno-second-underscore" if f_compiler == 'g95'
       if options[:openmp] and @lang == FORTRAN then
@@ -140,6 +142,7 @@ module BOAST
 
     def setup_linker(options)
       ldflags = options[:LDFLAGS]
+      ldflags += " -march=#{get_model}"
       ldflags += " -L#{RbConfig::CONFIG["libdir"]} #{RbConfig::CONFIG["LIBRUBYARG"]}"
       ldflags += " -lrt" if not OS.mac?
       ldflags += " -lcudart" if @lang == CUDA

data/lib/BOAST/Runtime/Config.rb

@@ -40,10 +40,11 @@ module BOAST
   boolean_state_accessor :verbose
   boolean_state_accessor :debug_source
   boolean_state_accessor :ffi
-  @@ffi = false
-  @@verbose = false
-  @@debug_source = false
-  FORTRAN_LINE_LENGTH = 72
+  state_accessor         :fortran_line_length
+  default_state_getter :ffi,                 false
+  default_state_getter :verbose,             false
+  default_state_getter :debug_source,        false
+  default_state_getter :fortran_line_length, 72
 
   module_function
 
@@ -78,9 +79,6 @@ module BOAST
       @@compiler_default_options[k] = ENV[k.to_s] if ENV[k.to_s]
     }
     @@compiler_default_options[:LD] = ENV["LD"] if ENV["LD"]
-    @@verbose = ENV["VERBOSE"] if ENV["VERBOSE"]
-    @@ffi = ENV["FFI"] if ENV["FFI"]
-    @@debug_source = ENV["DEBUG_SOURCE"] if ENV["DEBUG_SOURCE"]
   end
 
   read_boast_config

data/lib/BOAST/Runtime/FORTRANRuntime.rb

@@ -7,25 +7,33 @@ module BOAST
       return @procedure.name + "_"
     end
 
-    def fill_library_source
+    def line_limited_source
+      s = ""
       @code.rewind
       @code.each_line { |line|
-        # check for omp pragmas
-        if line.match(/^\s*!\$/) then
+        if line.match(/^\s*!\w*?\$/) then
           if line.match(/^\s*!\$(omp|OMP)/) then
-            chunks = line.scan(/.{1,#{FORTRAN_LINE_LENGTH-7}}/)
-            get_output.puts chunks.join("&\n!$omp&")
+            chunks = line.scan(/.{1,#{fortran_line_length-7}}/)
+            s += chunks.join("&\n!$omp&") + "\n"
+          elsif line.match(/^\s*!(DIR|dir)\$/) then
+            chunks = line.scan(/.{1,#{fortran_line_length-7}}/)
+            s += chunks.join("&\n!DIR$&") + "\n"
           else
-            chunks = line.scan(/.{1,#{FORTRAN_LINE_LENGTH-4}}/)
-            get_output.puts chunks.join("&\n!$&")
+            chunks = line.scan(/.{1,#{fortran_line_length-4}}/)
+            s += chunks.join("&\n!$&") + "\n"
           end
-        elsif line.match(/^\w*!/) then
-          get_output.write line
+        elsif line.match(/^\s*!/) then
+          s += line
         else
-          chunks = line.scan(/.{1,#{FORTRAN_LINE_LENGTH-2}}/)
-          get_output.puts chunks.join("&\n&")
+          chunks = line.scan(/.{1,#{fortran_line_length-2}}/)
+          s += chunks.join("&\n&") + "\n"
         end
       }
+      return s
+    end
+
+    def fill_library_source
+      get_output.print line_limited_source
     end
 
     def create_procedure_call_parameters

data/lib/BOAST/Runtime/MAQAO.rb

@@ -2,6 +2,13 @@ module BOAST
 
   module CompiledRuntime
     def maqao_analysis(options={})
+      maqao_models = {
+        "core2" => "CORE2_45", 
+        "nehalem" => "NEHALEM",
+        "sandybridge" => "SANDY_BRIDGE",
+        "ivybridge" => "IVY_BRIDGE",
+        "haswell" => "HASWELL"
+      }
       compiler_options = BOAST::get_compiler_options
       compiler_options.update(options)
 
@@ -14,11 +21,11 @@ module BOAST
       @source.rewind
       f2.write( @source.read )
       f2.close
-
+      maqao_model = maqao_models[get_model]
       if verbose? then
-        puts "#{compiler_options[:MAQAO]} cqa #{f1.path} --fct=#{@procedure.name} #{compiler_options[:MAQAO_FLAGS]}"
+        puts "#{compiler_options[:MAQAO]} cqa #{maqao_model ? "--uarch=#{maqao_model} " : ""}#{f1.path} --fct=#{@procedure.name} #{compiler_options[:MAQAO_FLAGS]}"
       end
-      result = `#{compiler_options[:MAQAO]} cqa #{f1.path} --fct=#{@procedure.name} #{compiler_options[:MAQAO_FLAGS]}`
+      result = `#{compiler_options[:MAQAO]} cqa #{maqao_model ? "--uarch=#{maqao_model} " : ""}#{f1.path} --fct=#{@procedure.name} #{compiler_options[:MAQAO_FLAGS]}`
       File::unlink(library_object)
       File::unlink(library_source)
       return result

data/lib/BOAST.rb

@@ -3,6 +3,8 @@ require 'BOAST/Language/Functors.rb'
 require 'BOAST/Language/Inspectable.rb'
 require 'BOAST/Language/Transitions.rb'
 require 'BOAST/Language/Arithmetic.rb'
+require 'BOAST/Language/Architectures.rb'
+require 'BOAST/Language/CPUID_by_name.rb'
 require 'BOAST/Language/Intrinsics.rb'
 require 'BOAST/Language/Operators.rb'
 require 'BOAST/Language/DataTypes.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -150,6 +150,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
+- !ruby/object:Gem::Dependency
+  name: rgl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -176,8 +196,10 @@ files:
 - README.md
 - lib/BOAST.rb
 - lib/BOAST/Language/Algorithm.rb
+- lib/BOAST/Language/Architectures.rb
 - lib/BOAST/Language/Arithmetic.rb
 - lib/BOAST/Language/BOAST_OpenCL.rb
+- lib/BOAST/Language/CPUID_by_name.rb
 - lib/BOAST/Language/Case.rb
 - lib/BOAST/Language/ControlStructure.rb
 - lib/BOAST/Language/DataTypes.rb