Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc: Upgrade to LLVM 6 #47828

Merged
merged 1 commit into from
Feb 10, 2018
Merged

rustc: Upgrade to LLVM 6 #47828

merged 1 commit into from
Feb 10, 2018

Commits on Feb 10, 2018

  1. rustc: Upgrade to LLVM 6

    The following submodules have been updated for a new version of LLVM:
    
    - `src/llvm`
    - `src/libcompiler_builtins` - transitively contains compiler-rt
    - `src/dlmalloc`
    
    This also updates the docker container for dist-i686-freebsd as the old 16.04
    container is no longer capable of building LLVM. The
    compiler-rt/compiler-builtins and dlmalloc updates are pretty routine without
    much interesting happening, but the LLVM update here is of particular note.
    Unlike previous updates I haven't cherry-picked all existing patches we had on
    top of our LLVM branch as we have a [huge amount][patches4] and have at this
    point forgotten what most of them are for. Instead I started from the current
    `release_60` branch in LLVM and only applied patches that were necessary to get
    our tests working and building.
    
    The current set of custom rustc-specific patches included in this LLVM update are:
    
    * rust-lang/llvm@1187443 - this is how we actually implement
      `cfg(target_feature)` for now and continues to not be upstreamed. While a
      hazard for SIMD stabilization this commit is otherwise keeping the status
      quo of a small rustc-specific feature.
    * rust-lang/llvm@013f2ec - this is a rustc-specific optimization that we haven't
      upstreamed, notably teaching LLVM about our allocation-related routines (which
      aren't malloc/free). Once we stabilize the global allocator routines we will
      likely want to upstream this patch, but for now it seems reasonable to keep it
      on our fork.
    * rust-lang/llvm@a65bbfd - I found this necessary to fix compilation of LLVM in
      our 32-bit linux container. I'm not really sure why it's necessary but my
      guess is that it's because of the absolutely ancient glibc that we're using.
      In any case it's only updating pieces we're not actually using in LLVM so I'm
      hoping it'll turn out alright. This doesn't seem like something we'll want to
      upstream.c
    * rust-lang/llvm@77ab1f0 - this is what's actually enabling LLVM to build in our
      i686-freebsd container, I'm not really sure what's going on but we for sure
      probably don't want to upstream this and otherwise it seems not too bad for
      now at least.
    * rust-lang/llvm@9eb9267 - we currently suffer on MSVC from an [upstream bug]
      which although diagnosed to a particular revision isn't currently fixed
      upstream (and the bug itself doesn't seem too active). This commit is a
      partial revert of the suspected cause of this regression (found via a
      bisection). I'm sort of hoping that this eventually gets fixed upstream with a
      similar fix (which we can replace in our branch), but for now I'm also hoping
      it's a relatively harmless change to have.
    
    After applying these patches (plus one [backport] which should be [backported
    upstream][llvm-back]) I believe we should have all tests working on all
    platforms in our current test suite. I'm like 99% sure that we'll need some more
    backports as issues are reported for LLVM 6 when this propagates through
    nightlies, but that's sort of just par for the course nowadays!
    
    In any case though some extra scrutiny of the patches here would definitely be
    welcome, along with scrutiny of the "missing patches" like a [change to pass
    manager order](rust-lang/llvm@27174447533), [another change to pass manager
    order](rust-lang/llvm@c782febb7b9), some [compile fixes for
    sparc](rust-lang/llvm@1a83de63c42), and some [fixes for
    solaris](rust-lang/llvm@c2bfe0abb).
    
    [patches4]: rust-lang/llvm@5401fdf...rust-llvm-release-4-0-1
    [backport]: rust-lang/llvm@5c54c252db
    [llvm-back]: https://bugs.llvm.org/show_bug.cgi?id=36114
    [upstream bug]: https://bugs.llvm.org/show_bug.cgi?id=36096
    
    ---
    
    The update to LLVM 6 is desirable for a number of reasons, notably:
    
    * This'll allow us to keep up with the upstream wasm backend, picking up new
      features as they start landing.
    * Upstream LLVM has fixed a number of SIMD-related compilation errors,
      especially around AVX-512 and such.
    * There's a few assorted known bugs which are fixed in LLVM 5 and aren't fixed
      in the LLVM 4 branch we're using.
    * Overall it's not a great idea to stagnate with our codegen backend!
    
    This update is mostly powered by rust-lang#47730 which is allowing us to update LLVM
    *independent* of the version of LLVM that Emscripten is locked to. This means
    that when compiling code for Emscripten we'll still be using the old LLVM 4
    backend, but when compiling code for any other target we'll be using the new
    LLVM 6 target. Once Emscripten updates we may no longer need this distinction,
    but we're not sure when that will happen!
    
    Closes rust-lang#43370
    Closes rust-lang#43418
    Closes rust-lang#47015
    Closes rust-lang#47683
    Closes rust-lang/stdarch#157
    Closes rust-lang-nursery/rust-wasm#3
    alexcrichton committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    6b7b6b6 View commit details
    Browse the repository at this point in the history