From: Sanjay Patel Date: Sat, 25 May 2019 13:48:07 +0000 (+0000) Subject: [SelectionDAG] soften assertion when legalizing narrow vector FP ops X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b57a73f6e6d0bbf1fbffe2f711d1bf70afda00c;p=llvm [SelectionDAG] soften assertion when legalizing narrow vector FP ops The test based on PR42010: https://bugs.llvm.org/show_bug.cgi?id=42010 ...may show an inaccuracy for PPC's target defs, but we should not be so aggressive with an assert here. There's no telling what out-of-tree targets look like. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361696 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp b/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp index 8570f57616e..379ee00c90f 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp @@ -2743,13 +2743,11 @@ void DAGTypeLegalizer::WidenVectorResult(SDNode *N, unsigned ResNo) { // We're going to widen this vector op to a legal type by padding with undef // elements. If the wide vector op is eventually going to be expanded to // scalar libcalls, then unroll into scalar ops now to avoid unnecessary - // libcalls on the undef elements. We are assuming that if the scalar op - // requires expanding, then the vector op needs expanding too. + // libcalls on the undef elements. EVT VT = N->getValueType(0); - if (TLI.isOperationExpand(N->getOpcode(), VT.getScalarType())) { - EVT WideVecVT = TLI.getTypeToTransformTo(*DAG.getContext(), VT); - assert(!TLI.isOperationLegalOrCustom(N->getOpcode(), WideVecVT) && - "Target supports vector op, but scalar requires expansion?"); + EVT WideVecVT = TLI.getTypeToTransformTo(*DAG.getContext(), VT); + if (!TLI.isOperationLegalOrCustom(N->getOpcode(), WideVecVT) && + TLI.isOperationExpand(N->getOpcode(), VT.getScalarType())) { Res = DAG.UnrollVectorOp(N, WideVecVT.getVectorNumElements()); break; } diff --git a/test/CodeGen/PowerPC/ftrunc-legalize.ll b/test/CodeGen/PowerPC/ftrunc-legalize.ll new file mode 100644 index 00000000000..4c27ad4c434 --- /dev/null +++ b/test/CodeGen/PowerPC/ftrunc-legalize.ll @@ -0,0 +1,24 @@ +; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py +; RUN: llc -mtriple=powerpc64-- -mattr=altivec -verify-machineinstrs < %s | FileCheck %s + +; This would assert because the widened vector op is +; legal/custom, but the scalar op is expanded. + +define i32 @PR42010(<2 x float> %x) { +; CHECK-LABEL: PR42010: +; CHECK: # %bb.0: +; CHECK-NEXT: addi 3, 1, -32 +; CHECK-NEXT: vrfiz 2, 2 +; CHECK-NEXT: stvx 2, 0, 3 +; CHECK-NEXT: lfs 0, -28(1) +; CHECK-NEXT: fctiwz 0, 0 +; CHECK-NEXT: stfd 0, -8(1) +; CHECK-NEXT: lwz 3, -4(1) +; CHECK-NEXT: blr + %t0 = call <2 x float> @llvm.trunc.v2f32(<2 x float> %x) + %t1 = extractelement <2 x float> %t0, i32 1 + %t2 = fptosi float %t1 to i32 + ret i32 %t2 +} + +declare <2 x float> @llvm.trunc.v2f32(<2 x float>)