ruby-llvm 3.2.0.beta.1 → 3.3.0

data/lib/llvm/transforms/ipo.rb

@@ -5,14 +5,74 @@ require 'llvm/transforms/ipo_ffi'
 
 module LLVM
   class PassManager
-    # @LLVMpass gdce
-    def gdce!
-      C.add_global_dce_pass(self)
+    # @LLVMpass arg_promotion
+    def arg_promote!
+      C.add_argument_promotion_pass(self)
+    end
+
+    # @LLVMpass const_merge
+    def const_merge!
+      C.add_constant_merge_pass(self)
+    end
+
+    # @LLVMpass dae
+    def dae!
+      C.add_dead_arg_elimination(self)
+    end
+
+    # @LLVMpass function_attrs
+    def fun_attrs!
+      C.add_function_attrs_pass(self)
     end
-    
+
     # @LLVMpass inline
     def inline!
       C.add_function_inlining_pass(self)
     end
+
+    # @LLVMpass always_inline
+    def always_inline!
+      C.add_always_inliner_pass(self)
+    end
+
+    # @LLVMpass gdce
+    def gdce!
+      C.add_global_dce_pass(self)
+    end
+
+    # @LLVMpass global_opt
+    def global_opt!
+      C.add_global_optimizer_pass(self)
+    end
+
+    # @LLVMpass ipcp
+    def ipcp!
+      C.add_ip_constant_propagation_pass(self)
+    end
+
+    # @LLVMpass prune_eh
+    def prune_eh!
+      C.add_prune_eh_pass(self)
+    end
+
+    # @LLVMpass ipsccp
+    def ipsccp!
+      C.add_ipsccp_pass(self)
+    end
+
+    # @LLVMpass internalize
+    def internalize!(all_but_main=true)
+      C.add_internalize_pass(self, all_but_main)
+    end
+
+    # @LLVMpass sdp
+    def sdp!
+      C.add_strip_dead_prototypes_pass(self)
+    end
+
+    # @LLVMpass strip
+    def strip!
+      C.add_strip_symbols_pass(self)
+    end
   end
 end

data/lib/llvm/transforms/ipo_ffi.rb

@@ -4,7 +4,7 @@ require 'ffi'
 
 module LLVM::C
   extend FFI::Library
-  ffi_lib 'LLVM-3.2'
+  ffi_lib 'LLVM-3.3'
   
   def self.attach_function(name, *_)
     begin; super; rescue FFI::NotFoundError => e

data/lib/llvm/transforms/scalar.rb

@@ -8,105 +8,145 @@ module LLVM
     def adce!
       C.add_aggressive_dce_pass(self)
     end
-    
+
     # @LLVMpass simplifycfg
     def simplifycfg!
       C.add_cfg_simplification_pass(self)
     end
-    
+
     # @LLVMpass dse
     def dse!
       C.add_dead_store_elimination_pass(self)
     end
-    
+
     # @LLVMpass gvn
     def gvn!
       C.add_gvn_pass(self)
     end
-    
+
     # @LLVMpass indvars
     def indvars!
       C.add_ind_var_simplify_pass(self)
     end
-    
+
     # @LLVMpass instcombine
     def instcombine!
       C.add_instruction_combining_pass(self)
     end
-    
+
     # @LLVMpass jump-threading
     def jump_threading!
       C.add_jump_threading_pass(self)
     end
-    
+
     # @LLVMpass licm
     def licm!
       C.add_licm_pass(self)
     end
-    
+
     # @LLVMpass loop-deletion
     def loop_deletion!
       C.add_loop_deletion_pass(self)
     end
-    
+
+    # @LLVMpass loop-idiom
+    def loop_idiom!
+      C.add_loop_idiom_pass(self)
+    end
+
     # @LLVMpass loop-rotate
     def loop_rotate!
       C.add_loop_rotate_pass(self)
     end
-    
+
     # @LLVMpass loop-unroll
     def loop_unroll!
       C.add_loop_unroll_pass(self)
     end
-    
+
     # @LLVMpass loop-unswitch
     def loop_unswitch!
       C.add_loop_unswitch_pass(self)
     end
-    
+
     # @LLVMpass memcpyopt
     def memcpyopt!
       C.add_mem_cpy_opt_pass(self)
     end
-    
+
     # @LLVMpass mem2reg
     def mem2reg!
       C.add_promote_memory_to_register_pass(self)
     end
-    
+
     # @LLVMpass reassociate
     def reassociate!
       C.add_reassociate_pass(self)
     end
-    
+
     # @LLVMpass sccp
     def sccp!
       C.add_sccp_pass(self)
     end
-    
+
     # @LLVMpass scalarrepl
     def scalarrepl!
       C.add_scalar_repl_aggregates_pass(self)
     end
-    
+
+    # @LLVMpass scalarrepl
+    def scalarrepl_ssa!
+      C.add_scalar_repl_aggregates_pass_ssa(self)
+    end
+
+    # @LLVMpass scalarrepl
+    def scalarrepl_threshold!(threshold)
+      C.add_scalar_repl_aggregates_pass(self, threshold)
+    end
+
     # @LLVMpass simplify-libcalls
     def simplify_libcalls!
       C.add_simplify_lib_calls_pass(self)
     end
-    
+
     # @LLVMpass tailcallelim
     def tailcallelim!
       C.add_tail_call_elimination_pass(self)
     end
-    
+
     # @LLVMpass constprop
     def constprop!
       C.add_constant_propagation_pass(self)
     end
-    
+
     # @LLVMpass reg2mem
     def reg2mem!
       C.add_demote_memory_to_register_pass(self)
     end
+
+    # @LLVMpass cvprop
+    def cvprop!
+      C.add_correlated_value_propagation_pass(self)
+    end
+
+    # @LLVMpass early-cse
+    def early_cse!
+      C.add_early_cse_pass(self)
+    end
+
+    # @LLVMpass lower-expect
+    def lower_expect!
+      C.add_lower_expect_intrinsic_pass(self)
+    end
+
+    # @LLVMpass tbaa
+    def tbaa!
+      C.add_type_based_alias_analysis_pass(self)
+    end
+
+    # @LLVMpass basicaa
+    def basicaa!
+      C.add_basic_alias_analysis_pass(self)
+    end
   end
 end

data/lib/llvm/transforms/scalar_ffi.rb

@@ -4,7 +4,7 @@ require 'ffi'
 
 module LLVM::C
   extend FFI::Library
-  ffi_lib 'LLVM-3.2'
+  ffi_lib 'LLVM-3.3'
   
   def self.attach_function(name, *_)
     begin; super; rescue FFI::NotFoundError => e

data/lib/llvm/transforms/vectorize.rb

@@ -13,5 +13,10 @@ module LLVM
     def loop_vectorize!
       C.add_loop_vectorize_pass(self)
     end
+
+    # @LLVMpass slp_vectorize
+    def slp_vectorize!
+      C.add_slp_vectorize_pass(self)
+    end
   end
 end

data/lib/llvm/transforms/vectorize_ffi.rb

@@ -4,7 +4,7 @@ require 'ffi'
 
 module LLVM::C
   extend FFI::Library
-  ffi_lib 'LLVM-3.2'
+  ffi_lib 'LLVM-3.3'
   
   def self.attach_function(name, *_)
     begin; super; rescue FFI::NotFoundError => e
@@ -28,4 +28,12 @@ module LLVM::C
   # @scope class
   attach_function :add_loop_vectorize_pass, :LLVMAddLoopVectorizePass, [:pointer], :void
   
+  # See llvm::createSLPVectorizerPass function.
+  # 
+  # @method add_slp_vectorize_pass(pm)
+  # @param [FFI::Pointer(PassManagerRef)] pm 
+  # @return [nil] 
+  # @scope class
+  attach_function :add_slp_vectorize_pass, :LLVMAddSLPVectorizePass, [:pointer], :void
+  
 end

data/lib/llvm/version.rb

@@ -1,23 +1,4 @@
-require 'find'
-
 module LLVM
-  LLVM_VERSION = "3.2"
-  RUBY_LLVM_VERSION = "3.2.0.beta.1"
-  LLVM_CONFIG = begin
-    variants = %W(llvm-config-#{LLVM_VERSION} llvm-config)
-    llvm_config = nil
-    catch :done do
-      paths = ENV['PATH'].split(File::PATH_SEPARATOR).select(&File.method(:directory?))
-      Find.find(*paths) do |path|
-        if variants.include?(File.basename(path))
-          actual_version = `#{path} --version`.chomp
-          if LLVM_VERSION == actual_version
-            llvm_config = path
-            throw(:done)
-          end
-        end
-      end
-    end
-    llvm_config
-  end
+  LLVM_VERSION = "3.3"
+  RUBY_LLVM_VERSION = "3.3.0"
 end

data/test/array_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class ArrayTestCase < Test::Unit::TestCase
+class ArrayTestCase < Minitest::Test
 
   def setup
     LLVM.init_jit

data/test/basic_block_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class BasicBlockTestCase < Test::Unit::TestCase
+class BasicBlockTestCase < Minitest::Test
 
   def setup
     LLVM.init_jit

data/test/binary_operations_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class BasicOperationsTestCase < Test::Unit::TestCase
+class BasicOperationsTestCase < Minitest::Test
 
   def setup
     LLVM.init_jit

data/test/bitcode_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 require "tempfile"
 
-class BitcodeTestCase < Test::Unit::TestCase
+class BitcodeTestCase < Minitest::Test
   def setup
     LLVM.init_jit
   end

data/test/branch_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class BranchTestCase < Test::Unit::TestCase
+class BranchTestCase < Minitest::Test
 
   def setup
     LLVM.init_jit

data/test/call_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class CallTestCase < Test::Unit::TestCase
+class CallTestCase < Minitest::Test
 
   def setup
     LLVM.init_jit

data/test/comparisons_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class ComparisonsTestCase < Test::Unit::TestCase
+class ComparisonsTestCase < Minitest::Test
 
   def setup
     LLVM.init_jit

data/test/conversions_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class ConversionsTestCase < Test::Unit::TestCase
+class ConversionsTestCase < Minitest::Test
 
   def setup
     LLVM.init_jit

data/test/double_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class DoubleTestCase < Test::Unit::TestCase
+class DoubleTestCase < Minitest::Test
   def setup
     LLVM.init_jit
   end

data/test/equality_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 require "llvm/core"
 
-class EqualityTestCase < Test::Unit::TestCase
+class EqualityTestCase < Minitest::Test
   def setup
     LLVM.init_jit
   end
@@ -14,10 +14,10 @@ class EqualityTestCase < Test::Unit::TestCase
   def assert_equalities(options)
     map = {
       :equal     => method(:assert_equal),
-      :not_equal => method(:assert_not_equal),
+      :not_equal => lambda {|n, m, name| assert n != m, name  },
       :same      => method(:assert_same),
-      :not_same  => method(:assert_not_same),
-      :eql       => lambda {|n, m, name| assert n.eql?(m), name },
+      :not_same  => lambda {|n, m, name| assert !n.equal?(m), name  },
+      :eql       => lambda {|n, m, name| assert n.eql?(m), name  },
       :not_eql   => lambda {|n, m, name| assert !n.eql?(m), name },
     }
 

data/test/function_test.rb

@@ -0,0 +1,73 @@
+require "test_helper"
+require "llvm/core"
+
+
+def with_function(arguments, retty, &block)
+  mod = LLVM::Module.new('test')
+  fun = mod.functions.add('fun', arguments, retty)
+  block.yield(fun)
+  mod.dispose
+end
+
+class FunctionTest < Minitest::Test
+
+  def test_type
+    with_function [], LLVM.Void do |fun|
+      type = fun.type
+
+      assert_instance_of LLVM::Type, type
+      assert_equal :pointer,  type.kind
+      assert_equal :function, type.element_type.kind
+    end
+  end
+
+  def test_function_type
+    with_function [], LLVM.Void do |fun|
+      type = fun.function_type
+
+      assert_instance_of LLVM::FunctionType, type
+      assert_equal :function, type.kind
+    end
+  end
+
+end
+
+class FunctionTypeTest < Minitest::Test
+
+  def test_return_type
+    with_function [], LLVM.Void do |fun|
+      type = fun.function_type
+      assert_equal LLVM.Void, type.return_type
+    end
+
+    with_function [], LLVM::Int32 do |fun|
+      retty = fun.function_type.return_type
+
+      assert_kind_of LLVM::IntType, retty
+      assert_equal 32, retty.width
+    end
+  end
+
+  def test_argument_types
+    with_function [], LLVM.Void do |fun|
+      types = fun.function_type.argument_types
+      assert_equal [], types
+    end
+
+    with_function [LLVM::Int32], LLVM.Void do |fun|
+      types = fun.function_type.argument_types
+      assert_equal 1, types.size
+      a1 = types[0]
+      assert_kind_of LLVM::IntType, a1
+      assert_equal 32, a1.width
+    end
+  end
+
+  def test_vararg
+    with_function [], LLVM.Void do |fun|
+      type = fun.function_type
+      assert !type.vararg?, 'should be false'
+    end
+  end
+
+end