From 6c43f35d740ccd1d746be90d98ee11f8829fe543 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Wed, 17 May 2006 18:16:39 +0000 Subject: [PATCH] Fixed a LowerCallTo and LowerArguments bug. They were introducing illegal VBIT_VECTOR nodes. There were some confusion about the semantics of getPackedTypeBreakdown(). e.g. for <4 x f32> it returns 1 and v4f32, not 4, and f32. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28352 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index bddaa904aa4..e1d4d8e1e6d 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -2455,20 +2455,25 @@ TargetLowering::LowerArguments(Function &F, SelectionDAG &DAG) { // Figure out if there is a Packed type corresponding to this Vector // type. If so, convert to the packed type. + bool Supported = false; MVT::ValueType TVT = MVT::getVectorType(getValueType(EltTy), NumElems); - if (TVT != MVT::Other && isTypeLegal(TVT)) { + if (TVT != MVT::Other) { SDOperand N = SDOperand(Result, i++); // Handle copies from generic vectors to registers. MVT::ValueType PTyElementVT, PTyLegalElementVT; unsigned NE = getPackedTypeBreakdown(PTy, PTyElementVT, PTyLegalElementVT); - // Insert a VBIT_CONVERT of the FORMAL_ARGUMENTS to a - // "N x PTyElementVT" MVT::Vector type. - N = DAG.getNode(ISD::VBIT_CONVERT, MVT::Vector, N, - DAG.getConstant(NE, MVT::i32), - DAG.getValueType(PTyElementVT)); - Ops.push_back(N); - } else { + // FIXME: handle NE > 1 cases. + if (NE == 1) { + N = DAG.getNode(ISD::VBIT_CONVERT, MVT::Vector, N, + DAG.getConstant(NumElems, MVT::i32), + DAG.getValueType(getValueType(EltTy))); + Ops.push_back(N); + Supported = true; + } + } + + if (!Supported) { assert(0 && "Don't support illegal by-val vector arguments yet!"); abort(); } @@ -2546,15 +2551,25 @@ TargetLowering::LowerCallTo(SDOperand Chain, const Type *RetTy, bool isVarArg, // Figure out if there is a Packed type corresponding to this Vector // type. If so, convert to the packed type. + bool Supported = false; MVT::ValueType TVT = MVT::getVectorType(getValueType(EltTy), NumElems); - if (TVT != MVT::Other && isTypeLegal(TVT)) { + if (TVT != MVT::Other) { // Handle copies from generic vectors to registers. MVT::ValueType PTyElementVT, PTyLegalElementVT; unsigned NE = getPackedTypeBreakdown(PTy, PTyElementVT, PTyLegalElementVT); - // Insert a VBIT_CONVERT of the MVT::Vector type to the packed type. - Ops.push_back(DAG.getNode(ISD::VBIT_CONVERT, TVT, Op)); - } else { + // FIXME: handle NE > 1 cases. + if (NE == 1) { + // Insert a VBIT_CONVERT of the MVT::Vector type to the packed type. + Op = DAG.getNode(ISD::VBIT_CONVERT, MVT::Vector, Op, + DAG.getConstant(NumElems, MVT::i32), + DAG.getValueType(getValueType(EltTy))); + Ops.push_back(Op); + Supported = true; + } + } + + if (!Supported) { assert(0 && "Don't support illegal by-val vector call args yet!"); abort(); }