diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-11-26 11:16:52 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-11-26 11:16:52 +0000 |
| commit | 876f8f123e9a52bf8e970f9e04b93700380b5dbf (patch) | |
| tree | 99341579c7ea1e51de0faa8d1482ad271a3c0109 | |
| parent | 1184bebd31edac189a2c129ba93795b66cf4876d (diff) | |
| download | llvm-876f8f123e9a52bf8e970f9e04b93700380b5dbf.tar.gz llvm-876f8f123e9a52bf8e970f9e04b93700380b5dbf.tar.bz2 llvm-876f8f123e9a52bf8e970f9e04b93700380b5dbf.tar.xz | |
Merging r195444:
------------------------------------------------------------------------
r195444 | dsanders | 2013-11-22 03:24:50 -0800 (Fri, 22 Nov 2013) | 4 lines
[mips][msa] Float vector constants cannot use ldi.[wd] directly. Bitcast from the appropriate integer vector type.
Fixes an instruction selection failure detected by llvm-stress.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@195742 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/Mips/MipsSEISelLowering.cpp | 4 | ||||
| -rw-r--r-- | test/CodeGen/Mips/msa/llvm-stress-s2501752154-simplified.ll | 27 |
2 files changed, 30 insertions, 1 deletions
diff --git a/lib/Target/Mips/MipsSEISelLowering.cpp b/lib/Target/Mips/MipsSEISelLowering.cpp index 27d7515c40..c02c235eb7 100644 --- a/lib/Target/Mips/MipsSEISelLowering.cpp +++ b/lib/Target/Mips/MipsSEISelLowering.cpp @@ -2210,7 +2210,9 @@ SDValue MipsSETargetLowering::lowerBUILD_VECTOR(SDValue Op, return SDValue(); // If the value fits into a simm10 then we can use ldi.[bhwd] - if (SplatValue.isSignedIntN(10)) + // However, if it isn't an integer type we will have to bitcast from an + // integer type first. + if (ResTy.isInteger() && SplatValue.isSignedIntN(10)) return Op; EVT ViaVecTy; diff --git a/test/CodeGen/Mips/msa/llvm-stress-s2501752154-simplified.ll b/test/CodeGen/Mips/msa/llvm-stress-s2501752154-simplified.ll new file mode 100644 index 0000000000..564ad7436d --- /dev/null +++ b/test/CodeGen/Mips/msa/llvm-stress-s2501752154-simplified.ll @@ -0,0 +1,27 @@ +; RUN: llc -march=mips < %s +; RUN: llc -march=mips -mattr=+msa,+fp64 < %s +; RUN: llc -march=mipsel < %s +; RUN: llc -march=mipsel -mattr=+msa,+fp64 < %s + +; This test originally failed for MSA with a "Cannot select ..." error. +; This happened because the legalizer treated undef's in the <4 x float> +; constant as equivalent to the defined elements when checking if it a constant +; splat, but then proceeded to legalize the undef's to zero, leaving it as a +; non-splat that cannot be selected. It should have eliminated the undef's by +; rewriting the splat constant. + +; It should at least successfully build. + +define void @autogen_SD2501752154() { +BB: + %BC = bitcast <4 x i32> <i32 -1, i32 -1, i32 undef, i32 undef> to <4 x float> + br label %CF74 + +CF74: ; preds = %CF74, %CF + %E54 = extractelement <1 x i1> undef, i32 0 + br i1 %E54, label %CF74, label %CF79 + +CF79: ; preds = %CF75 + %I63 = insertelement <4 x float> %BC, float undef, i32 0 + ret void +} |