BOAST 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1f417ec1022cee6a5ad855a971bae916070a0b4
-  data.tar.gz: 02ef656f592cf02b330a3a1253fd2e44cd2b6d61
+  metadata.gz: 59589a610dd30134353d9aa38e9ea1de00b43a9a
+  data.tar.gz: 4eec51beee55795b76432c1c4b12502113a7fe3f
 SHA512:
-  metadata.gz: 618ca53b9609f6120a117de27f8cb37575873f1cb12d048f8b7f953a26b04d6f599535d532c906bb830a9e2ff3e2e448c1f6a88e7e3f07ee69f25da61f049f9d
-  data.tar.gz: 296b7c4d45369c31120c07cf171f54074e3983bdf6fdbc02fae893414d646f63a6fa9b635f5612927ae905947da7e5d53c6799b8b9e5f7ae73f0fdc1146c4f4e
+  metadata.gz: a190b47611875b112f027e5b3e4bf292d331f4029ee47d581493fd6d3d4c88d807f98b91887f7602a9e922a2744f48d5965de4f5ce7103597b52886a5eea6f02
+  data.tar.gz: 24c85287f04dae5ce701e11099ef562fb97e81f89fc7ca15105593dee7746a141d1124ab7e1d593193e63f5aeb56bb598a2c986f6c470a91b4fe6b8cfd4c5527

data/BOAST.gemspec

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

data/lib/BOAST.rb

@@ -1,6 +1,9 @@
+require 'BOAST/Language/Error.rb'
 require 'BOAST/Language/State.rb'
 require 'BOAST/Language/Functors.rb'
 require 'BOAST/Language/Inspectable.rb'
+require 'BOAST/Language/Comment.rb'
+require 'BOAST/Language/Annotation.rb'
 require 'BOAST/Language/Transitions.rb'
 require 'BOAST/Language/Arithmetic.rb'
 require 'BOAST/Language/Architectures.rb'
@@ -15,6 +18,7 @@ require 'BOAST/Language/Slice.rb'
 require 'BOAST/Language/FuncCall.rb'
 require 'BOAST/Language/Procedure.rb'
 require 'BOAST/Language/Algorithm.rb'
+require 'BOAST/Language/CodeBlock.rb'
 require 'BOAST/Language/ControlStructure.rb'
 require 'BOAST/Language/OpenMP.rb'
 require 'BOAST/Language/If.rb'
@@ -37,5 +41,5 @@ require 'BOAST/Runtime/CKernel.rb'
 require 'BOAST/Runtime/NonRegression.rb'
 require 'BOAST/Language/Parens.rb'
 require 'BOAST/Language/BOAST_OpenCL.rb'
-require 'BOAST/Language/Optimization.rb'
+require 'BOAST/Optimization/Optimization.rb'
 require 'BOAST/Language/Print.rb'

data/lib/BOAST/Language/Algorithm.rb

@@ -17,6 +17,10 @@ module BOAST
     private_state_accessor :default_align
     private_state_accessor :array_start
     private_state_accessor :indent_level, :indent_increment
+    private_state_accessor :annotate_list
+    private_state_accessor :annotate_indepth_list
+    private_state_accessor :annotate_level
+    private_state_accessor :optimizer_log_file
 
     private_boolean_state_accessor :replace_constants
     private_boolean_state_accessor :default_int_signed
@@ -24,6 +28,8 @@ module BOAST
     private_boolean_state_accessor :debug
     private_boolean_state_accessor :use_vla
     private_boolean_state_accessor :decl_module
+    private_boolean_state_accessor :annotate
+    private_boolean_state_accessor :optimizer_log
 
     private
     def push_env(*args)
@@ -46,6 +52,18 @@ module BOAST
       BOAST::indent
     end
 
+    def get_architecture_name
+      BOAST::get_architecture_name
+    end
+
+    def get_lang_name
+      BOAST::get_lang_name
+    end
+
+    def annotate_number(*args)
+      BOAST::annotate_number(*args)
+    end
+
   end
 
   state_accessor :output, :lang, :architecture, :model, :address_size
@@ -53,6 +71,10 @@ module BOAST
   state_accessor :default_align
   state_accessor :array_start
   state_accessor :indent_level, :indent_increment
+  state_accessor :annotate_list
+  state_accessor :annotate_indepth_list
+  state_accessor :annotate_level
+  state_accessor :optimizer_log_file
 
   boolean_state_accessor :replace_constants
   boolean_state_accessor :default_int_signed
@@ -60,20 +82,28 @@ module BOAST
   boolean_state_accessor :debug
   boolean_state_accessor :use_vla
   boolean_state_accessor :decl_module
-
-  default_state_getter :address_size,       OS.bits/8
-  default_state_getter :lang,               FORTRAN, '"const_get(#{envs})"', :BOAST_LANG
-  default_state_getter :model,              "native"
-  default_state_getter :debug,              false
-  default_state_getter :use_vla,            false
-  default_state_getter :replace_constants,  true
-  default_state_getter :default_int_signed, true
-  default_state_getter :default_int_size,   4
-  default_state_getter :default_real_size,  8
-  default_state_getter :default_align,      1
-  default_state_getter :indent_level,       0
-  default_state_getter :indent_increment,   2
-  default_state_getter :array_start,        1
+  boolean_state_accessor :annotate
+  boolean_state_accessor :optimizer_log
+
+  default_state_getter :address_size,          OS.bits/8
+  default_state_getter :lang,                  FORTRAN, '"const_get(#{envs})"', :BOAST_LANG
+  default_state_getter :model,                 "native"
+  default_state_getter :debug,                 false
+  default_state_getter :use_vla,               false
+  default_state_getter :replace_constants,     true
+  default_state_getter :default_int_signed,    true
+  default_state_getter :default_int_size,      4
+  default_state_getter :default_real_size,     8
+  default_state_getter :default_align,         1
+  default_state_getter :indent_level,          0
+  default_state_getter :indent_increment,      2
+  default_state_getter :array_start,           1
+  default_state_getter :annotate,              false
+  default_state_getter :annotate_list,         ["For"], '"#{envs}.split(\",\").collect { |arg| YAML::load(arg) }"'
+  default_state_getter :annotate_indepth_list, ["For"], '"#{envs}.split(\",\").collect { |arg| YAML::load(arg) }"'
+  default_state_getter :annotate_level,        0
+  default_state_getter :optimizer_log,         false
+  default_state_getter :optimizer_log_file,    nil
 
   alias use_vla_old? use_vla?
   class << self
@@ -97,10 +127,39 @@ module BOAST
     return X86
   end
 
+  def get_architecture_name
+    case architecture
+    when X86
+      return :X86
+    when ARM
+      return :ARM
+    when MPPA
+      return :MPPA
+    else
+      return nil
+    end
+  end
+
+  def get_lang_name
+    case lang
+    when C
+      return :C
+    when FORTRAN
+      return :FORTRAN
+    when CL
+      return :CL
+    when CUDA
+      return :CUDA
+    else
+      nil
+    end
+  end
+
   @@output = STDOUT
   @@chain_code = false
   @@architecture = get_default_architecture
   @@decl_module = false
+  @@annotate_numbers = Hash::new { |h,k| h[k] = 0 }
 
   @@env = Hash::new{|h, k| h[k] = []}
 
@@ -108,12 +167,12 @@ module BOAST
     vars.each { |key,value|
       var = nil
       begin
-        var = class_variable_get("@@"+key.to_s)
+        var = BOAST::class_variable_get("@@"+key.to_s)
       rescue
         raise "Unknown module variable #{key}!"
       end
       @@env[key].push(var)
-      class_variable_set("@@"+key.to_s, value)
+      BOAST::class_variable_set("@@"+key.to_s, value)
     }
   end
 
@@ -122,7 +181,7 @@ module BOAST
       raise "Unknown module variable #{key}!" unless @@env.has_key?(key)
       ret = @@env[key].pop
       raise "No stored value for #{key}!" if ret.nil?
-      class_variable_set("@@"+key.to_s, ret)
+      BOAST::class_variable_set("@@"+key.to_s, ret)
     }
   end
 
@@ -134,12 +193,31 @@ module BOAST
     set_indent_level( get_indent_level - increment )
   end
 
+  def annotate_number(name)
+    num = @@annotate_numbers[name]
+    @@annotate_numbers[name] = num + 1
+    return num
+  end
+
   def indent
      return " "*get_indent_level
   end
 
-  def pr(a)
-    a.pr
+  def pr_annotate(a)
+    name = a.class.name.gsub("BOAST::","")
+    if annotate_list.include?(name) then
+      description = nil
+      if a.is_a?(Annotation) and a.annotate_indepth?(0) then
+        description = a.annotation(0)
+      end
+      annotation = { "#{name}#{annotate_number(name)}" => description }
+      Comment(YAML::dump(annotation)).pr
+    end
+  end
+
+  def pr(a, *args)
+    pr_annotate(a) if annotate?
+    a.pr(*args)
   end
 
   def decl(*a)
@@ -185,16 +263,20 @@ ConvolutionGenerator = BOAST
 class Integer
   def to_var
     if self < 0 then
-       return BOAST::Variable::new("#{self}", BOAST::Int, :signed => true, :constant => self )
+       v = BOAST::Variable::new("#{self}", BOAST::Int, :signed => true, :constant => self )
      else
-       return BOAST::Variable::new("#{self}", BOAST::Int, :signed => false, :constant => self )
+       v = BOAST::Variable::new("#{self}", BOAST::Int, :signed => false, :constant => self )
     end
+    v.force_replace_constant = true
+    return v
   end
 end
 
 class Float
   def to_var
-    return BOAST::Variable::new("#{self}", BOAST::Real, :constant => self )
+    v = BOAST::Variable::new("#{self}", BOAST::Real, :constant => self )
+    v.force_replace_constant = true
+    return v
   end
 end
 

data/lib/BOAST/Language/Annotation.rb

@@ -0,0 +1,55 @@
+module BOAST
+
+  module Annotation
+    include PrivateStateAccessor
+
+    def annotate_indepth?(level)
+      return false if level > annotate_level
+      return false unless annotate_indepth_list.include?(self.class.name.gsub("BOAST::", ""))
+      return true
+    end
+
+    def annotation_identifier
+      name = self.class.name.gsub("BOAST::", "")
+      return "#{name}#{annotate_number(name)}"
+    end
+
+    def annotate_scalar(s, level)
+      if s.is_a?(Annotation) and s.annotate_indepth?(level + 1) then
+        return { s.annotation_identifier => s.annotation(level + 1) }
+      elsif s.is_a?(Numeric)
+        return s
+      else
+        str = s.to_s
+        str = nil if str == ''
+        return str
+      end
+    end
+
+    def annotate_array(a, level)
+      return a.collect { |e|
+        annotate_var(e, level)
+      }
+    end
+
+    def annotate_var(v, level)
+      if v.is_a?(Array) then
+        return annotate_array(v, level)
+      else
+        return annotate_scalar(v, level)
+      end
+    end
+
+    def annotation(level)
+      anns = {}
+      self.class.const_get(:ANNOTATIONS).each { |a|
+        var_sym = ("@" + a.to_s).to_sym
+        var = self.instance_variable_get(var_sym)
+        anns[a] = annotate_var(var, level)
+      }
+      return anns
+    end
+
+  end
+
+end

data/lib/BOAST/Language/Arithmetic.rb

@@ -1,6 +1,25 @@
 module BOAST
+
+  module_function
+
+  def Return(value)
+    return Expression::new("return",nil, value)
+  end
+
+  def And(a, b)
+    return Expression::new(And, a, b)
+  end
+
+  def Or(a, b)
+    return Expression::new(Or, a, b)
+  end
+
   module Arithmetic
 
+    def **(x)
+      return Expression::new(Exponentiation,self,x)
+    end
+
     def ===(x)
       return Expression::new(Affectation,self,x)
     end
@@ -10,7 +29,7 @@ module BOAST
     end
 
     def ==(x)
-      return Expression::new("==",self,x)
+      return Expression::new(Equal,self,x)
     end
 
     def !=(x)
@@ -18,19 +37,19 @@ module BOAST
     end
 
     def >(x)
-      return Expression::new(">",self,x)
+      return Expression::new(Greater,self,x)
     end
  
     def <(x)
-      return Expression::new("<",self,x)
+      return Expression::new(Less,self,x)
     end
  
     def >=(x)
-      return Expression::new(">=",self,x)
+      return Expression::new(GreaterOrEqual,self,x)
     end
  
     def <=(x)
-      return Expression::new("<=",self,x)
+      return Expression::new(LessOrEqual,self,x)
     end
  
     def +(x)
@@ -53,20 +72,35 @@ module BOAST
       return Expression::new(Minus,nil,self)
     end
 
-    def address
-      return Expression::new("&",nil,self)
+    def +@
+      return Expression::new(Plus,nil,self)
+    end
+
+    def reference
+      return Expression::new(Reference,nil,self)
     end
+
+    alias address reference
    
     def dereference
-      return Expression::new("*",nil,self)
+      return Index::new(self, *(self.dimension.collect(&:start))) if lang == FORTRAN
+      return Expression::new(Dereference,nil,self)
     end
 
     def and(x)
-      return Expression::new("&&", self, x)
+      return Expression::new(And, self, x)
     end
 
+    alias & and
+
     def or(x)
-      return Expression::new("||", self, x)
+      return Expression::new(Or, self, x)
+    end
+
+    alias | or
+
+    def cast(type)
+      return type.copy("(#{type.type.decl} *)#{self}")
     end
 
     def components( range )

data/lib/BOAST/Language/Case.rb

@@ -1,43 +1,97 @@
 module BOAST
 
+  class CaseCondition < ControlStructure
+    attr_reader :block
+    attr_reader :constants
+
+    def initialize(constants = nil, &block)
+      @constants = constants
+      @block = block
+    end
+
+    def get_c_strings
+      return { :case => '"case #{constants.join(" : case ")} :"',
+               :default => '"default :"',
+               :break => '"break;"' }
+    end
+
+    def get_fortran_strings
+      return { :case => '"case (#{constants.join(", ")})"',
+               :default => '"case default"',
+               :break => 'nil' }
+    end
+
+    alias get_cl_strings get_c_strings
+    alias get_cuda_strings get_c_strings
+
+    eval token_string_generator( * %w{case constants})
+    eval token_string_generator( * %w{default})
+    eval token_string_generator( * %w{break})
+
+    def to_s
+      s = ""
+      if @constants then
+        s += case_string(@constants)
+      else
+        s += default_string
+      end
+      return s
+    end
+
+    def open
+      s = ""
+      s += indent
+      s += to_s
+      output.puts s
+      increment_indent_level
+      return self
+    end
+
+    def close
+      if @constants and break_string then
+        s = ""
+        s += indent
+        s += break_string
+        output.puts s
+      end
+      decrement_indent_level
+      return self
+    end
+
+    def pr(*args)
+      args = @args if args.length == 0 and @args
+      open
+      if @block then
+        @block.call(*args)
+        close
+      end
+      return self
+    end
+
+  end
+
   class Case < ControlStructure
 
     attr_reader :expression
-    attr_reader :constants_list
+    attr_reader :case_conditions
 
-    def initialize(expression, *control)
+    def initialize(expression, *control, &block)
       @expression = expression
-      @constants_list = []
-      @blocks = []
-      if control.size < 1 then
-        raise "No block given!"
-      elsif control.size.even? then
-        (0..control.size-1).step(2) { |i|
-          @constants_list[i/2] = [control[i]].flatten
-          @blocks[i/2] = control[i+1]
-        }
-      else
-        (0..control.size-2).step(2) { |i|
-          @constants_list[i/2] = [control[i]].flatten
-          @blocks[i/2] = control[i+1]
-        }
-        @blocks.push(control.last)
+      @case_conditions = []
+      control.push(block) if block
+      while control.size >= 2 do
+        @case_conditions.push CaseCondition::new([control.shift].flatten, &(control.shift))
       end
+      @case_conditions.push CaseCondition::new(&(control.shift)) if control.size > 0
     end
 
     def get_c_strings
       return { :switch => '"switch (#{expr}) {"',
-               :case => '"case #{constants.join(" : case")} :"',
-               :default => '"default :"',
-               :break => '"break;"',
                :end => '"}"' }
     end
 
     def get_fortran_strings
       return { :switch => '"select case (#{expr})"',
-               :case => '"case (#{constants.join(" : ")})"',
-               :default => '"case default"',
-               :break => 'nil',
                :end => '"end select"' }
     end
 
@@ -45,44 +99,29 @@ module BOAST
     alias get_cuda_strings get_c_strings
 
     eval token_string_generator( * %w{switch expr})
-    eval token_string_generator( * %w{case constants})
-    eval token_string_generator( * %w{default})
-    eval token_string_generator( * %w{break})
     eval token_string_generator( * %w{end})
 
-    def to_s(block_number = nil)
+    def to_s
       s = ""
-      if block_number then
-        if block_number != 0 then
-          s += indent + break_string + "\n" if break_string
-          decrement_indent_level
-        end
-        s += indent
-        if @constants_list[block_number] and @constants_list[block_number].size > 0 then
-          s += case_string(@constants_list[block_number])
-        else
-          s += default_string
-        end
-      else
-        s += indent
-        s += switch_string(@expression)
-      end
-      increment_indent_level
+      s += switch_string(@expression)
       return s
     end
 
     def open
-      output.puts to_s
+      s = ""
+      s += indent
+      s += to_s
+      output.puts s
+      increment_indent_level
       return self
     end
 
     def pr(*args)
+      args = @args if args.length == 0 and @args
       open
-      if @blocks.size > 0 then
-        @blocks.each_index { |indx|
-          s = to_s(indx)
-          output.puts s
-          @blocks[indx].call(*args)
+      if @case_conditions.size > 0 then
+        @case_conditions.each { |cond|
+          cond.pr(*args)
         }
         close
       end
@@ -90,12 +129,10 @@ module BOAST
     end
 
     def close
+      decrement_indent_level
       s = ""
-      s += indent + break_string + "\n" if break_string
-      decrement_indent_level      
       s += indent
       s += end_string
-      decrement_indent_level      
       output.puts s
       return self
     end