diff options
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/x86-setcc-int-to-fp-combine.ll | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 9d22dbdcb27..eef07d92f6d 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -2837,13 +2837,11 @@ SDValue SelectionDAG::getNode(unsigned Opcode, SDLoc DL, break; case ISD::UINT_TO_FP: case ISD::SINT_TO_FP: { + // Let the above scalar folding handle the folding of each element. SmallVector<SDValue, 8> Ops; for (int i = 0, e = VT.getVectorNumElements(); i != e; ++i) { SDValue OpN = BV->getOperand(i); - // Let the above scalar folding handle the conversion of each - // element. - OpN = getNode(ISD::SINT_TO_FP, DL, VT.getVectorElementType(), - OpN); + OpN = getNode(Opcode, DL, VT.getVectorElementType(), OpN); Ops.push_back(OpN); } return getNode(ISD::BUILD_VECTOR, DL, VT, Ops); diff --git a/llvm/test/CodeGen/X86/x86-setcc-int-to-fp-combine.ll b/llvm/test/CodeGen/X86/x86-setcc-int-to-fp-combine.ll index 4317d8ab6a2..a2c5b3a6eed 100644 --- a/llvm/test/CodeGen/X86/x86-setcc-int-to-fp-combine.ll +++ b/llvm/test/CodeGen/X86/x86-setcc-int-to-fp-combine.ll @@ -72,3 +72,18 @@ define <4 x float> @foo3(<4 x float> %val, <4 x float> %test) nounwind { %result = sitofp <4 x i32> %and to <4 x float> ret <4 x float> %result } + +; Test the general purpose constant folding of uint->fp. +define void @foo4(<4 x float>* noalias %result) nounwind { +; CHECK-LABEL: LCPI4_0: +; CHECK-NEXT: .long 1065353216 ## float 1.000000e+00 +; CHECK-NEXT: .long 1123942400 ## float 1.270000e+02 +; CHECK-NEXT: .long 1124073472 ## float 1.280000e+02 +; CHECK-NEXT: .long 1132396544 ## float 2.550000e+02 +; CHECK-LABEL: foo4: +; CHECK: movaps LCPI4_0(%rip), %xmm0 + + %val = uitofp <4 x i8> <i8 1, i8 127, i8 -128, i8 -1> to <4 x float> + store <4 x float> %val, <4 x float>* %result + ret void +} |
