BOAST 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36ff960759ff464e552e84ee45f3245cec255920
-  data.tar.gz: f52d3d583ba030d9affb8bd4e903c10c7a6ddd97
+  metadata.gz: c85b9d3cf15ddaa43c8772daa563fc77ffa0e2d8
+  data.tar.gz: 2c3f92c1b64383ef09e28333f882bbeb2f717ee6
 SHA512:
-  metadata.gz: 49d7f2414f2b8703c1cef9e13945c8d6eb19a28dc728d25d8bef58238fef5aa1707397f5ad49948a9696a308cf1b57fffe9c43f96d03f45721386ab785642a09
-  data.tar.gz: a2d91030cb407b63743e24112eace210ae077865014567dd7f6d1e114e64dcc06e1830d471b11c932369ee1e65a565b0e17b24f0d4d1d539e04194dcdae3d169
+  metadata.gz: c48d0c7349a97e7d2ffb7a632e21d01e7af48d69009dbf635d95ba81d22aa76b24321b2d9bf0da83da77d114ccf11dae5272084334bd3aa76a633d339b37fe60
+  data.tar.gz: 12fa72007ca814bff99b9a0e3593113fde333f66a6194b7b853164c8e3e7fa47f9705095e75c37303ee9f60dbaf16eb74a1649be3e46c5889cc9007b5a7f8f1b

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "1.0.5"
+  s.version = "1.0.6"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/boast"
@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.license = 'BSD'
   s.required_ruby_version = '>= 1.9.3'
   s.add_dependency 'narray', '~> 0.6.0', '>=0.6.0.8'
+  s.add_dependency 'narray_ffi', '~> 1.2', '>=1.2.0'
   s.add_dependency 'opencl_ruby_ffi', '~> 1.0', '>=1.0.0'
   s.add_dependency 'systemu', '~> 2', '>=2.2.0'
   s.add_dependency 'os', '~> 0.9', '>=0.9.6'

data/lib/BOAST/Language/Algorithm.rb

@@ -14,6 +14,7 @@ module BOAST
 
     private_state_accessor :output, :lang, :architecture
     private_state_accessor :default_int_size, :default_real_size
+    private_state_accessor :default_align
     private_state_accessor :array_start
     private_state_accessor :indent_level, :indent_increment
 
@@ -49,6 +50,7 @@ module BOAST
 
   state_accessor :output, :lang, :architecture
   state_accessor :default_int_size, :default_real_size
+  state_accessor :default_align
   state_accessor :array_start
   state_accessor :indent_level, :indent_increment
 
@@ -85,6 +87,7 @@ module BOAST
   @@default_int_size = 4
   @@default_int_signed = true
   @@default_real_size = 8
+  @@default_align = 1
   @@indent_level = 0
   @@indent_increment = 2
   @@array_start = 1

data/lib/BOAST/Language/Procedure.rb

@@ -207,6 +207,11 @@ module BOAST
       constants.each { |c|
         c.decl
       }
+      if lang == C then
+        parameters.each { |p|
+          p.align
+        }
+      end
       return self
     end
 
@@ -221,6 +226,7 @@ module BOAST
       }
       parameters.each { |p|
         p.decl
+        p.align
       }
       return self
     end

data/lib/BOAST/Language/Variable.rb

@@ -137,6 +137,7 @@ module BOAST
     attr_reader :texture
     attr_reader :sampler
     attr_reader :restrict
+    attr_reader :align
     attr_accessor :replace_constant
     attr_accessor :force_replace_constant
 
@@ -176,6 +177,10 @@ module BOAST
       !!@scalar_output
     end
 
+    def align?
+      !!@align
+    end
+
     def initialize(name,type,hash={})
       @name = name.to_s
       @direction = hash[:direction] ? hash[:direction] : hash[:dir]
@@ -185,6 +190,7 @@ module BOAST
       @texture = hash[:texture]
       @allocate = hash[:allocate]
       @restrict = hash[:restrict]
+      @align = hash[:align]
       @force_replace_constant = false
       if not hash[:replace_constant].nil? then
         @replace_constant = hash[:replace_constant]
@@ -352,6 +358,11 @@ module BOAST
           s +=")]"
         end 
       end
+      if dimension? and (align? or default_align > 1) and (constant? or allocate?) then
+        a = ( align? ? align : 1 )
+        a = ( a >= default_align ? a : default_align )
+        s+= " __attribute((aligned(#{a})))"
+      end
       s += " = #{@constant}" if constant?
       return s
     end
@@ -388,6 +399,42 @@ module BOAST
       return self
     end
 
+    def align_c_s(a)
+      return "__assume_aligned(#{@name}, #{a})"
+    end
+
+    def align_c(a)
+      s = ""
+      s += indent
+      s += align_c_s(a)
+      s += finalize
+      output.print s
+      return self
+    end
+
+    def align_fortran_s(a)
+      return "!DIR$ ASSUME_ALIGNED #{@name}: #{a}"
+    end
+
+    def align_fortran(a)
+      s = ""
+      s += indent
+      s += align_fortran_s(a)
+      s += finalize
+      output.print s
+      return self
+    end
+
+    def align
+      if dimension? then
+        if align? or default_align > 1 then
+          a = ( align? ? align : 1 )
+          a = ( a >= default_align ? a : default_align )
+          return align_c(a) if lang == C
+          return align_fortran(a) if lang == FORTRAN
+        end
+      end
+    end
 
     def decl_fortran
       s = ""
@@ -414,6 +461,15 @@ module BOAST
       end
       s += finalize
       output.print s
+      if dimension? and (align? or default_align > 1) and (constant? or allocate?) then
+        a = ( align? ? align : 1 )
+        a = ( a >= default_align ? a : default_align )
+        s = ""
+        s += indent
+        s += "!DIR$ ATTRIBUTES ALIGN: #{a}:: #{name}"
+        s += finalize
+        output.print s
+      end
       return self
     end
 

data/lib/BOAST/Runtime/CKernel.rb

@@ -19,7 +19,7 @@ module BOAST
     attr_accessor :code
     attr_accessor :procedure
     attr_accessor :lang
-    attr_accessor :binary
+    attr_accessor :architecture
     attr_accessor :kernels
     attr_accessor :cost_function
     

data/lib/BOAST/Runtime/CRuntime.rb

@@ -5,6 +5,7 @@ module BOAST
 
     def fill_library_header
       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
 
     def fill_library_source

data/lib/BOAST/Runtime/CompiledRuntime.rb

@@ -31,6 +31,9 @@ end
 module BOAST
 
   module CompiledRuntime
+    attr_accessor :binary
+    attr_accessor :source
+
     @@extensions = {
       C => ".c",
       CUDA => ".cu",
@@ -100,6 +103,13 @@ module BOAST
       f.close
     end
 
+    def save_source
+      f = File::open(library_source,"r")
+      @source = StringIO::new
+      @source.write( f.read )
+      f.close
+    end
+
     def create_targets( linker, ldshared, ldflags, kernel_files)
       file target => target_depends do
         #puts "#{linker} #{ldshared} -o #{target} #{target_depends.join(" ")} #{(kernel_files.collect {|f| f.path}).join(" ")} #{ldflags}"
@@ -373,6 +383,7 @@ EOF
       compiler_options = BOAST::get_compiler_options
       compiler_options.update(options)
       linker, ldshared, ldflags = setup_compilers(compiler_options)
+      @compiler_options = compiler_options
 
       @marker = Tempfile::new([@procedure.name,""])
 
@@ -380,6 +391,8 @@ EOF
 
       create_sources
 
+      save_source
+
       create_targets(linker, ldshared, ldflags, kernel_files)
 
       save_binary
@@ -393,6 +406,20 @@ EOF
       return self
     end
 
+    def dump_binary
+      f = File::open(library_object,"wb")
+      @binary.rewind
+      f.write( @binary.read )
+      f.close
+    end
+
+    def dump_source
+      f = File::open(library_source,"wb")
+      @source.rewind
+      f.write( @source.read )
+      f.close
+    end
+
   end
 
 end

data/lib/BOAST/Runtime/Config.rb

@@ -17,6 +17,7 @@ module BOAST
     :CLPLATFORM => nil,
     :CLDEVICE => nil,
     :CLDEVICETYPE => nil,
+    :MAQAO => 'maqao',
     :openmp => false
   }
   

data/lib/BOAST/Runtime/MAQAO.rb

@@ -0,0 +1,28 @@
+module BOAST
+
+  module CompiledRuntime
+    def maqao_analysis(options={})
+      compiler_options = BOAST::get_compiler_options
+      compiler_options.update(options)
+
+      f1 = File::open(library_object,"wb")
+      @binary.rewind
+      f1.write( @binary.read )
+      f1.close
+
+      f2 = File::open(library_source,"wb")
+      @source.rewind
+      f2.write( @source.read )
+      f2.close
+
+      if verbose? then
+        puts "#{compiler_options[:MAQAO]} cqa #{f1.path} --fct=#{@procedure.name}"
+      end
+      result = `#{compiler_options[:MAQAO]} cqa #{f1.path} --fct=#{@procedure.name}`
+      File::unlink(library_object)
+      File::unlink(library_source)
+      return result
+    end
+  end
+
+end

data/lib/BOAST/Runtime/MPPARuntime.rb

@@ -120,8 +120,20 @@ EOF
     attr_accessor :code_comp
     attr_accessor :procedure_comp
     attr_accessor :binary_comp
+    attr_accessor :source_comp
     attr_accessor :multibinary
 
+    def save_source
+      f = File::open(io_source, "r")
+      @source = StringIO::new
+      @source.write( f.read )
+      f.close
+      f = File::open(comp_source, "r")
+      @source_comp = StringIO::new
+      @source_comp.write( f.read )
+      f.close
+    end
+
     def save_binary
       f = File::open(io_object,"rb")
       @binary = StringIO::new

data/lib/BOAST.rb

@@ -24,6 +24,7 @@ require 'BOAST/Runtime/Probe.rb'
 require 'BOAST/Runtime/Compilers.rb'
 require 'BOAST/Runtime/OpenCLRuntime.rb'
 require 'BOAST/Runtime/CompiledRuntime.rb'
+require 'BOAST/Runtime/MAQAO.rb'
 require 'BOAST/Runtime/CRuntime.rb'
 require 'BOAST/Runtime/CUDARuntime.rb'
 require 'BOAST/Runtime/FORTRANRuntime.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0.8
+- !ruby/object:Gem::Dependency
+  name: narray_ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: opencl_ruby_ffi
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +208,7 @@ files:
 - lib/BOAST/Runtime/Config.rb
 - lib/BOAST/Runtime/FFIRuntime.rb
 - lib/BOAST/Runtime/FORTRANRuntime.rb
+- lib/BOAST/Runtime/MAQAO.rb
 - lib/BOAST/Runtime/MPPARuntime.rb
 - lib/BOAST/Runtime/NonRegression.rb
 - lib/BOAST/Runtime/OpenCLRuntime.rb