BOAST 0.9995 → 0.9996

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "0.9995"
+  s.version = "0.9996"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/boast/"
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
                 lib/BOAST/Inspectable.rb
                 lib/BOAST/Functors.rb
                 lib/BOAST/ControlStructure.rb
+                lib/BOAST/Print.rb
+                lib/BOAST/State.rb
               )
   s.has_rdoc = true
   s.license = 'BSD'

data/lib/BOAST/Algorithm.rb

@@ -9,20 +9,67 @@ module BOAST
   X86 = 1
   ARM = 2
 
-  def self.get_default_lang
-    lang = BOAST::const_get(ENV["BOAST_LANG"]) if ENV["BOAST_LANG"]
+  module PrivateStateAccessor
+
+    private_state_accessor :output, :lang, :architecture
+    private_state_accessor :default_int_size, :default_real_size
+    private_state_accessor :array_start
+    private_state_accessor :indent_level, :indent_increment
+
+    private_boolean_state_accessor :replace_constants
+    private_boolean_state_accessor :default_int_signed
+    private_boolean_state_accessor :chain_code
+    private_boolean_state_accessor :debug
+
+    private
+    def push_env(*args)
+      BOAST::push_env(*args)
+    end
+
+    def pop_env(*args)
+      BOAST::pop_env(*args)
+    end
+
+    def increment_indent_level(*args)
+      BOAST::increment_indent_level(*args)
+    end
+
+    def decrement_indent_level(*args)
+      BOAST::decrement_indent_level(*args)
+    end
+
+    def indent
+      BOAST::indent
+    end
+
+  end
+
+  state_accessor :output, :lang, :architecture
+  state_accessor :default_int_size, :default_real_size
+  state_accessor :array_start
+  state_accessor :indent_level, :indent_increment
+
+  boolean_state_accessor :replace_constants
+  boolean_state_accessor :default_int_signed
+  boolean_state_accessor :chain_code
+  boolean_state_accessor :debug
+
+  module_function
+
+  def get_default_lang
+    lang = const_get(ENV["BOAST_LANG"]) if ENV["BOAST_LANG"]
     return lang if lang
-    return BOAST::FORTRAN
+    return FORTRAN
   end
 
-  def self.get_default_debug
+  def get_default_debug
     debug = false
     debug = ENV["DEBUG"] if ENV["DEBUG"]
     return debug
   end
 
   @@output = STDOUT
-  @@lang = BOAST::get_default_lang
+  @@lang = get_default_lang
   @@replace_constants = true
   @@default_int_size = 4
   @@default_int_signed = true
@@ -32,224 +79,70 @@ module BOAST
   @@array_start = 1
   @@chain_code = false
   @@architecture = X86
-  @@debug = BOAST::get_default_debug
+  @@debug = get_default_debug
 
   @@env = Hash::new{|h, k| h[k] = []}
 
-  def self.push_env(vars = {})
+  def push_env(vars = {})
     vars.each { |key,value|
       var = nil
       begin
-        var = BOAST::class_variable_get("@@"+key.to_s)
+        var = class_variable_get("@@"+key.to_s)
       rescue
         raise "Unknown module variable #{key}!"
       end
       @@env[key].push(var)
-      BOAST::class_variable_set("@@"+key.to_s, value)
+      class_variable_set("@@"+key.to_s, value)
     }
   end
 
-  def self.pop_env(*vars)
+  def pop_env(*vars)
     vars.each { |key|
       raise "Unknown module variable #{key}!" unless @@env.has_key?(key)
       ret = @@env[key].pop
       raise "No stored value for #{key}!" if ret.nil?
-      BOAST::class_variable_set("@@"+key.to_s, ret)
-    }
-  end
-
-  def self.print(a)
-    a.print
-  end
-
-  def self.decl(*a)
-    a.each { |d|
-      d.decl
+      class_variable_set("@@"+key.to_s, ret)
     }
   end
 
-  def self.close(a)
-    a.close
-  end
-
-  def self.open(a)
-    a.open
-  end
-
-  def self.debug=(debug)
-    @@debug = debug
-  end
-
-  def self.debug
-    return @@debug
-  end
-
-  def self.architecture=(arch)
-    @@architecture = arch
-  end
-
-  def self.set_architecture(arch)
-    @@architecture = arch
-  end
-
-  def self.architecture
-    return @@architecture
-  end
-
-  def self.get_architecture
-    return @@architecture
-  end
-
-  def self.indent_level=(level)
-    @@indent_level = level
-  end
-
-  def self.set_indent_level(level)
-    @@indent_level = level
-  end
-
-  def self.indent_level
-    return @@indent_level
-  end
-
-  def self.get_indent_level
-    return @@indent_level
-  end
-
-  def self.indent_increment
-    return @@indent_increment
-  end
-
-  def self.get_indent_increment
-    return @@indent_increment
-  end
-
-  def self.increment_indent_level(increment = @@indent_increment)
-    @@indent_level += increment
+  def increment_indent_level(increment = get_indent_increment)
+    set_indent_level( get_indent_level + increment )
   end
   
-  def self.decrement_indent_level(increment = @@indent_increment)
-    @@indent_level -= increment
+  def decrement_indent_level(increment = get_indent_increment)
+    set_indent_level( get_indent_level - increment )
   end
 
-  def self.indent
-     return " "*BOAST::get_indent_level
-  end
-  
-  def self.set_replace_constants(replace_constants)
-    @@replace_constants = replace_constants
-  end
-
-  def self.replace_constants?
-    return @@replace_constants
-  end
-
-  def self.get_replace_constants
-    return @@replace_constants
-  end
-
-  def self.default_int_signed=(signed)
-    @@default_int_signed = signed
-  end
-
-  def self.set_default_int_signed(signed)
-    @@default_int_signed = signed
-  end
-
-  def self.default_int_signed?
-    return @@default_int_signed
-  end
-
-  def self.get_default_int_signed
-    return @@default_int_signed
-  end
-
-  def self.default_int_size=(size)
-    @@default_int_size = size
-  end
-
-  def self.set_default_int_size(size)
-    @@default_int_size = size
-  end
-
-  def self.default_int_size
-    return @@default_int_size
-  end
-
-  def self.get_default_int_size
-    return @@default_int_size
-  end
-
-  def self.default_real_size=(size)
-    @@default_real_size = size
-  end
-
-  def self.set_default_real_size(size)
-    @@default_real_size = size
-  end
-
-  def self.default_real_size
-    return @@default_real_size
-  end
-
-  def self.get_default_real_size
-    return @@default_real_size
-  end
-
-  def self.lang=(lang)
-    @@lang = lang
-  end
-
-  def self.set_lang(lang)
-    @@lang = lang
+  def indent
+     return " "*get_indent_level
   end
 
-  def self.lang
-    return @@lang
+  def pr(a)
+    a.pr
   end
 
-  def self.get_lang
-    return @@lang
-  end
-
-  def self.output(output)
-    @@output = output
-  end
-
-  def self.set_output(output)
-    @@output = output
-  end
-
-  def self.output
-    return @@output
-  end
-
-  def self.get_output
-    return @@output
-  end
-
-  def self.set_chain_code(chain_code)
-    @@chain_code = chain_code
-  end
-
-  def self.get_chain_code
-    return @@chain_code
+  def decl(*a)
+    a.each { |d|
+      d.decl
+    }
   end
 
-  def self.array_start=(array_start)
-    @@array_start = array_start
+  def close(a)
+    a.close
   end
 
-  def self.set_array_start(array_start)
-    @@array_start = array_start
+  def open(a)
+    a.open
   end
 
-  def self.array_start
-    return @@array_start
-  end
+  alias :Var :Variable
+  alias :Dim :Dimension
+  alias :Call :FuncCall
 
-  def self.get_array_start
-    return @@array_start
+  class << self
+    alias :Var :Variable
+    alias :Dim :Dimension
+    alias :Call :FuncCall
   end
 
   Var = Variable
@@ -263,7 +156,7 @@ module BOAST
   set_transition(Sizet, Sizet, :default, Sizet)
   set_transition(Sizet, Int, :default, Sizet)
   set_transition(Int, Sizet, :default, Sizet)
-  
+
 end
 
 ConvolutionGenerator = BOAST

data/lib/BOAST/Arithmetic.rb

@@ -2,64 +2,64 @@ module BOAST
   module Arithmetic
 
     def ===(x)
-      return BOAST::Expression::new(BOAST::Affectation,self,x)
+      return Expression::new(Affectation,self,x)
     end
 
     def !
-      return BOAST::Expression::new(BOAST::Not,nil,self)
+      return Expression::new(Not,nil,self)
     end
 
     def ==(x)
-      return BOAST::Expression::new("==",self,x)
+      return Expression::new("==",self,x)
     end
 
     def !=(x)
-      return BOAST::Expression::new(BOAST::Different,self,x)
+      return Expression::new(Different,self,x)
     end
 
     def >(x)
-      return BOAST::Expression::new(">",self,x)
+      return Expression::new(">",self,x)
     end
  
     def <(x)
-      return BOAST::Expression::new("<",self,x)
+      return Expression::new("<",self,x)
     end
  
     def >=(x)
-      return BOAST::Expression::new(">=",self,x)
+      return Expression::new(">=",self,x)
     end
  
     def <=(x)
-      return BOAST::Expression::new("<=",self,x)
+      return Expression::new("<=",self,x)
     end
  
     def +(x)
-      return BOAST::Expression::new(BOAST::Addition,self,x)
+      return Expression::new(Addition,self,x)
     end
 
     def -(x)
-      return BOAST::Expression::new(BOAST::Substraction,self,x)
+      return Expression::new(Substraction,self,x)
     end
  
     def *(x)
-      return BOAST::Expression::new(BOAST::Multiplication,self,x)
+      return Expression::new(Multiplication,self,x)
     end
 
     def /(x)
-      return BOAST::Expression::new(BOAST::Division,self,x)
+      return Expression::new(Division,self,x)
     end
  
     def -@
-      return BOAST::Expression::new(BOAST::Minus,nil,self)
+      return Expression::new(Minus,nil,self)
     end
 
     def address
-      return BOAST::Expression::new("&",nil,self)
+      return Expression::new("&",nil,self)
     end
    
     def dereference
-      return BOAST::Expression::new("*",nil,self)
+      return Expression::new("*",nil,self)
     end
- 
+
   end
 end

data/lib/BOAST/BOAST_OpenCL.rb

@@ -1,13 +1,16 @@
 module BOAST
-  @@ocl_cuda_dim_assoc = { 0 => "x", 1 => "y", 2 => "z" }
 
-  @@cuda_threadIdx = CStruct("threadIdx",:type_name => "cuda_trheadIdx", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
-  @@cuda_blockIdx = CStruct("blockIdx",:type_name => "cuda_blockIdx", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
-  @@cuda_blockDim = CStruct("blockDim",:type_name => "cuda_blockDim", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
-  @@cuda_gridDim = CStruct("gridDim",:type_name => "cuda_gridDim", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
+  OCL_CUDA_DIM_ASSOC = { 0 => "x", 1 => "y", 2 => "z" }
 
-  def self.barrier(*locality)
-    if @@lang == CL then
+  CUDA_THREADIDX = CStruct("threadIdx",:type_name => "cuda_trheadIdx", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
+  CUDA_BLOCKIDX = CStruct("blockIdx",:type_name => "cuda_blockIdx", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
+  CUDA_BLOCKDIM = CStruct("blockDim",:type_name => "cuda_blockDim", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
+  CUDA_GRIDDIM = CStruct("gridDim",:type_name => "cuda_gridDim", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
+
+  module_function
+
+  def barrier(*locality)
+    if lang == CL then
       loc=""
       if locality.include?(:local) and locality.include?(:global) then
         return FuncCall::new("barrier","CLK_LOCAL_MEM_FENCE | CLK_GLOBAL_MEM_FENCE")
@@ -18,7 +21,7 @@ module BOAST
       else
         raise "Unsupported locality"
       end
-    elsif @@lang == CUDA then
+    elsif lang == CUDA then
       return FuncCall::new("__syncthreads")
     else
       raise "Unsupported language!"
@@ -26,84 +29,84 @@ module BOAST
   end
 
 
-  def self.get_work_dim
-    if @@lang == CL then
+  def get_work_dim
+    if lang == CL then
       return FuncCall::new("get_work_dim", :returns => Int("wd", :signed => false))
     else
       raise "Unsupported language!"
     end
   end
   
-  def self.get_global_size(dim)
-    if @@lang == CL then
+  def get_global_size(dim)
+    if lang == CL then
       return FuncCall::new("get_global_size", dim, :returns => Sizet)
-    elsif @@lang == CUDA then
-      d = @@ocl_cuda_dim_assoc[dim]
+    elsif lang == CUDA then
+      d = OCL_CUDA_DIM_ASSOC[dim]
       raise "Unsupported dimension!" if not d
-      return eval "@@cuda_gridDim.#{d}*@@cuda_blockDim.#{d}"
+      return eval "CUDA_GRIDDIM.#{d}*CUDA_BLOCKDIM.#{d}"
     else
       raise "Unsupported language!"
     end
   end
 
-  def self.get_global_id(dim)
-    if @@lang == CL then
+  def get_global_id(dim)
+    if lang == CL then
       return FuncCall::new("get_global_id",dim, :returns => Sizet)
-    elsif @@lang == CUDA then
-      d = @@ocl_cuda_dim_assoc[dim]
+    elsif lang == CUDA then
+      d = OCL_CUDA_DIM_ASSOC[dim]
       raise "Unsupported dimension!" if not d
-      return eval "@@cuda_threadIdx.#{d}+@@cuda_blockIdx.#{d}*@@cuda_blockDim.#{d}"
+      return eval "CUDA_THREADIDX.#{d}+CUDA_BLOCKIDX.#{d}*CUDA_BLOCKDIM.#{d}"
     else
       raise "Unsupported language!"
     end
   end
 
-  def self.get_local_size(dim)
-    if @@lang == CL then
+  def get_local_size(dim)
+    if lang == CL then
       return FuncCall::new("get_local_size",dim, :returns => Sizet)
-    elsif @@lang == CUDA then
-      d = @@ocl_cuda_dim_assoc[dim]
+    elsif lang == CUDA then
+      d = OCL_CUDA_DIM_ASSOC[dim]
       raise "Unsupported dimension!" if not d
-      return eval "@@cuda_blockDim.#{d}"
+      return eval "CUDA_BLOCKDIM.#{d}"
     else
       raise "Unsupported language!"
     end
   end
 
-  def self.get_local_id(dim)
-    if @@lang == CL then
+  def get_local_id(dim)
+    if lang == CL then
       return FuncCall::new("get_local_id",dim, :returns => Sizet)
-    elsif @@lang == CUDA then
-      d = @@ocl_cuda_dim_assoc[dim]
+    elsif lang == CUDA then
+      d = OCL_CUDA_DIM_ASSOC[dim]
       raise "Unsupported dimension!" if not d
-      return eval "@@cuda_threadIdx.#{d}"
+      return eval "CUDA_THREADIDX.#{d}"
     else
       raise "Unsupported language!"
     end
   end
   
-  def self.get_num_groups(dim)
-    if @@lang == CL then
+  def get_num_groups(dim)
+    if lang == CL then
       return FuncCall::new("get_num_groups",dim, :returns => Sizet)
-    elsif @@lang == CUDA then
-      d = @@ocl_cuda_dim_assoc[dim]
+    elsif lang == CUDA then
+      d = OCL_CUDA_DIM_ASSOC[dim]
       raise "Unsupported dimension!" if not d
-      return eval "@@cuda_gridDim.#{d}"
+      return eval "CUDA_GRIDDIM.#{d}"
     else
       raise "Unsupported language!"
     end
   end
 
-  def self.get_group_id(dim)
-    if @@lang == CL then
+  def get_group_id(dim)
+    if lang == CL then
       return FuncCall::new("get_group_id",dim, :returns => Sizet)
-    elsif @@lang == CUDA then
-      d = @@ocl_cuda_dim_assoc[dim]
+    elsif lang == CUDA then
+      d = OCL_CUDA_DIM_ASSOC[dim]
       raise "Unsupported dimension!" if not d
-      return eval "@@cuda_blockIdx.#{d}"
+      return eval "CUDA_BLOCKIDX.#{d}"
     else
       raise "Unsupported language!"
     end
   end
-  
+
 end