From owner-svn-src-all@FreeBSD.ORG Wed May 23 21:37:40 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07B6A1065677; Wed, 23 May 2012 21:37:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B766E8FC15; Wed, 23 May 2012 21:37:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4NLbdun096759; Wed, 23 May 2012 21:37:39 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4NLbd1F096747; Wed, 23 May 2012 21:37:39 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201205232137.q4NLbd1F096747@svn.freebsd.org> From: Dimitry Andric Date: Wed, 23 May 2012 21:37:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235860 - in vendor/llvm/dist: . docs lib/ExecutionEngine/IntelJITEvents lib/ExecutionEngine/OProfileJIT tools/llvm-config utils/llvm-build/llvmbuild utils/unittest X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2012 21:37:40 -0000 Author: dim Date: Wed May 23 21:37:39 2012 New Revision: 235860 URL: http://svn.freebsd.org/changeset/base/235860 Log: Vendor import of llvm release_31 r156863 (the actual 3.1 release): http://llvm.org/svn/llvm-project/llvm/branches/release_31@156863 Modified: vendor/llvm/dist/CMakeLists.txt vendor/llvm/dist/Makefile.config.in vendor/llvm/dist/Makefile.rules vendor/llvm/dist/docs/LLVMBuild.html vendor/llvm/dist/docs/ReleaseNotes.html vendor/llvm/dist/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt vendor/llvm/dist/lib/ExecutionEngine/OProfileJIT/LLVMBuild.txt vendor/llvm/dist/tools/llvm-config/llvm-config.cpp vendor/llvm/dist/utils/llvm-build/llvmbuild/componentinfo.py vendor/llvm/dist/utils/llvm-build/llvmbuild/main.py vendor/llvm/dist/utils/unittest/LLVMBuild.txt Modified: vendor/llvm/dist/CMakeLists.txt ============================================================================== --- vendor/llvm/dist/CMakeLists.txt Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/CMakeLists.txt Wed May 23 21:37:39 2012 (r235860) @@ -268,11 +268,21 @@ set(LLVMCONFIGLIBRARYDEPENDENCIESINC "${LLVM_BINARY_DIR}/tools/llvm-config/LibraryDependencies.inc") set(LLVMBUILDCMAKEFRAG "${LLVM_BINARY_DIR}/LLVMBuild.cmake") + +# Create the list of optional components that are enabled +if (LLVM_USE_INTEL_JITEVENTS) + set(LLVMOPTIONALCOMPONENTS IntelJITEvents) +endif (LLVM_USE_INTEL_JITEVENTS) +if (LLVM_USE_OPROFILE) + set(LLVMOPTIONALCOMPONENTS ${LLVMOPTIONALCOMPONENTS} OProfileJIT) +endif (LLVM_USE_OPROFILE) + message(STATUS "Constructing LLVMBuild project information") execute_process( COMMAND ${PYTHON_EXECUTABLE} ${LLVMBUILDTOOL} --native-target "${LLVM_NATIVE_ARCH}" --enable-targets "${LLVM_TARGETS_TO_BUILD}" + --enable-optional-components "${LLVMOPTIONALCOMPONENTS}" --write-library-table ${LLVMCONFIGLIBRARYDEPENDENCIESINC} --write-cmake-fragment ${LLVMBUILDCMAKEFRAG} ERROR_VARIABLE LLVMBUILDOUTPUT Modified: vendor/llvm/dist/Makefile.config.in ============================================================================== --- vendor/llvm/dist/Makefile.config.in Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/Makefile.config.in Wed May 23 21:37:39 2012 (r235860) @@ -351,3 +351,10 @@ INTEL_JITEVENTS_LIBDIR := @INTEL_JITEVEN # Flags to control building support for OProfile JIT API USE_OPROFILE := @USE_OPROFILE@ + +ifeq ($(USE_INTEL_JITEVENTS), 1) + OPTIONAL_COMPONENTS += IntelJITEvents +endif +ifeq ($(USE_OPROFILE), 1) + OPTIONAL_COMPONENTS += OProfileJIT +endif Modified: vendor/llvm/dist/Makefile.rules ============================================================================== --- vendor/llvm/dist/Makefile.rules Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/Makefile.rules Wed May 23 21:37:39 2012 (r235860) @@ -100,6 +100,7 @@ $(LLVMBuildMakeFrag): $(PROJ_SRC_ROOT)/M $(Verb) $(LLVMBuildTool) \ --native-target "$(TARGET_NATIVE_ARCH)" \ --enable-targets "$(TARGETS_TO_BUILD)" \ + --enable-optional-components "$(OPTIONAL_COMPONENTS)" \ --write-library-table $(LLVMConfigLibraryDependenciesInc) \ --write-make-fragment $(LLVMBuildMakeFrag) Modified: vendor/llvm/dist/docs/LLVMBuild.html ============================================================================== --- vendor/llvm/dist/docs/LLVMBuild.html Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/docs/LLVMBuild.html Wed May 23 21:37:39 2012 (r235860) @@ -272,6 +272,11 @@ required_libraries = Archive BitReader C components. For example, the X86 target might define a library group for all of the X86 components. That library group might then be included in the all-targets library group.

+ +
  • installed [optional] [boolean] +

    Whether this library is installed. Libraries that are not installed + are only reported by llvm-config when it is run as part of a + development directory.

    • Modified: vendor/llvm/dist/docs/ReleaseNotes.html ============================================================================== --- vendor/llvm/dist/docs/ReleaseNotes.html Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/docs/ReleaseNotes.html Wed May 23 21:37:39 2012 (r235860) @@ -29,12 +29,6 @@

    Written by the LLVM Team

    -

    These are in-progress notes for the upcoming LLVM 3.1 -release.
    -You may prefer the -LLVM 3.0 -Release Notes.

    -

    Introduction @@ -74,9 +68,9 @@ Release Notes.

    The LLVM 3.1 distribution currently consists of code from the core LLVM repository (which roughly includes the LLVM optimizers, code generators and - supporting tools), and the Clang repository. In - addition to this code, the LLVM Project includes other sub-projects that are - in development. Here we include updates on these subprojects.

    + supporting tools), and the Clang repository. In addition to this code, the + LLVM Project includes other sub-projects that are in development. Here we + include updates on these subprojects.

    @@ -94,16 +88,22 @@ Release Notes.

    production-quality compiler for C, Objective-C, C++ and Objective-C++ on x86 (32- and 64-bit), and for Darwin/ARM targets.

    -

    In the LLVM 3.1 time-frame, the Clang team has made many improvements:

    +

    In the LLVM 3.1 time-frame, the Clang team has made many improvements. + Highlights include:

      -
    • C++11 support is greatly expanded including lambdas, initializer lists, constexpr, user-defined literals, and atomics.
      • -
    • ...
      • -
    - -

    For more details about the changes to Clang since the 2.9 release, see the -Clang release notes -

    - +
  • Greatly expanded C++11 + support including lambdas, initializer lists, constexpr, user-defined + literals, and atomics.
    • +
  • A new tooling + library to ease building of clang-based standalone tools.
    • +
  • Extended support for + literals in + Objective C.
    • + + +

    For more details about the changes to Clang since the 3.0 release, see the + Clang release + notes.

    If Clang rejects your code but another compiler accepts it, please take a look at the language @@ -118,6 +118,7 @@ Release Notes.

    +

    DragonEgg is a gcc plugin that replaces GCC's optimizers and code generators with LLVM's. It works with gcc-4.5 and gcc-4.6 @@ -128,8 +129,7 @@ Release Notes.

    The 3.1 release has the following notable changes:

    -
      - +
      • Partial support for gcc-4.7. Ada support is poor, but other languages work fairly well.
        • @@ -144,7 +144,6 @@ Release Notes. aliasing and type ranges to the LLVM optimizers.
      • A regression test-suite was added.
        • -
    @@ -165,7 +164,9 @@ Release Notes. implementations of this and other low-level routines (some are 3x faster than the equivalent libgcc routines).

    -

    ....

    +

    As of 3.1, compiler-rt includes the helper functions for atomic operations, + allowing atomic operations on arbitrary-sized quantities to work. These + functions follow the specification defined by gcc and are used by clang.

    @@ -176,12 +177,11 @@ Release Notes.
    -

    LLDB is a ground-up implementation of a command line debugger, as well as a - debugger API that can be used from other applications. LLDB makes use of the - Clang parser to provide high-fidelity expression parsing (particularly for - C++) and uses the LLVM JIT for target support.

    - -

    ...

    +

    LLDB is a ground-up implementation of a + command line debugger, as well as a debugger API that can be used from other + applications. LLDB makes use of the Clang parser to provide high-fidelity + expression parsing (particularly for C++) and uses the LLVM JIT for target + support.

    @@ -196,7 +196,16 @@ Release Notes. licensed under the MIT and UIUC license, allowing it to be used more permissively.

    -

    ...

    +

    Within the LLVM 3.1 time-frame there were the following highlights:

    + +
      +
    • The <atomic> header is now passing all tests, when + compiling with clang and linking against the support code from + compiler-rt.
      • +
    • FreeBSD now includes libc++ as part of the base system.
      • +
    • libc++ has been ported to Solaris and, in combination with libcxxrt and + clang, is working with a large body of existing code.
      • +
    @@ -207,16 +216,12 @@ Release Notes.
    -

    The VMKit project is an - implementation of a Java Virtual Machine (Java VM or JVM) that uses LLVM for - static and just-in-time compilation. - -

    In the LLVM 3.1 time-frame, VMKit has had significant improvements on both - runtime and startup performance:

    - -
      -
    • ...
      • -
    +

    The VMKit project is an implementation + of a Java Virtual Machine (Java VM or JVM) that uses LLVM for static and + just-in-time compilation.

    + +

    In the LLVM 3.1 time-frame, VMKit has had significant improvements on both + runtime and startup performance.

    @@ -228,25 +233,23 @@ Release Notes.
    -

    Polly is an experimental +

    Polly is an experimental optimizer for data locality and parallelism. It currently provides high-level loop optimizations and automatic parallelisation (using the OpenMP run time). Work in the area of automatic SIMD and accelerator code generation was - started. + started.

    -

    Within the LLVM 3.1 time-frame there were the following highlights:

    +

    Within the LLVM 3.1 time-frame there were the following highlights:

    -
      +
      • Polly became an official LLVM project
        • -
      • Polly can be loaded directly into clang (Enabled by '-O3 -mllvm -polly' - )
        • -
      • An automatic scheduling optimizer (derived from Pluto) was integrated. It - performs loop transformations to optimize for data-locality and parallelism. - The transformations include, but are not limited to interchange, fusion, - fission, skewing and tiling. -
        • -
      +
    • Polly can be loaded directly into clang (enabled by '-O3 -mllvm -polly')
      • +
    • An automatic scheduling optimizer (derived + from Pluto) was + integrated. It performs loop transformations to optimize for data-locality + and parallelism. The transformations include, but are not limited to + interchange, fusion, fission, skewing and tiling.
      • +
    @@ -264,21 +267,143 @@ Release Notes. a lot of other language and tools projects. This section lists some of the projects that have already been updated to work with LLVM 3.1.

    +

    Crack

    + +
    + +

    Crack aims to provide + the ease of development of a scripting language with the performance of a + compiled language. The language derives concepts from C++, Java and Python, + incorporating object-oriented programming, operator overloading and strong + typing.

    + +
    + +

    FAUST

    + +
    + +

    FAUST is a compiled language for + real-time audio signal processing. The name FAUST stands for Functional + AUdio STream. Its programming model combines two approaches: functional + programming and block diagram composition. In addition with the C, C++, Java, + JavaScript output formats, the Faust compiler can generate LLVM bitcode, and + works with LLVM 2.7-3.1.

    + +
    + +

    Glasgow Haskell Compiler (GHC)

    + +
    + +

    GHC is an open source compiler and + programming suite for Haskell, a lazy functional programming language. It + includes an optimizing static compiler generating good code for a variety of + platforms, together with an interactive system for convenient, quick + development.

    + +

    GHC 7.0 and onwards include an LLVM code generator, supporting LLVM 2.8 and + later.

    + +
    + +

    Julia

    + +
    + +

    Julia is a high-level, + high-performance dynamic language for technical computing. It provides a + sophisticated compiler, distributed parallel execution, numerical accuracy, + and an extensive mathematical function library. The compiler uses type + inference to generate fast code without any type declarations, and uses + LLVM's optimization passes and JIT compiler. The + Julia Language is designed + around multiple dispatch, giving programs a large degree of flexibility. It + is ready for use on many kinds of problems.

    + +
    + +

    LLVM D Compiler

    + +
    + +

    LLVM D Compiler (LDC) is + a compiler for the D programming Language. It is based on the DMD frontend + and uses LLVM as backend.

    + +
    + +

    Open Shading Language

    + +
    + +

    Open Shading + Language (OSL) is a small but rich language for programmable shading in + advanced global illumination renderers and other applications, ideal for + describing materials, lights, displacement, and pattern generation. It uses + LLVM to JIT complex shader networks to x86 code at runtime.

    + +

    OSL was developed by Sony Pictures Imageworks for use in its in-house + renderer used for feature film animation and visual effects, and is + distributed as open source software with the "New BSD" license.

    + +
    + +

    Portable OpenCL (pocl)

    + +
    + +

    In addition to producing an easily portable open source OpenCL + implementation, another major goal of + pocl is improving performance portability of OpenCL programs with + compiler optimizations, reducing the need for target-dependent manual + optimizations. An important part of pocl is a set of LLVM passes used to + statically parallelize multiple work-items with the kernel compiler, even in + the presence of work-group barriers. This enables static parallelization of + the fine-grained static concurrency in the work groups in multiple ways + (SIMD, VLIW, superscalar,...).

    + +
    +

    Pure

    -

    Pure (http://pure-lang.googlecode.com/) is an algebraic/functional -programming language based on term rewriting. Programs are collections of -equations which are used to evaluate expressions in a symbolic fashion. The -interpreter uses LLVM as a backend to JIT-compile Pure programs to fast native -code. Pure offers dynamic typing, eager and lazy evaluation, lexical closures, a -hygienic macro system (also based on term rewriting), built-in list and matrix -support (including list and matrix comprehensions) and an easy-to-use interface -to C and other programming languages (including the ability to load LLVM bitcode -modules, and inline C, C++, Fortran and Faust code in Pure programs if the -corresponding LLVM-enabled compilers are installed).

    +
    + +

    Pure is an + algebraic/functional programming language based on term rewriting. Programs + are collections of equations which are used to evaluate expressions in a + symbolic fashion. The interpreter uses LLVM as a backend to JIT-compile Pure + programs to fast native code. Pure offers dynamic typing, eager and lazy + evaluation, lexical closures, a hygienic macro system (also based on term + rewriting), built-in list and matrix support (including list and matrix + comprehensions) and an easy-to-use interface to C and other programming + languages (including the ability to load LLVM bitcode modules, and inline C, + C++, Fortran and Faust code in Pure programs if the corresponding + LLVM-enabled compilers are installed).

    Pure version 0.54 has been tested and is known to work with LLVM 3.1 (and -continues to work with older LLVM releases >= 2.5).

    + continues to work with older LLVM releases >= 2.5).

    + +
    + +

    TTA-based Co-design Environment (TCE)

    + +
    + +

    TCE is a toolset for designing + application-specific processors (ASP) based on the Transport triggered + architecture (TTA). The toolset provides a complete co-design flow from C/C++ + programs down to synthesizable VHDL/Verilog and parallel program binaries. + Processor customization points include the register files, function units, + supported operations, and the interconnection network.

    + +

    TCE uses Clang and LLVM for C/C++ language support, target independent + optimizations and also for parts of code generation. It generates new + LLVM-based code generators "on the fly" for the designed TTA processors and + loads them in to the compiler backend as runtime libraries to avoid + per-target recompilation of larger parts of the compiler chain.

    + +
    @@ -329,7 +454,6 @@ continues to work with older LLVM releas A full featured assembler and direct-to-object support for ARM.
  • Basic Block Placement Probability driven basic block placement.
    • -
  • ....
    • @@ -345,18 +469,22 @@ continues to work with older LLVM releas

    LLVM IR has several new features for better support of new targets and that expose new optimization opportunities:

    -
      -
    • IR support for half float
      • -
    • IR support for vectors of pointers, including vector GEPs.
      • -
    • Module flags have been introduced. They convey information about the - module as a whole to LLVM subsystems.
      • -
    • Loads can now have range metadata attached to them to describe the - possible values being loaded.
      • -
    • Inline cost heuristics have been completely overhauled and now closely - model constant propagation through call sites, disregard trivially dead - code costs, and can model C++ STL iterator patterns.
      • -
    • ....
      • -
    +
      +
    • A new type representing 16 bit half floating point values has + been added.
      • +
    • IR now supports vectors of pointers, including vector GEPs.
      • +
    • Module flags have been introduced. They convey information about the + module as a whole to LLVM subsystems. This is currently used to encode + Objective C ABI information.
      • +
    • Loads can now have range metadata attached to them to describe the + possible values being loaded.
      • +
    • The llvm.ctlz and llvm.cttz intrinsics now have an + additional argument which indicates whether the behavior of the intrinsic + is undefined on a zero input. This can be used to generate more efficient + code on platforms that only have instructions which don't return the type + size when counting bits in 0.
      • +
    + @@ -379,7 +507,9 @@ continues to work with older LLVM releas post-vectorization cleanup passes. For more information, see the EuroLLVM 2012 slides: Autovectorization with LLVM. -
  • ....
    • +
  • Inline cost heuristics have been completely overhauled and now closely + model constant propagation through call sites, disregard trivially dead + code costs, and can model C++ STL iterator patterns.
    • @@ -399,7 +529,9 @@ continues to work with older LLVM releas to the LLVM MC Project Blog Post.

      -
    • ....
      • +
    • The integrated assembler can optionally emit debug information when + assembling a .s file. It can be enabled by passing the + -g option to llvm-mc.
    @@ -436,6 +568,9 @@ continues to work with older LLVM releas representation of large clobber lists on call instructions. The register mask operand references a bit mask of preserved registers. Everything else is clobbered. +
  • The DWARF debug info writer gained support for emitting data for the + name accelerator tables + DWARF extension. It is used by LLDB to speed up name lookup.

    • We added new TableGen infrastructure to support bundling for @@ -469,13 +604,14 @@ static heuristics as well as source code

    New features and major changes in the X86 target include:

      -
    • Bug fixes and improved support for AVX1
      • -
    • Support for AVX2 (still incomplete at this point)
      • +
    • Greatly improved support for AVX2.
      • +
    • Lots of bug fixes and improvements for AVX1.
      • +
    • Support for the FMA4 and XOP instruction set extensions.
    • Call instructions use the new register mask operands for faster compile times and better support for different calling conventions. The old WINCALL instructions are no longer needed.
    • DW2 Exception Handling is enabled on Cygwin and MinGW.
      • -
    • Support for implicit TLS model used with MS VC runtime
      • +
    • Support for implicit TLS model used with MSVC runtime.
    @@ -520,28 +656,47 @@ syntax, there are still significant gaps
    - -

    This release has seen major new work on just about every aspect of the MIPS - backend. Some of the major new features include:

    +New features and major changes in the MIPS target include:

      -
    • ....
      • +
    • MIPS32 little-endian direct object code emission is functional.
      • +
    • MIPS64 little-endian code generation is largely functional for N64 ABI in assembly printing mode with the exception of handling of long double (f128) type.
      • +
    • Support for new instructions has been added, which includes swap-bytes + instructions (WSBH and DSBH), floating point multiply-add/subtract and + negative multiply-add/subtract instructions, and floating + point load/store instructions with reg+reg addressing (LWXC1, etc.)
      • +
    • Various fixes to improve performance have been implemented.
      • +
    • Post-RA scheduling is now enabled at -O3.
      • +
    • Support for soft-float code generation has been added.
      • +
    • clang driver's support for MIPS 64-bits targets.
      • +
    • Support for MIPS floating point ABI option in clang driver.

    -Other Target Specific Improvements +PTX Target Improvements

    -

    Support for Qualcomm's Hexagon VLIW processor has been added.

    +

    An outstanding conditional inversion bug was fixed in this release.

    -
      -
    • ....
      • +

      NOTE: LLVM 3.1 marks the last release of the PTX back-end, in its + current form. The back-end is currently being replaced by the NVPTX + back-end, currently in SVN ToT.

      + +
    + + +

    +Other Target Specific Improvements +

    +
    +
      +
    • Support for Qualcomm's Hexagon VLIW processor has been added.
    @@ -558,6 +713,12 @@ syntax, there are still significant gaps from the previous release.

      +
    • LLVM's build system now requires a python 2 interpreter to be present at + build time. A perl interpreter is no longer required.
      • +
    • The C backend has been removed. It had numerous problems, to the point of + not being able to compile any nontrivial program.
      • +
    • The Alpha, Blackfin and SystemZ targets have been removed due to lack of + maintenance.
    • LLVM 3.1 removes support for reading LLVM 2.9 bitcode files. Going forward, we aim for all future versions of LLVM to read bitcode files and .ll files produced by LLVM 3.0 and later.
      • @@ -567,7 +728,6 @@ syntax, there are still significant gaps
    • LLVM 3.0 and earlier automatically added the returns_twice fo functions like setjmp based on the name. This functionality was removed in 3.1. This affects Clang users, if -ffreestanding is used.
      • -
    • ....
    @@ -614,9 +774,9 @@ syntax, there are still significant gaps
  • llvm::getTrapFunctionName()
  • llvm::EnableSegmentedStacks
    • -
  • The MDBuilder class has been added to simplify the creation of - metadata.
    • -
  • ....
    • + +
  • The MDBuilder class has been added to simplify the creation + of metadata.
    • @@ -633,16 +793,37 @@ syntax, there are still significant gaps
      -
    • llvm-stress is a command line tool for generating random .ll files to fuzz - different LLVM components.
      • -
    • llvm-ld has been removed. Use llvm-link or Clang instead.
      • -
    • ....
      • +
    • llvm-stress is a command line tool for generating random + .ll files to fuzz different LLVM components.
      • +
    • The llvm-ld tool has been removed. The clang driver provides a + more reliable solution for turning a set of bitcode files into a binary. + To merge bitcode files llvm-link can be used instead.
    + + + + +

    +Python Bindings +

    + +
    + +

    Officially supported Python bindings have been added! Feature support is far +from complete. The current bindings support interfaces to:

      -
    • ....
      • +
    • Object File Interface
      • +
    • Disassembler
    +

    Using the Object File Interface, it is possible to inspect binary object files. +Think of it as a Python version of readelf or llvm-objdump.

    + +

    Support for additional features is currently being developed by community +contributors. If you are interested in shaping the direction of the Python +bindings, please express your intent on IRC or the developers list.

    +
    @@ -667,18 +848,13 @@ syntax, there are still significant gaps

    Known problem areas include:

      -
    • The Alpha, Blackfin, CellSPU, MSP430, PTX, SystemZ and - XCore backends are experimental, and the Alpha, Blackfin and SystemZ - targets have already been removed from mainline.
      • +
    • The CellSPU, MSP430, PTX and XCore backends are experimental.
    • The integrated assembler, disassembler, and JIT is not supported by several targets. If an integrated assembler is not supported, then a system assembler is required. For more details, see the Target Features Matrix.
      • - -
    • The C backend has numerous problems and is not being actively maintained. - Depending on it for anything serious is not advised.
    @@ -714,7 +890,7 @@ syntax, there are still significant gaps src="http://www.w3.org/Icons/valid-html401-blue" alt="Valid HTML 4.01"> LLVM Compiler Infrastructure
    - Last modified: $Date: 2012-05-13 12:04:01 +0200 (Sun, 13 May 2012) $ + Last modified: $Date: 2012-05-15 23:58:06 +0200 (Tue, 15 May 2012) $ Modified: vendor/llvm/dist/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt ============================================================================== --- vendor/llvm/dist/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt Wed May 23 21:37:39 2012 (r235860) @@ -18,6 +18,6 @@ [common] [component_0] -type = Library +type = OptionalLibrary name = IntelJITEvents parent = ExecutionEngine Modified: vendor/llvm/dist/lib/ExecutionEngine/OProfileJIT/LLVMBuild.txt ============================================================================== --- vendor/llvm/dist/lib/ExecutionEngine/OProfileJIT/LLVMBuild.txt Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/lib/ExecutionEngine/OProfileJIT/LLVMBuild.txt Wed May 23 21:37:39 2012 (r235860) @@ -18,6 +18,6 @@ [common] [component_0] -type = Library +type = OptionalLibrary name = OProfileJIT parent = ExecutionEngine Modified: vendor/llvm/dist/tools/llvm-config/llvm-config.cpp ============================================================================== --- vendor/llvm/dist/tools/llvm-config/llvm-config.cpp Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/tools/llvm-config/llvm-config.cpp Wed May 23 21:37:39 2012 (r235860) @@ -54,7 +54,8 @@ using namespace llvm; static void VisitComponent(StringRef Name, const StringMap &ComponentMap, std::set &VisitedComponents, - std::vector &RequiredLibs) { + std::vector &RequiredLibs, + bool IncludeNonInstalled) { // Lookup the component. AvailableComponent *AC = ComponentMap.lookup(Name); assert(AC && "Invalid component name!"); @@ -65,10 +66,14 @@ static void VisitComponent(StringRef Nam return; } + // Only include non-installed components if requested. + if (!AC->IsInstalled && !IncludeNonInstalled) + return; + // Otherwise, visit all the dependencies. for (unsigned i = 0; AC->RequiredLibraries[i]; ++i) { VisitComponent(AC->RequiredLibraries[i], ComponentMap, VisitedComponents, - RequiredLibs); + RequiredLibs, IncludeNonInstalled); } // Add to the required library list. @@ -83,8 +88,11 @@ static void VisitComponent(StringRef Nam /// \param Components - The names of the components to find libraries for. /// \param RequiredLibs [out] - On return, the ordered list of libraries that /// are required to link the given components. +/// \param IncludeNonInstalled - Whether non-installed components should be +/// reported. void ComputeLibsForComponents(const std::vector &Components, - std::vector &RequiredLibs) { + std::vector &RequiredLibs, + bool IncludeNonInstalled) { std::set VisitedComponents; // Build a map of component names to information. @@ -107,7 +115,7 @@ void ComputeLibsForComponents(const std: } VisitComponent(ComponentLower, ComponentMap, VisitedComponents, - RequiredLibs); + RequiredLibs, IncludeNonInstalled); } // The list is now ordered with leafs first, we want the libraries to printed @@ -278,6 +286,10 @@ int main(int argc, char **argv) { PrintLibFiles = true; } else if (Arg == "--components") { for (unsigned j = 0; j != array_lengthof(AvailableComponents); ++j) { + // Only include non-installed components when in a development tree. + if (!AvailableComponents[j].IsInstalled && !IsInDevelopmentTree) + continue; + OS << ' '; OS << AvailableComponents[j].Name; } @@ -310,7 +322,8 @@ int main(int argc, char **argv) { // Construct the list of all the required libraries. std::vector RequiredLibs; - ComputeLibsForComponents(Components, RequiredLibs); + ComputeLibsForComponents(Components, RequiredLibs, + /*IncludeNonInstalled=*/IsInDevelopmentTree); for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) { StringRef Lib = RequiredLibs[i]; Modified: vendor/llvm/dist/utils/llvm-build/llvmbuild/componentinfo.py ============================================================================== --- vendor/llvm/dist/utils/llvm-build/llvmbuild/componentinfo.py Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/utils/llvm-build/llvmbuild/componentinfo.py Wed May 23 21:37:39 2012 (r235860) @@ -68,6 +68,21 @@ class ComponentInfo(object): def get_llvmbuild_fragment(self): abstract + def get_parent_target_group(self): + """get_parent_target_group() -> ComponentInfo or None + + Return the nearest parent target group (if any), or None if the + component is not part of any target group. + """ + + # If this is a target group, return it. + if self.type_name == 'TargetGroup': + return self + + # Otherwise recurse on the parent, if any. + if self.parent_instance: + return self.parent_instance.get_parent_target_group() + class GroupComponentInfo(ComponentInfo): """ Group components have no semantics as far as the build system are concerned, @@ -95,16 +110,22 @@ class LibraryComponentInfo(ComponentInfo type_name = 'Library' @staticmethod - def parse(subpath, items): + def parse_items(items): kwargs = ComponentInfo.parse_items(items) kwargs['library_name'] = items.get_optional_string('library_name') kwargs['required_libraries'] = items.get_list('required_libraries') kwargs['add_to_library_groups'] = items.get_list( 'add_to_library_groups') + kwargs['installed'] = items.get_optional_bool('installed', True) + return kwargs + + @staticmethod + def parse(subpath, items): + kwargs = LibraryComponentInfo.parse_items(items) return LibraryComponentInfo(subpath, **kwargs) def __init__(self, subpath, name, dependencies, parent, library_name, - required_libraries, add_to_library_groups): + required_libraries, add_to_library_groups, installed): ComponentInfo.__init__(self, subpath, name, dependencies, parent) # If given, the name to use for the library instead of deriving it from @@ -119,6 +140,9 @@ class LibraryComponentInfo(ComponentInfo # considered part of. self.add_to_library_groups = list(add_to_library_groups) + # Whether or not this library is installed. + self.installed = installed + def get_component_references(self): for r in ComponentInfo.get_component_references(self): yield r @@ -140,6 +164,8 @@ class LibraryComponentInfo(ComponentInfo if self.add_to_library_groups: print >>result, 'add_to_library_groups = %s' % ' '.join( self.add_to_library_groups) + if not self.installed: + print >>result, 'installed = 0' return result.getvalue() def get_library_name(self): @@ -165,6 +191,20 @@ class LibraryComponentInfo(ComponentInfo def get_llvmconfig_component_name(self): return self.get_library_name().lower() +class OptionalLibraryComponentInfo(LibraryComponentInfo): + type_name = "OptionalLibrary" + + @staticmethod + def parse(subpath, items): + kwargs = LibraryComponentInfo.parse_items(items) + return OptionalLibraryComponentInfo(subpath, **kwargs) + + def __init__(self, subpath, name, dependencies, parent, library_name, + required_libraries, add_to_library_groups, installed): + LibraryComponentInfo.__init__(self, subpath, name, dependencies, parent, + library_name, required_libraries, + add_to_library_groups, installed) + class LibraryGroupComponentInfo(ComponentInfo): type_name = 'LibraryGroup' @@ -375,7 +415,7 @@ _component_type_map = dict( for t in (GroupComponentInfo, LibraryComponentInfo, LibraryGroupComponentInfo, ToolComponentInfo, BuildToolComponentInfo, - TargetGroupComponentInfo)) + TargetGroupComponentInfo, OptionalLibraryComponentInfo)) def load_from_path(path, subpath): # Load the LLVMBuild.txt file as an .ini format file. parser = ConfigParser.RawConfigParser() Modified: vendor/llvm/dist/utils/llvm-build/llvmbuild/main.py ============================================================================== --- vendor/llvm/dist/utils/llvm-build/llvmbuild/main.py Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/utils/llvm-build/llvmbuild/main.py Wed May 23 21:37:39 2012 (r235860) @@ -312,15 +312,26 @@ subdirectories = %s f.close() - def write_library_table(self, output_path): + def write_library_table(self, output_path, enabled_optional_components): # Write out the mapping from component names to required libraries. # # We do this in topological order so that we know we can append the # dependencies for added library groups. entries = {} for c in self.ordered_component_infos: + # Skip optional components which are not enabled. + if c.type_name == 'OptionalLibrary' \ + and c.name not in enabled_optional_components: + continue + + # Skip target groups which are not enabled. + tg = c.get_parent_target_group() + if tg and not tg.enabled: + continue + # Only certain components are in the table. - if c.type_name not in ('Library', 'LibraryGroup', 'TargetGroup'): + if c.type_name not in ('Library', 'OptionalLibrary', \ + 'LibraryGroup', 'TargetGroup'): continue # Compute the llvm-config "component name". For historical reasons, @@ -328,10 +339,12 @@ subdirectories = %s llvmconfig_component_name = c.get_llvmconfig_component_name() # Get the library name, or None for LibraryGroups. - if c.type_name == 'Library': + if c.type_name == 'Library' or c.type_name == 'OptionalLibrary': library_name = c.get_prefixed_library_name() + is_installed = c.installed else: library_name = None + is_installed = True # Get the component names of all the required libraries. required_llvmconfig_component_names = [ @@ -344,7 +357,8 @@ subdirectories = %s # Add the entry. entries[c.name] = (llvmconfig_component_name, library_name, - required_llvmconfig_component_names) + required_llvmconfig_component_names, + is_installed) # Convert to a list of entries and sort by name. entries = entries.values() @@ -352,16 +366,16 @@ subdirectories = %s # Create an 'all' pseudo component. We keep the dependency list small by # only listing entries that have no other dependents. root_entries = set(e[0] for e in entries) - for _,_,deps in entries: + for _,_,deps,_ in entries: root_entries -= set(deps) - entries.append(('all', None, root_entries)) + entries.append(('all', None, root_entries, True)) entries.sort() # Compute the maximum number of required libraries, plus one so there is # always a sentinel. max_required_libraries = max(len(deps) - for _,_,deps in entries) + 1 + for _,_,deps,_ in entries) + 1 # Write out the library table. make_install_dir(os.path.dirname(output_path)) @@ -382,18 +396,21 @@ subdirectories = %s print >>f, ' /// The name of the library for this component (or NULL).' print >>f, ' const char *Library;' print >>f, '' + print >>f, ' /// Whether the component is installed.' + print >>f, ' bool IsInstalled;' + print >>f, '' print >>f, '\ /// The list of libraries required when linking this component.' print >>f, ' const char *RequiredLibraries[%d];' % ( max_required_libraries) print >>f, '} AvailableComponents[%d] = {' % len(entries) - for name,library_name,required_names in entries: + for name,library_name,required_names,is_installed in entries: if library_name is None: library_name_as_cstr = '0' else: library_name_as_cstr = '"lib%s.a"' % library_name - print >>f, ' { "%s", %s, { %s } },' % ( - name, library_name_as_cstr, + print >>f, ' { "%s", %s, %d, { %s } },' % ( + name, library_name_as_cstr, is_installed, ', '.join('"%s"' % dep for dep in required_names)) print >>f, '};' @@ -778,6 +795,11 @@ given by --build-root) at the same SUBPA help=("Enable the given space or semi-colon separated " "list of targets, or all targets if not present"), action="store", default=None) + group.add_option("", "--enable-optional-components", + dest="optional_components", metavar="NAMES", + help=("Enable the given space or semi-colon separated " + "list of optional components"), + action="store", default=None) parser.add_option_group(group) (opts, args) = parser.parse_args() @@ -819,7 +841,8 @@ given by --build-root) at the same SUBPA # Write out the required library table, if requested. if opts.write_library_table: - project_info.write_library_table(opts.write_library_table) + project_info.write_library_table(opts.write_library_table, + opts.optional_components) # Write out the make fragment, if requested. if opts.write_make_fragment: Modified: vendor/llvm/dist/utils/unittest/LLVMBuild.txt ============================================================================== --- vendor/llvm/dist/utils/unittest/LLVMBuild.txt Wed May 23 21:07:01 2012 (r235859) +++ vendor/llvm/dist/utils/unittest/LLVMBuild.txt Wed May 23 21:37:39 2012 (r235860) @@ -20,9 +20,11 @@ type = Library name = gtest parent = Libraries required_libraries = Support +installed = 0 [component_1] type = Library name = gtest_main parent = Libraries required_libraries = gtest +installed = 0