ruby-llvm 3.2.0.beta.1 → 3.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6cddca1edd8ba250d7003d333aeba9c4fffffc9a
+  data.tar.gz: 480c115d38ecc429338f474e7bfcbdba846406e0
+SHA512:
+  metadata.gz: f9bd7e960dc2b5cc1654254e14afb0dfa10d447a330dc0950035517a6f31adaa488fa1cd4aad1b6d87dc286d420ff477e2bdc0801994f03929240346c4534da8
+  data.tar.gz: 7851c1b08cd9df28d8d518bfe97f6f1b8b2629ee68f3eac1feea6799d24549d9db92adc2d05bfd2a2611ed98a7f758bd0b9c2313564bc2bbb63153e187a4db34

data/README.md

@@ -4,12 +4,12 @@ Ruby-LLVM
 Ruby-LLVM is a Ruby language binding to the LLVM compiler infrastructure
 library. LLVM allows users to create just-in-time (JIT) compilers, ahead-of-time
 (AOT) compilers for multiple architectures, code analyzers and more. LLVM
-bindings can also be used to speed up Ruby code by compiling Ruby methods on the
-fly.
+bindings can also be used to speed up Ruby code by compiling and loading
+computationally intensive algorithms on the fly.
 
 Requirements
 ------------
-* LLVM 3.2, including libLLVM-3.2 (compile LLVM with --enable-shared).
+* LLVM 3.3, including libLLVM-3.3 (compile LLVM with --enable-shared).
 * In order to ensure the usability of JIT features (i.e. create_jit_compiler), compile LLVM with --enable-jit as well.
 
 About version numbers
@@ -47,3 +47,6 @@ Ruby-LLVM is possible because of its contributors:
 * Juan Wajnerman
 * Steven Farlie
 * Peter Zotov
+* Austin Seipp
+* Torsten Rüger
+* Nathaniel Barnes

data/ext/ruby-llvm-support/Rakefile

@@ -1,42 +1,98 @@
-require 'rake/clean'
 require 'rubygems'
+require 'rake/clean'
 require 'ffi'
 
-# Change this when updating for a newer LLVM.
-LLVM_VERSION = '3.2'
+require File.expand_path('../../lib/llvm/version', File.dirname(__FILE__))
+include LLVM
+
+def check_for(what, variants, env_var)
+  variants = [ ENV[env_var], *variants ] if ENV.include?(env_var)
 
-def check_llvm_config(name)
-  actual_version = `#{name} --version`
-  actual_version.strip == LLVM_VERSION
-rescue Errno::ENOENT
-  false
+  $stdout.print("checking for #{what}... ")
+  $stdout.flush
+
+  result = variants.find do |variant|
+    if yield(variant)
+      $stdout.puts(variant)
+      true
+    end
+  end
+
+  if result
+    result
+  else
+    raise RuntimeError, "Cannot find #{what}: tried #{variants}"
+  end
 end
 
-def invoke_llvm_config(options)
-  variants = %W(llvm-config-#{LLVM_VERSION} llvm-config)
+def find_llvm_config
+  check_for('llvm-config',
+            %W(llvm-config-#{LLVM_VERSION} llvm-config),
+            'LLVM_CONFIG') do |llvm_config|
 
-  variants.each do |name|
-    if check_llvm_config(name)
-      return `#{name} #{options}`.gsub("\n", " ")
+    begin
+      actual_version = `#{llvm_config} --version`.strip
+
+      actual_version == LLVM_VERSION
+    rescue Errno::ENOENT
+      false
     end
   end
+end
+
+def find_cxx
+  check_for('C++ compiler', %W(clang++ g++), 'CXX') do |cxx|
+    system(cxx, "--version", out: :close, err: :close)
+    $?.success?
+  end
+end
 
-  raise RuntimeError, "No valid llvm-config found. Tried: #{variants}"
+LLVM_CONFIG = find_llvm_config
+CXX         = find_cxx
+
+def invoke_llvm_config(options)
+  `#{LLVM_CONFIG} #{options}`.gsub("\n", " ")
 end
 
-LLVM_CONFIG = invoke_llvm_config('--cxxflags --ldflags')
+SUPPORT_LIB = FFI.map_library_name("RubyLLVMSupport-#{LLVM_VERSION}")
+CONFIG_MOD  = File.expand_path('../../lib/llvm/config.rb', File.dirname(__FILE__))
 
-CXX    = "g++"
-SRC    = "support.cpp"
-OUTPUT = FFI.map_library_name("RubyLLVMSupport-#{LLVM_VERSION}")
+CLEAN.include(SUPPORT_LIB, CONFIG_MOD)
 
-CLEAN.include(OUTPUT)
+desc "Build the shared library and config module"
+task :default => [SUPPORT_LIB, CONFIG_MOD]
 
-task :default => [:build]
+file SUPPORT_LIB => %w(support.cpp) do |task|
+  sh "#{CXX} -shared -lLLVM-#{LLVM_VERSION} #{task.prerequisites.join(' ')} " \
+     "#{invoke_llvm_config('--cxxflags --ldflags')} -o #{SUPPORT_LIB}"
+end
 
-desc "Build the shared library"
-task :build => [OUTPUT]
+LLVM_CONFIG_OPTS = [
+  ['COMPONENTS',    :array,  '--components'],
+  ['TARGETS_BUILT', :array,  '--targets-built'],
+  ['HOST_TARGET',   :string, '--host-target'],
+  ['BUILD_MODE',    :string, '--build-mode'],
+  ['CFLAGS',        :string, '--cflags'],
+]
 
-file OUTPUT => [SRC] do
-  sh "#{CXX} -shared -lLLVM-#{LLVM_VERSION} #{SRC} #{LLVM_CONFIG} -o #{OUTPUT}"
+file CONFIG_MOD do
+  open(CONFIG_MOD, 'w') do |f|
+    f.puts '# Generated by ruby-llvm. Please do not change this file by hand.'
+    f.puts 'module LLVM'
+    f.puts '  module CONFIG'
+
+    LLVM_CONFIG_OPTS.each do |(const, fmt, flag)|
+      case fmt
+      when :string
+        value = invoke_llvm_config(flag)
+      when :array
+        value = invoke_llvm_config(flag).split
+      end
+
+      f.puts "    #{const} = #{value.inspect}"
+    end
+
+    f.puts '  end'
+    f.puts 'end'
+  end
 end

data/ext/ruby-llvm-support/support.cpp

@@ -3,8 +3,9 @@
  */
 
 #include <llvm-c/Core.h>
-#include <llvm/Type.h>
-#include <llvm/GlobalValue.h>
+#include <llvm/IR/Type.h>
+#include <llvm/IR/Module.h>
+#include <llvm/IR/GlobalValue.h>
 #include <llvm/Support/DynamicLibrary.h>
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Support/raw_ostream.h>
@@ -28,7 +29,7 @@ extern "C" {
     unwrap<Type>(type)->dump();
   }
 
-  int LLVMPrintModuleToFD(LLVMModuleRef module, int fd, LLVMBool shouldClose, LLVMBool unbuffered) {
+  void LLVMPrintModuleToFD(LLVMModuleRef module, int fd, LLVMBool shouldClose, LLVMBool unbuffered) {
     raw_fd_ostream os(fd, shouldClose, unbuffered);
     unwrap(module)->print(os, 0);
   }

data/lib/llvm.rb

@@ -1,13 +1,13 @@
-require 'rubygems'
 require 'ffi'
 
 module LLVM
+  require 'llvm/version'
   require 'llvm/support'
 
   # @private
   module C
     extend ::FFI::Library
-    ffi_lib ['LLVM-3.2']
+    ffi_lib ["LLVM-#{LLVM_VERSION}"]
   end
 
   module PointerIdentity

data/lib/llvm/analysis_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/config.rb

@@ -0,0 +1,10 @@
+# Generated by ruby-llvm. Please do not change this file by hand.
+module LLVM
+  module CONFIG
+    COMPONENTS = ["aarch64", "aarch64asmparser", "aarch64asmprinter", "aarch64codegen", "aarch64desc", "aarch64disassembler", "aarch64info", "aarch64utils", "all", "all-targets", "analysis", "archive", "arm", "armasmparser", "armasmprinter", "armcodegen", "armdesc", "armdisassembler", "arminfo", "asmparser", "asmprinter", "bitreader", "bitwriter", "codegen", "core", "cppbackend", "cppbackendcodegen", "cppbackendinfo", "debuginfo", "engine", "executionengine", "hexagon", "hexagonasmprinter", "hexagoncodegen", "hexagondesc", "hexagoninfo", "instcombine", "instrumentation", "interpreter", "ipa", "ipo", "irreader", "jit", "linker", "mblaze", "mblazeasmparser", "mblazeasmprinter", "mblazecodegen", "mblazedesc", "mblazedisassembler", "mblazeinfo", "mc", "mcdisassembler", "mcjit", "mcparser", "mips", "mipsasmparser", "mipsasmprinter", "mipscodegen", "mipsdesc", "mipsdisassembler", "mipsinfo", "msp430", "msp430asmprinter", "msp430codegen", "msp430desc", "msp430info", "native", "nativecodegen", "nvptx", "nvptxasmprinter", "nvptxcodegen", "nvptxdesc", "nvptxinfo", "objcarcopts", "object", "option", "powerpc", "powerpcasmparser", "powerpcasmprinter", "powerpccodegen", "powerpcdesc", "powerpcinfo", "r600", "r600asmprinter", "r600codegen", "r600desc", "r600info", "runtimedyld", "scalaropts", "selectiondag", "sparc", "sparccodegen", "sparcdesc", "sparcinfo", "support", "systemz", "systemzasmparser", "systemzasmprinter", "systemzcodegen", "systemzdesc", "systemzinfo", "tablegen", "target", "transformutils", "vectorize", "x86", "x86asmparser", "x86asmprinter", "x86codegen", "x86desc", "x86disassembler", "x86info", "x86utils", "xcore", "xcoreasmprinter", "xcorecodegen", "xcoredesc", "xcoredisassembler", "xcoreinfo"]
+    TARGETS_BUILT = ["R600", "X86", "Sparc", "PowerPC", "AArch64", "ARM", "Mips", "XCore", "MSP430", "CppBackend", "MBlaze", "NVPTX", "Hexagon", "SystemZ"]
+    HOST_TARGET = "x86_64-pc-linux-gnu "
+    BUILD_MODE = "Release "
+    CFLAGS = "-I/usr/lib/llvm-3.3/include  -DNDEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -g -O2 -fomit-frame-pointer -fPIC "
+  end
+end

data/lib/llvm/core.rb

@@ -15,20 +15,22 @@ module LLVM
   # @yield  [FFI::MemoryPointer]
   # @return [String, nil]
   def self.with_message_output
-    result = nil
+    message = nil
 
     FFI::MemoryPointer.new(FFI.type_size(:pointer)) do |str|
-      yield str
+      result = yield str
 
       msg_ptr = str.read_pointer
 
-      unless msg_ptr.null?
-        result = msg_ptr.read_string
+      if result != 0
+        raise RuntimeError, "Error is signalled, but msg_ptr is null" if msg_ptr.null?
+
+        message = msg_ptr.read_string
         C.dispose_message msg_ptr
       end
     end
 
-    result
+    message
   end
 
   # Same as #with_message_output, but raises a RuntimeError with the

data/lib/llvm/core/bitcode_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/core/builder.rb

@@ -79,7 +79,7 @@ module LLVM
     end
 
     # Unconditional branching (i.e. goto)
-    # @param [LLVM::BasicBlock] block Where to jump
+    # @param  [LLVM::BasicBlock]  block Where to jump
     # @return [LLVM::Instruction]
     # @LLVMinst br
     def br(block)
@@ -88,10 +88,20 @@ module LLVM
         C.build_br(self, block))
     end
 
+    # Indirect branching (i.e. computed goto)
+    # @param  [LLVM::BasicBlock]  addr      Where to jump
+    # @param  [Integer]           num_dests Number of possible destinations to be added
+    # @return [LLVM::Instruction]
+    # @LLVMinst indirectbr
+    def ibr(addr, num_dests)
+      IndirectBr.from_ptr(
+        C.build_indirect_br(self, addr, num_dests))
+    end
+
     # Conditional branching (i.e. if)
-    # @param [LLVM::Value] cond The condition
-    # @param [LLVM::BasicBlock] iftrue Where to jump if condition is true
-    # @param [LLVM::BasicBlock] iffalse Where to jump if condition is false
+    # @param  [LLVM::Value]       cond    The condition
+    # @param  [LLVM::BasicBlock]  iftrue  Where to jump if condition is true
+    # @param  [LLVM::BasicBlock]  iffalse Where to jump if condition is false
     # @return [LLVM::Instruction]
     # @LLVMinst br
     def cond(cond, iftrue, iffalse)
@@ -136,7 +146,7 @@ module LLVM
     # Builds an unwind Instruction.
     # @LLVMinst unwind
     def unwind
-      Instruction.from_ptr(C.LLVMBuildUnwind(self))
+      Instruction.from_ptr(C.build_unwind(self))
     end
 
     # Generates an instruction with no defined semantics. Can be used to
@@ -147,6 +157,7 @@ module LLVM
       Instruction.from_ptr(C.build_unreachable(self))
     end
 
+    # Integer addition.
     # @param [LLVM::Value] lhs Integer or vector of integers
     # @param [LLVM::Value] rhs Integer or vector of integers
     # @param [String] name Name of the result in LLVM IR
@@ -156,7 +167,7 @@ module LLVM
       Instruction.from_ptr(C.build_add(self, lhs, rhs, name))
     end
 
-    # No signed wrap addition.
+    # "No signed wrap" integer addition.
     # @param [LLVM::Value] lhs Integer or vector of integers
     # @param [LLVM::Value] rhs Integer or vector of integers
     # @param [String] name Name of the result in LLVM IR
@@ -166,6 +177,16 @@ module LLVM
       Instruction.from_ptr(C.build_nsw_add(self, lhs, rhs, name))
     end
 
+    # "No unsigned wrap" integer addition.
+    # @param [LLVM::Value] lhs Integer or vector of integers
+    # @param [LLVM::Value] rhs Integer or vector of integers
+    # @param [String] name Name of the result in LLVM IR
+    # @return [LLVM::Instruction] The integer sum of the two operands
+    # @LLVMinst add
+    def nuw_add(lhs, rhs, name = "")
+      Instruction.from_ptr(C.build_nuw_add(self, lhs, rhs, name))
+    end
+
     # @param [LLVM::Value] lhs Floating point or vector of floating points
     # @param [LLVM::Value] rhs Floating point or vector of floating points
     # @param [String] name Name of the result in LLVM IR
@@ -175,6 +196,7 @@ module LLVM
       Instruction.from_ptr(C.build_f_add(self, lhs, rhs, name))
     end
 
+    # Integer subtraction.
     # @param [LLVM::Value] lhs Integer or vector of integers
     # @param [LLVM::Value] rhs Integer or vector of integers
     # @param [String] name Name of the result in LLVM IR
@@ -184,6 +206,26 @@ module LLVM
       Instruction.from_ptr(C.build_sub(self, lhs, rhs, name))
     end
 
+    # No signed wrap integer subtraction.
+    # @param [LLVM::Value] lhs Integer or vector of integers
+    # @param [LLVM::Value] rhs Integer or vector of integers
+    # @param [String] name Name of the result in LLVM IR
+    # @return [LLVM::Instruction] The integer difference of the two operands
+    # @LLVMinst sub
+    def nsw_sub(lhs, rhs, name = "")
+      Instruction.from_ptr(C.build_nsw_sub(self, lhs, rhs, name))
+    end
+
+    # No unsigned wrap integer subtraction.
+    # @param [LLVM::Value] lhs Integer or vector of integers
+    # @param [LLVM::Value] rhs Integer or vector of integers
+    # @param [String] name Name of the result in LLVM IR
+    # @return [LLVM::Instruction] The integer difference of the two operands
+    # @LLVMinst sub
+    def nuw_sub(lhs, rhs, name = "")
+      Instruction.from_ptr(C.build_nuw_sub(self, lhs, rhs, name))
+    end
+
     # @param [LLVM::Value] lhs Floating point or vector of floating points
     # @param [LLVM::Value] rhs Floating point or vector of floating points
     # @param [String] name Name of the result in LLVM IR
@@ -194,6 +236,7 @@ module LLVM
       Instruction.from_ptr(C.build_f_sub(self, lhs, rhs, name))
     end
 
+    # Integer multiplication.
     # @param [LLVM::Value] lhs Integer or vector of integers
     # @param [LLVM::Value] rhs Integer or vector of integers
     # @param [String] name Name of the result in LLVM IR
@@ -203,6 +246,27 @@ module LLVM
       Instruction.from_ptr(C.build_mul(self, lhs, rhs, name))
     end
 
+    # "No signed wrap" integer multiplication.
+    # @param [LLVM::Value] lhs Integer or vector of integers
+    # @param [LLVM::Value] rhs Integer or vector of integers
+    # @param [String] name Name of the result in LLVM IR
+    # @return [LLVM::Instruction] The integer product of the two operands
+    # @LLVMinst mul
+    def nsw_mul(lhs, rhs, name = "")
+      Instruction.from_ptr(C.build_nsw_mul(self, lhs, rhs, name))
+    end
+
+    # "No unsigned wrap" integer multiplication.
+    # @param [LLVM::Value] lhs Integer or vector of integers
+    # @param [LLVM::Value] rhs Integer or vector of integers
+    # @param [String] name Name of the result in LLVM IR
+    # @return [LLVM::Instruction] The integer product of the two operands
+    # @LLVMinst mul
+    def nuw_mul(lhs, rhs, name = "")
+      Instruction.from_ptr(C.build_nuw_mul(self, lhs, rhs, name))
+    end
+
+    # Floating point multiplication
     # @param [LLVM::Value] lhs Floating point or vector of floating points
     # @param [LLVM::Value] rhs Floating point or vector of floating points
     # @param [String] name Name of the result in LLVM IR
@@ -348,6 +412,24 @@ module LLVM
       Instruction.from_ptr(C.build_neg(self, arg, name))
     end
 
+    # "No signed wrap" integer negation.
+    # @param [LLVM::Value] arg Integer or vector of integers
+    # @param [String] name Name of the result in LLVM IR
+    # @return [LLVM::Instruction] The negated operand
+    # @LLVMinst sub
+    def nsw_neg(arg, name = "")
+      Instruction.from_ptr(C.build_nsw_neg(self, arg, name))
+    end
+
+    # "No unsigned wrap" integer negation.
+    # @param [LLVM::Value] arg Integer or vector of integers
+    # @param [String] name Name of the result in LLVM IR
+    # @return [LLVM::Instruction] The negated operand
+    # @LLVMinst sub
+    def nuw_neg(arg, name = "")
+      Instruction.from_ptr(C.build_nuw_neg(self, arg, name))
+    end
+
     # Boolean negation.
     # @param [LLVM::Value] arg Integer or vector of integers
     # @param [String] name The name of the result in LLVM IR

data/lib/llvm/core/module.rb

@@ -17,6 +17,7 @@ module LLVM
 
     def dispose
       return if @ptr.nil?
+
       C.dispose_module(@ptr)
       @ptr = nil
     end

data/lib/llvm/core/type.rb

@@ -125,14 +125,14 @@ module LLVM
       size = C.count_param_types(self)
       result = nil
       FFI::MemoryPointer.new(FFI.type_size(:pointer) * size) do |types_ptr|
-	C.LLVMGetParamTypes(self, types_ptr)
-	result = types_ptr.read_array_of_pointer(size)
+        C.get_param_types(self, types_ptr)
+        result = types_ptr.read_array_of_pointer(size)
       end
-      result.map{ |p| Type.from_ptr(p) }
+      result.map{ |p| Type.from_ptr(p, nil) }
     end
 
     def vararg?
-      C.LLVMIsFunctionVarArg(self)
+      C.is_function_var_arg(self) != 0
     end
   end