Skip to content

Commit

Permalink
Auto merge of #84654 - alexcrichton:update-llvm-, r=cuviper
Browse files Browse the repository at this point in the history 
Update LLVM for more wasm simd updates

This fixes the temporary regression introduced in #84339 where the wasm
target uses `fpto{s,u}i` intrinsics but the codegen for those intrinsics
with the `+nontrapping-fptoint` LLVM feature wasn't very good (aka it
didn't use the wasm instruction). The fixes brought in here fix that and
also implement the second-to-last simd instruction in LLVM.
  • Loading branch information
@bors
bors committed Apr 30, 2021
2 parents 7506228 + eadcbb5 commit 8fef006
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion src/llvm-project
Submodule llvm-project updated 26 files
+0 −7 clang/include/clang/Basic/BuiltinsWebAssembly.def
+20 −50 clang/lib/CodeGen/CGBuiltin.cpp
+24 −58 clang/test/CodeGen/builtins-wasm.c
+7 −4 llvm/include/llvm/IR/DerivedTypes.h
+0 −43 llvm/include/llvm/IR/IntrinsicsWebAssembly.td
+5 −0 llvm/include/llvm/IR/Type.h
+4 −20 llvm/lib/Analysis/ConstantFolding.cpp
+4 −0 llvm/lib/Target/WebAssembly/WebAssemblyISD.def
+214 −10 llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp
+1 −0 llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.h
+9 −17 llvm/lib/Target/WebAssembly/WebAssemblyInstrConv.td
+61 −40 llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td
+2 −0 llvm/lib/Transforms/IPO/ConstantMerge.cpp
+5 −10 llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
+60 −17 llvm/test/CodeGen/WebAssembly/conv.ll
+16 −0 llvm/test/CodeGen/WebAssembly/simd-build-vector.ll
+79 −0 llvm/test/CodeGen/WebAssembly/simd-concat.ll
+22 −0 llvm/test/CodeGen/WebAssembly/simd-conversions.ll
+52 −0 llvm/test/CodeGen/WebAssembly/simd-extending.ll
+40 −96 llvm/test/CodeGen/WebAssembly/simd-intrinsics.ll
+12 −12 llvm/test/CodeGen/WebAssembly/simd-reductions.ll
+0 −64 llvm/test/CodeGen/WebAssembly/simd-unsupported.ll
+1 −2 llvm/test/MC/Disassembler/WebAssembly/wasm.txt
+4 −2 llvm/test/MC/WebAssembly/simd-encodings.s
+12 −0 llvm/test/Transforms/ConstantMerge/dont-merge.ll
+0 −610 llvm/test/Transforms/InstSimplify/ConstProp/WebAssembly/trunc_saturate.ll
2 changes: 0 additions & 2 deletions src/test/ui/asm/sym.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// min-llvm-version: 10.0.1
// FIXME(#84025): codegen-units=1 leads to linkage errors
// compile-flags: -C codegen-units=2
// only-x86_64
// only-linux
// run-pass
Expand Down

0 comments on commit 8fef006

Please sign in to comment.