forked from OSchip/llvm-project
Make TargetLowering::getShiftAmountTy() taking DataLayout as an argument
Summary: This change is part of a series of commits dedicated to have a single DataLayout during compilation by using always the one owned by the module. Reviewers: echristo Subscribers: jholewinski, llvm-commits, rafael, yaron.keren Differential Revision: http://reviews.llvm.org/D11037 From: Mehdi Amini <mehdi.amini@apple.com> llvm-svn: 241776
This commit is contained in:
parent
44ede33a69
commit
9639d650bb
|
@ -171,9 +171,9 @@ public:
|
|||
MVT getPointerTy(const DataLayout &DL, uint32_t AS = 0) const {
|
||||
return MVT::getIntegerVT(DL.getPointerSizeInBits(AS));
|
||||
}
|
||||
virtual MVT getScalarShiftAmountTy(EVT LHSTy) const;
|
||||
virtual MVT getScalarShiftAmountTy(const DataLayout &) const;
|
||||
|
||||
EVT getShiftAmountTy(EVT LHSTy) const;
|
||||
EVT getShiftAmountTy(EVT LHSTy, const DataLayout &DL) const;
|
||||
|
||||
/// Returns the type to be used for the index operand of:
|
||||
/// ISD::INSERT_VECTOR_ELT, ISD::EXTRACT_VECTOR_ELT,
|
||||
|
|
|
@ -444,8 +444,7 @@ namespace {
|
|||
if (LHSTy.isVector())
|
||||
return LHSTy;
|
||||
auto &DL = DAG.getDataLayout();
|
||||
return LegalTypes ? TLI.getScalarShiftAmountTy(LHSTy)
|
||||
: TLI.getPointerTy(DL);
|
||||
return LegalTypes ? TLI.getScalarShiftAmountTy(DL) : TLI.getPointerTy(DL);
|
||||
}
|
||||
|
||||
/// This method returns true if we are running before type legalization or
|
||||
|
|
|
@ -387,8 +387,9 @@ static void ExpandUnalignedStore(StoreSDNode *ST, SelectionDAG &DAG,
|
|||
int IncrementSize = NumBits / 8;
|
||||
|
||||
// Divide the stored value in two parts.
|
||||
SDValue ShiftAmount = DAG.getConstant(NumBits, dl,
|
||||
TLI.getShiftAmountTy(Val.getValueType()));
|
||||
SDValue ShiftAmount =
|
||||
DAG.getConstant(NumBits, dl, TLI.getShiftAmountTy(Val.getValueType(),
|
||||
DAG.getDataLayout()));
|
||||
SDValue Lo = Val;
|
||||
SDValue Hi = DAG.getNode(ISD::SRL, dl, VT, Val, ShiftAmount);
|
||||
|
||||
|
@ -554,8 +555,9 @@ ExpandUnalignedLoad(LoadSDNode *LD, SelectionDAG &DAG,
|
|||
}
|
||||
|
||||
// aggregate the two parts
|
||||
SDValue ShiftAmount = DAG.getConstant(NumBits, dl,
|
||||
TLI.getShiftAmountTy(Hi.getValueType()));
|
||||
SDValue ShiftAmount =
|
||||
DAG.getConstant(NumBits, dl, TLI.getShiftAmountTy(Hi.getValueType(),
|
||||
DAG.getDataLayout()));
|
||||
SDValue Result = DAG.getNode(ISD::SHL, dl, VT, Hi, ShiftAmount);
|
||||
Result = DAG.getNode(ISD::OR, dl, VT, Result, Lo);
|
||||
|
||||
|
@ -802,9 +804,10 @@ void SelectionDAGLegalize::LegalizeStoreOps(SDNode *Node) {
|
|||
Ptr = DAG.getNode(ISD::ADD, dl, Ptr.getValueType(), Ptr,
|
||||
DAG.getConstant(IncrementSize, dl,
|
||||
Ptr.getValueType()));
|
||||
Hi = DAG.getNode(ISD::SRL, dl, Value.getValueType(), Value,
|
||||
DAG.getConstant(RoundWidth, dl,
|
||||
TLI.getShiftAmountTy(Value.getValueType())));
|
||||
Hi = DAG.getNode(
|
||||
ISD::SRL, dl, Value.getValueType(), Value,
|
||||
DAG.getConstant(RoundWidth, dl,
|
||||
TLI.getShiftAmountTy(Value.getValueType(), DL)));
|
||||
Hi = DAG.getTruncStore(Chain, dl, Hi, Ptr,
|
||||
ST->getPointerInfo().getWithOffset(IncrementSize),
|
||||
ExtraVT, isVolatile, isNonTemporal,
|
||||
|
@ -813,9 +816,10 @@ void SelectionDAGLegalize::LegalizeStoreOps(SDNode *Node) {
|
|||
// Big endian - avoid unaligned stores.
|
||||
// TRUNCSTORE:i24 X -> TRUNCSTORE:i16 (srl X, 8), TRUNCSTORE@+2:i8 X
|
||||
// Store the top RoundWidth bits.
|
||||
Hi = DAG.getNode(ISD::SRL, dl, Value.getValueType(), Value,
|
||||
DAG.getConstant(ExtraWidth, dl,
|
||||
TLI.getShiftAmountTy(Value.getValueType())));
|
||||
Hi = DAG.getNode(
|
||||
ISD::SRL, dl, Value.getValueType(), Value,
|
||||
DAG.getConstant(ExtraWidth, dl,
|
||||
TLI.getShiftAmountTy(Value.getValueType(), DL)));
|
||||
Hi = DAG.getTruncStore(Chain, dl, Hi, Ptr, ST->getPointerInfo(),
|
||||
RoundVT, isVolatile, isNonTemporal, Alignment,
|
||||
AAInfo);
|
||||
|
@ -1027,9 +1031,10 @@ void SelectionDAGLegalize::LegalizeLoadOps(SDNode *Node) {
|
|||
Hi.getValue(1));
|
||||
|
||||
// Move the top bits to the right place.
|
||||
Hi = DAG.getNode(ISD::SHL, dl, Hi.getValueType(), Hi,
|
||||
DAG.getConstant(RoundWidth, dl,
|
||||
TLI.getShiftAmountTy(Hi.getValueType())));
|
||||
Hi = DAG.getNode(
|
||||
ISD::SHL, dl, Hi.getValueType(), Hi,
|
||||
DAG.getConstant(RoundWidth, dl,
|
||||
TLI.getShiftAmountTy(Hi.getValueType(), DL)));
|
||||
|
||||
// Join the hi and lo parts.
|
||||
Value = DAG.getNode(ISD::OR, dl, Node->getValueType(0), Lo, Hi);
|
||||
|
@ -1058,9 +1063,10 @@ void SelectionDAGLegalize::LegalizeLoadOps(SDNode *Node) {
|
|||
Hi.getValue(1));
|
||||
|
||||
// Move the top bits to the right place.
|
||||
Hi = DAG.getNode(ISD::SHL, dl, Hi.getValueType(), Hi,
|
||||
DAG.getConstant(ExtraWidth, dl,
|
||||
TLI.getShiftAmountTy(Hi.getValueType())));
|
||||
Hi = DAG.getNode(
|
||||
ISD::SHL, dl, Hi.getValueType(), Hi,
|
||||
DAG.getConstant(ExtraWidth, dl,
|
||||
TLI.getShiftAmountTy(Hi.getValueType(), DL)));
|
||||
|
||||
// Join the hi and lo parts.
|
||||
Value = DAG.getNode(ISD::OR, dl, Node->getValueType(0), Lo, Hi);
|
||||
|
@ -1607,9 +1613,10 @@ SDValue SelectionDAGLegalize::ExpandFCOPYSIGN(SDNode* Node) {
|
|||
(FloatVT.getSizeInBits() - 8 * ByteOffset);
|
||||
assert(BitShift < LoadTy.getSizeInBits() && "Pointer advanced wrong?");
|
||||
if (BitShift)
|
||||
SignBit = DAG.getNode(ISD::SHL, dl, LoadTy, SignBit,
|
||||
DAG.getConstant(BitShift, dl,
|
||||
TLI.getShiftAmountTy(SignBit.getValueType())));
|
||||
SignBit = DAG.getNode(
|
||||
ISD::SHL, dl, LoadTy, SignBit,
|
||||
DAG.getConstant(BitShift, dl,
|
||||
TLI.getShiftAmountTy(SignBit.getValueType(), DL)));
|
||||
}
|
||||
}
|
||||
// Now get the sign bit proper, by seeing whether the value is negative.
|
||||
|
@ -2517,8 +2524,8 @@ SDValue SelectionDAGLegalize::ExpandLegalINT_TO_FP(bool isSigned,
|
|||
if (!isSigned) {
|
||||
SDValue Fast = DAG.getNode(ISD::SINT_TO_FP, dl, MVT::f32, Op0);
|
||||
|
||||
SDValue ShiftConst =
|
||||
DAG.getConstant(1, dl, TLI.getShiftAmountTy(Op0.getValueType()));
|
||||
SDValue ShiftConst = DAG.getConstant(
|
||||
1, dl, TLI.getShiftAmountTy(Op0.getValueType(), DAG.getDataLayout()));
|
||||
SDValue Shr = DAG.getNode(ISD::SRL, dl, MVT::i64, Op0, ShiftConst);
|
||||
SDValue AndConst = DAG.getConstant(1, dl, MVT::i64);
|
||||
SDValue And = DAG.getNode(ISD::AND, dl, MVT::i64, Op0, AndConst);
|
||||
|
@ -2553,7 +2560,7 @@ SDValue SelectionDAGLegalize::ExpandLegalINT_TO_FP(bool isSigned,
|
|||
MVT::i64),
|
||||
ISD::SETUGE);
|
||||
SDValue Sel2 = DAG.getSelect(dl, MVT::i64, Ge, Sel, Op0);
|
||||
EVT SHVT = TLI.getShiftAmountTy(Sel2.getValueType());
|
||||
EVT SHVT = TLI.getShiftAmountTy(Sel2.getValueType(), DAG.getDataLayout());
|
||||
|
||||
SDValue Sh = DAG.getNode(ISD::SRL, dl, MVT::i64, Sel2,
|
||||
DAG.getConstant(32, dl, SHVT));
|
||||
|
@ -2709,7 +2716,7 @@ SDValue SelectionDAGLegalize::PromoteLegalFP_TO_INT(SDValue LegalOp,
|
|||
/// Open code the operations for BSWAP of the specified operation.
|
||||
SDValue SelectionDAGLegalize::ExpandBSWAP(SDValue Op, SDLoc dl) {
|
||||
EVT VT = Op.getValueType();
|
||||
EVT SHVT = TLI.getShiftAmountTy(VT);
|
||||
EVT SHVT = TLI.getShiftAmountTy(VT, DAG.getDataLayout());
|
||||
SDValue Tmp1, Tmp2, Tmp3, Tmp4, Tmp5, Tmp6, Tmp7, Tmp8;
|
||||
switch (VT.getSimpleVT().SimpleTy) {
|
||||
default: llvm_unreachable("Unhandled Expand type in BSWAP!");
|
||||
|
@ -2766,7 +2773,7 @@ SDValue SelectionDAGLegalize::ExpandBitCount(unsigned Opc, SDValue Op,
|
|||
default: llvm_unreachable("Cannot expand this yet!");
|
||||
case ISD::CTPOP: {
|
||||
EVT VT = Op.getValueType();
|
||||
EVT ShVT = TLI.getShiftAmountTy(VT);
|
||||
EVT ShVT = TLI.getShiftAmountTy(VT, DAG.getDataLayout());
|
||||
unsigned Len = VT.getSizeInBits();
|
||||
|
||||
assert(VT.isInteger() && Len <= 128 && Len % 8 == 0 &&
|
||||
|
@ -2824,7 +2831,7 @@ SDValue SelectionDAGLegalize::ExpandBitCount(unsigned Opc, SDValue Op,
|
|||
//
|
||||
// Ref: "Hacker's Delight" by Henry Warren
|
||||
EVT VT = Op.getValueType();
|
||||
EVT ShVT = TLI.getShiftAmountTy(VT);
|
||||
EVT ShVT = TLI.getShiftAmountTy(VT, DAG.getDataLayout());
|
||||
unsigned len = VT.getSizeInBits();
|
||||
for (unsigned i = 0; (1U << i) <= (len / 2); ++i) {
|
||||
SDValue Tmp3 = DAG.getConstant(1ULL << i, dl, ShVT);
|
||||
|
@ -3042,7 +3049,7 @@ void SelectionDAGLegalize::ExpandNode(SDNode *Node) {
|
|||
// SAR. However, it is doubtful that any exist.
|
||||
EVT ExtraVT = cast<VTSDNode>(Node->getOperand(1))->getVT();
|
||||
EVT VT = Node->getValueType(0);
|
||||
EVT ShiftAmountTy = TLI.getShiftAmountTy(VT);
|
||||
EVT ShiftAmountTy = TLI.getShiftAmountTy(VT, DAG.getDataLayout());
|
||||
if (VT.isVector())
|
||||
ShiftAmountTy = VT;
|
||||
unsigned BitsDiff = VT.getScalarType().getSizeInBits() -
|
||||
|
@ -3260,8 +3267,10 @@ void SelectionDAGLegalize::ExpandNode(SDNode *Node) {
|
|||
if (cast<ConstantSDNode>(Node->getOperand(1))->getZExtValue()) {
|
||||
// 1 -> Hi
|
||||
Tmp1 = DAG.getNode(ISD::SRL, dl, OpTy, Node->getOperand(0),
|
||||
DAG.getConstant(OpTy.getSizeInBits()/2, dl,
|
||||
TLI.getShiftAmountTy(Node->getOperand(0).getValueType())));
|
||||
DAG.getConstant(OpTy.getSizeInBits() / 2, dl,
|
||||
TLI.getShiftAmountTy(
|
||||
Node->getOperand(0).getValueType(),
|
||||
DAG.getDataLayout())));
|
||||
Tmp1 = DAG.getNode(ISD::TRUNCATE, dl, Node->getValueType(0), Tmp1);
|
||||
} else {
|
||||
// 0 -> Lo
|
||||
|
@ -3659,8 +3668,9 @@ void SelectionDAGLegalize::ExpandNode(SDNode *Node) {
|
|||
TLI.expandMUL(Node, Lo, Hi, HalfType, DAG)) {
|
||||
Lo = DAG.getNode(ISD::ZERO_EXTEND, dl, VT, Lo);
|
||||
Hi = DAG.getNode(ISD::ANY_EXTEND, dl, VT, Hi);
|
||||
SDValue Shift = DAG.getConstant(HalfType.getSizeInBits(), dl,
|
||||
TLI.getShiftAmountTy(HalfType));
|
||||
SDValue Shift =
|
||||
DAG.getConstant(HalfType.getSizeInBits(), dl,
|
||||
TLI.getShiftAmountTy(HalfType, DAG.getDataLayout()));
|
||||
Hi = DAG.getNode(ISD::SHL, dl, VT, Hi, Shift);
|
||||
Results.push_back(DAG.getNode(ISD::OR, dl, VT, Lo, Hi));
|
||||
break;
|
||||
|
@ -3800,8 +3810,9 @@ void SelectionDAGLegalize::ExpandNode(SDNode *Node) {
|
|||
}
|
||||
|
||||
if (isSigned) {
|
||||
Tmp1 = DAG.getConstant(VT.getSizeInBits() - 1, dl,
|
||||
TLI.getShiftAmountTy(BottomHalf.getValueType()));
|
||||
Tmp1 = DAG.getConstant(
|
||||
VT.getSizeInBits() - 1, dl,
|
||||
TLI.getShiftAmountTy(BottomHalf.getValueType(), DAG.getDataLayout()));
|
||||
Tmp1 = DAG.getNode(ISD::SRA, dl, VT, BottomHalf, Tmp1);
|
||||
TopHalf = DAG.getSetCC(dl, getSetCCResultType(VT), TopHalf, Tmp1,
|
||||
ISD::SETNE);
|
||||
|
@ -3817,9 +3828,10 @@ void SelectionDAGLegalize::ExpandNode(SDNode *Node) {
|
|||
EVT PairTy = Node->getValueType(0);
|
||||
Tmp1 = DAG.getNode(ISD::ZERO_EXTEND, dl, PairTy, Node->getOperand(0));
|
||||
Tmp2 = DAG.getNode(ISD::ANY_EXTEND, dl, PairTy, Node->getOperand(1));
|
||||
Tmp2 = DAG.getNode(ISD::SHL, dl, PairTy, Tmp2,
|
||||
DAG.getConstant(PairTy.getSizeInBits()/2, dl,
|
||||
TLI.getShiftAmountTy(PairTy)));
|
||||
Tmp2 = DAG.getNode(
|
||||
ISD::SHL, dl, PairTy, Tmp2,
|
||||
DAG.getConstant(PairTy.getSizeInBits() / 2, dl,
|
||||
TLI.getShiftAmountTy(PairTy, DAG.getDataLayout())));
|
||||
Results.push_back(DAG.getNode(ISD::OR, dl, PairTy, Tmp1, Tmp2));
|
||||
break;
|
||||
}
|
||||
|
@ -4128,9 +4140,10 @@ void SelectionDAGLegalize::PromoteNode(SDNode *Node) {
|
|||
unsigned DiffBits = NVT.getSizeInBits() - OVT.getSizeInBits();
|
||||
Tmp1 = DAG.getNode(ISD::ZERO_EXTEND, dl, NVT, Node->getOperand(0));
|
||||
Tmp1 = DAG.getNode(ISD::BSWAP, dl, NVT, Tmp1);
|
||||
Tmp1 = DAG.getNode(ISD::SRL, dl, NVT, Tmp1,
|
||||
DAG.getConstant(DiffBits, dl,
|
||||
TLI.getShiftAmountTy(NVT)));
|
||||
Tmp1 = DAG.getNode(
|
||||
ISD::SRL, dl, NVT, Tmp1,
|
||||
DAG.getConstant(DiffBits, dl,
|
||||
TLI.getShiftAmountTy(NVT, DAG.getDataLayout())));
|
||||
Results.push_back(Tmp1);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -218,29 +218,35 @@ SDValue DAGTypeLegalizer::SoftenFloatRes_FCOPYSIGN(SDNode *N) {
|
|||
unsigned RSize = RVT.getSizeInBits();
|
||||
|
||||
// First get the sign bit of second operand.
|
||||
SDValue SignBit = DAG.getNode(ISD::SHL, dl, RVT, DAG.getConstant(1, dl, RVT),
|
||||
DAG.getConstant(RSize - 1, dl,
|
||||
TLI.getShiftAmountTy(RVT)));
|
||||
SDValue SignBit = DAG.getNode(
|
||||
ISD::SHL, dl, RVT, DAG.getConstant(1, dl, RVT),
|
||||
DAG.getConstant(RSize - 1, dl,
|
||||
TLI.getShiftAmountTy(RVT, DAG.getDataLayout())));
|
||||
SignBit = DAG.getNode(ISD::AND, dl, RVT, RHS, SignBit);
|
||||
|
||||
// Shift right or sign-extend it if the two operands have different types.
|
||||
int SizeDiff = RVT.getSizeInBits() - LVT.getSizeInBits();
|
||||
if (SizeDiff > 0) {
|
||||
SignBit = DAG.getNode(ISD::SRL, dl, RVT, SignBit,
|
||||
DAG.getConstant(SizeDiff, dl,
|
||||
TLI.getShiftAmountTy(SignBit.getValueType())));
|
||||
SignBit =
|
||||
DAG.getNode(ISD::SRL, dl, RVT, SignBit,
|
||||
DAG.getConstant(SizeDiff, dl,
|
||||
TLI.getShiftAmountTy(SignBit.getValueType(),
|
||||
DAG.getDataLayout())));
|
||||
SignBit = DAG.getNode(ISD::TRUNCATE, dl, LVT, SignBit);
|
||||
} else if (SizeDiff < 0) {
|
||||
SignBit = DAG.getNode(ISD::ANY_EXTEND, dl, LVT, SignBit);
|
||||
SignBit = DAG.getNode(ISD::SHL, dl, LVT, SignBit,
|
||||
DAG.getConstant(-SizeDiff, dl,
|
||||
TLI.getShiftAmountTy(SignBit.getValueType())));
|
||||
SignBit =
|
||||
DAG.getNode(ISD::SHL, dl, LVT, SignBit,
|
||||
DAG.getConstant(-SizeDiff, dl,
|
||||
TLI.getShiftAmountTy(SignBit.getValueType(),
|
||||
DAG.getDataLayout())));
|
||||
}
|
||||
|
||||
// Clear the sign bit of the first operand.
|
||||
SDValue Mask = DAG.getNode(ISD::SHL, dl, LVT, DAG.getConstant(1, dl, LVT),
|
||||
DAG.getConstant(LSize - 1, dl,
|
||||
TLI.getShiftAmountTy(LVT)));
|
||||
SDValue Mask = DAG.getNode(
|
||||
ISD::SHL, dl, LVT, DAG.getConstant(1, dl, LVT),
|
||||
DAG.getConstant(LSize - 1, dl,
|
||||
TLI.getShiftAmountTy(LVT, DAG.getDataLayout())));
|
||||
Mask = DAG.getNode(ISD::SUB, dl, LVT, Mask, DAG.getConstant(1, dl, LVT));
|
||||
LHS = DAG.getNode(ISD::AND, dl, LVT, LHS, Mask);
|
||||
|
||||
|
|
|
@ -310,8 +310,10 @@ SDValue DAGTypeLegalizer::PromoteIntRes_BSWAP(SDNode *N) {
|
|||
SDLoc dl(N);
|
||||
|
||||
unsigned DiffBits = NVT.getScalarSizeInBits() - OVT.getScalarSizeInBits();
|
||||
return DAG.getNode(ISD::SRL, dl, NVT, DAG.getNode(ISD::BSWAP, dl, NVT, Op),
|
||||
DAG.getConstant(DiffBits, dl, TLI.getShiftAmountTy(NVT)));
|
||||
return DAG.getNode(
|
||||
ISD::SRL, dl, NVT, DAG.getNode(ISD::BSWAP, dl, NVT, Op),
|
||||
DAG.getConstant(DiffBits, dl,
|
||||
TLI.getShiftAmountTy(NVT, DAG.getDataLayout())));
|
||||
}
|
||||
|
||||
SDValue DAGTypeLegalizer::PromoteIntRes_BUILD_PAIR(SDNode *N) {
|
||||
|
@ -2209,7 +2211,7 @@ void DAGTypeLegalizer::ExpandIntRes_Shift(SDNode *N,
|
|||
// have an illegal type. Fix that first by casting the operand, otherwise
|
||||
// the new SHL_PARTS operation would need further legalization.
|
||||
SDValue ShiftOp = N->getOperand(1);
|
||||
EVT ShiftTy = TLI.getShiftAmountTy(VT);
|
||||
EVT ShiftTy = TLI.getShiftAmountTy(VT, DAG.getDataLayout());
|
||||
assert(ShiftTy.getScalarType().getSizeInBits() >=
|
||||
Log2_32_Ceil(VT.getScalarType().getSizeInBits()) &&
|
||||
"ShiftAmountTy is too small to cover the range of this type!");
|
||||
|
|
|
@ -563,7 +563,8 @@ SDValue VectorLegalizer::ExpandLoad(SDValue Op) {
|
|||
SDValue Lo, Hi, ShAmt;
|
||||
|
||||
if (BitOffset < WideBits) {
|
||||
ShAmt = DAG.getConstant(BitOffset, dl, TLI.getShiftAmountTy(WideVT));
|
||||
ShAmt = DAG.getConstant(
|
||||
BitOffset, dl, TLI.getShiftAmountTy(WideVT, DAG.getDataLayout()));
|
||||
Lo = DAG.getNode(ISD::SRL, dl, WideVT, LoadVals[WideIdx], ShAmt);
|
||||
Lo = DAG.getNode(ISD::AND, dl, WideVT, Lo, SrcEltBitMask);
|
||||
}
|
||||
|
@ -573,8 +574,9 @@ SDValue VectorLegalizer::ExpandLoad(SDValue Op) {
|
|||
WideIdx++;
|
||||
BitOffset -= WideBits;
|
||||
if (BitOffset > 0) {
|
||||
ShAmt = DAG.getConstant(SrcEltBits - BitOffset, dl,
|
||||
TLI.getShiftAmountTy(WideVT));
|
||||
ShAmt = DAG.getConstant(
|
||||
SrcEltBits - BitOffset, dl,
|
||||
TLI.getShiftAmountTy(WideVT, DAG.getDataLayout()));
|
||||
Hi = DAG.getNode(ISD::SHL, dl, WideVT, LoadVals[WideIdx], ShAmt);
|
||||
Hi = DAG.getNode(ISD::AND, dl, WideVT, Hi, SrcEltBitMask);
|
||||
}
|
||||
|
@ -592,8 +594,9 @@ SDValue VectorLegalizer::ExpandLoad(SDValue Op) {
|
|||
Lo = DAG.getZExtOrTrunc(Lo, dl, DstEltVT);
|
||||
break;
|
||||
case ISD::SEXTLOAD:
|
||||
ShAmt = DAG.getConstant(WideBits - SrcEltBits, dl,
|
||||
TLI.getShiftAmountTy(WideVT));
|
||||
ShAmt =
|
||||
DAG.getConstant(WideBits - SrcEltBits, dl,
|
||||
TLI.getShiftAmountTy(WideVT, DAG.getDataLayout()));
|
||||
Lo = DAG.getNode(ISD::SHL, dl, WideVT, Lo, ShAmt);
|
||||
Lo = DAG.getNode(ISD::SRA, dl, WideVT, Lo, ShAmt);
|
||||
Lo = DAG.getSExtOrTrunc(Lo, dl, DstEltVT);
|
||||
|
|
|
@ -1850,7 +1850,7 @@ SDValue SelectionDAG::getAddrSpaceCast(SDLoc dl, EVT VT, SDValue Ptr,
|
|||
/// the target's desired shift amount type.
|
||||
SDValue SelectionDAG::getShiftAmountOperand(EVT LHSTy, SDValue Op) {
|
||||
EVT OpTy = Op.getValueType();
|
||||
EVT ShTy = TLI->getShiftAmountTy(LHSTy);
|
||||
EVT ShTy = TLI->getShiftAmountTy(LHSTy, getDataLayout());
|
||||
if (OpTy == ShTy || OpTy.isVector()) return Op;
|
||||
|
||||
ISD::NodeType Opcode = OpTy.bitsGT(ShTy) ? ISD::TRUNCATE : ISD::ZERO_EXTEND;
|
||||
|
|
|
@ -2200,8 +2200,8 @@ void SelectionDAGBuilder::visitShift(const User &I, unsigned Opcode) {
|
|||
SDValue Op1 = getValue(I.getOperand(0));
|
||||
SDValue Op2 = getValue(I.getOperand(1));
|
||||
|
||||
EVT ShiftTy =
|
||||
DAG.getTargetLoweringInfo().getShiftAmountTy(Op2.getValueType());
|
||||
EVT ShiftTy = DAG.getTargetLoweringInfo().getShiftAmountTy(
|
||||
Op2.getValueType(), DAG.getDataLayout());
|
||||
|
||||
// Coerce the shift amount to the right type if we can.
|
||||
if (!I.getType()->isVectorTy() && Op2.getValueType() != ShiftTy) {
|
||||
|
|
|
@ -384,6 +384,7 @@ bool TargetLowering::SimplifyDemandedBits(SDValue Op,
|
|||
"Mask size mismatches value type size!");
|
||||
APInt NewMask = DemandedMask;
|
||||
SDLoc dl(Op);
|
||||
auto &DL = TLO.DAG.getDataLayout();
|
||||
|
||||
// Don't know anything.
|
||||
KnownZero = KnownOne = APInt(BitWidth, 0);
|
||||
|
@ -646,7 +647,7 @@ bool TargetLowering::SimplifyDemandedBits(SDValue Op,
|
|||
unsigned InnerBits = InnerVT.getSizeInBits();
|
||||
if (ShAmt < InnerBits && NewMask.lshr(InnerBits) == 0 &&
|
||||
isTypeDesirableForOp(ISD::SHL, InnerVT)) {
|
||||
EVT ShTy = getShiftAmountTy(InnerVT);
|
||||
EVT ShTy = getShiftAmountTy(InnerVT, DL);
|
||||
if (!APInt(BitWidth, ShAmt).isIntN(ShTy.getSizeInBits()))
|
||||
ShTy = InnerVT;
|
||||
SDValue NarrowShl =
|
||||
|
@ -825,7 +826,7 @@ bool TargetLowering::SimplifyDemandedBits(SDValue Op,
|
|||
// for scalar types after legalization.
|
||||
EVT ShiftAmtTy = Op.getValueType();
|
||||
if (TLO.LegalTypes() && !ShiftAmtTy.isVector())
|
||||
ShiftAmtTy = getShiftAmountTy(ShiftAmtTy);
|
||||
ShiftAmtTy = getShiftAmountTy(ShiftAmtTy, DL);
|
||||
|
||||
SDValue ShiftAmt = TLO.DAG.getConstant(BitWidth - ShAmt, dl,
|
||||
ShiftAmtTy);
|
||||
|
@ -1010,8 +1011,8 @@ bool TargetLowering::SimplifyDemandedBits(SDValue Op,
|
|||
SDValue Shift = In.getOperand(1);
|
||||
if (TLO.LegalTypes()) {
|
||||
uint64_t ShVal = ShAmt->getZExtValue();
|
||||
Shift =
|
||||
TLO.DAG.getConstant(ShVal, dl, getShiftAmountTy(Op.getValueType()));
|
||||
Shift = TLO.DAG.getConstant(ShVal, dl,
|
||||
getShiftAmountTy(Op.getValueType(), DL));
|
||||
}
|
||||
|
||||
APInt HighBits = APInt::getHighBitsSet(OperandBitWidth,
|
||||
|
@ -1700,7 +1701,7 @@ TargetLowering::SimplifySetCC(EVT VT, SDValue N0, SDValue N1,
|
|||
dyn_cast<ConstantSDNode>(N0.getOperand(1))) {
|
||||
EVT ShiftTy = DCI.isBeforeLegalize()
|
||||
? getPointerTy(DL)
|
||||
: getShiftAmountTy(N0.getValueType());
|
||||
: getShiftAmountTy(N0.getValueType(), DL);
|
||||
if (Cond == ISD::SETNE && C1 == 0) {// (X & 8) != 0 --> (X & 8) >> 3
|
||||
// Perform the xform if the AND RHS is a single bit.
|
||||
if (AndRHS->getAPIntValue().isPowerOf2()) {
|
||||
|
@ -1735,7 +1736,7 @@ TargetLowering::SimplifySetCC(EVT VT, SDValue N0, SDValue N1,
|
|||
auto &DL = DAG.getDataLayout();
|
||||
EVT ShiftTy = DCI.isBeforeLegalize()
|
||||
? getPointerTy(DL)
|
||||
: getShiftAmountTy(N0.getValueType());
|
||||
: getShiftAmountTy(N0.getValueType(), DL);
|
||||
EVT CmpTy = N0.getValueType();
|
||||
SDValue Shift = DAG.getNode(ISD::SRL, dl, CmpTy, N0.getOperand(0),
|
||||
DAG.getConstant(ShiftBits, dl,
|
||||
|
@ -1767,7 +1768,7 @@ TargetLowering::SimplifySetCC(EVT VT, SDValue N0, SDValue N1,
|
|||
auto &DL = DAG.getDataLayout();
|
||||
EVT ShiftTy = DCI.isBeforeLegalize()
|
||||
? getPointerTy(DL)
|
||||
: getShiftAmountTy(N0.getValueType());
|
||||
: getShiftAmountTy(N0.getValueType(), DL);
|
||||
EVT CmpTy = N0.getValueType();
|
||||
SDValue Shift = DAG.getNode(ISD::SRL, dl, CmpTy, N0,
|
||||
DAG.getConstant(ShiftBits, dl, ShiftTy));
|
||||
|
@ -1954,10 +1955,12 @@ TargetLowering::SimplifySetCC(EVT VT, SDValue N0, SDValue N1,
|
|||
Cond);
|
||||
if (N0.getNode()->hasOneUse()) {
|
||||
assert(N0.getOpcode() == ISD::SUB && "Unexpected operation!");
|
||||
auto &DL = DAG.getDataLayout();
|
||||
// (Z-X) == X --> Z == X<<1
|
||||
SDValue SH = DAG.getNode(ISD::SHL, dl, N1.getValueType(), N1,
|
||||
DAG.getConstant(1, dl,
|
||||
getShiftAmountTy(N1.getValueType())));
|
||||
SDValue SH = DAG.getNode(
|
||||
ISD::SHL, dl, N1.getValueType(), N1,
|
||||
DAG.getConstant(1, dl,
|
||||
getShiftAmountTy(N1.getValueType(), DL)));
|
||||
if (!DCI.isCalledByLegalizer())
|
||||
DCI.AddToWorklist(SH.getNode());
|
||||
return DAG.getSetCC(dl, VT, N0.getOperand(0), SH, Cond);
|
||||
|
@ -1978,10 +1981,11 @@ TargetLowering::SimplifySetCC(EVT VT, SDValue N0, SDValue N1,
|
|||
DAG.getConstant(0, dl, N1.getValueType()), Cond);
|
||||
if (N1.getNode()->hasOneUse()) {
|
||||
assert(N1.getOpcode() == ISD::SUB && "Unexpected operation!");
|
||||
auto &DL = DAG.getDataLayout();
|
||||
// X == (Z-X) --> X<<1 == Z
|
||||
SDValue SH = DAG.getNode(ISD::SHL, dl, N1.getValueType(), N0,
|
||||
DAG.getConstant(1, dl,
|
||||
getShiftAmountTy(N0.getValueType())));
|
||||
SDValue SH = DAG.getNode(
|
||||
ISD::SHL, dl, N1.getValueType(), N0,
|
||||
DAG.getConstant(1, dl, getShiftAmountTy(N0.getValueType(), DL)));
|
||||
if (!DCI.isCalledByLegalizer())
|
||||
DCI.AddToWorklist(SH.getNode());
|
||||
return DAG.getSetCC(dl, VT, SH, N1.getOperand(0), Cond);
|
||||
|
@ -2693,7 +2697,8 @@ static SDValue BuildExactSDIV(const TargetLowering &TLI, SDValue Op1, APInt d,
|
|||
if (ShAmt) {
|
||||
// TODO: For UDIV use SRL instead of SRA.
|
||||
SDValue Amt =
|
||||
DAG.getConstant(ShAmt, dl, TLI.getShiftAmountTy(Op1.getValueType()));
|
||||
DAG.getConstant(ShAmt, dl, TLI.getShiftAmountTy(Op1.getValueType(),
|
||||
DAG.getDataLayout()));
|
||||
SDNodeFlags Flags;
|
||||
Flags.setExact(true);
|
||||
Op1 = DAG.getNode(ISD::SRA, dl, Op1.getValueType(), Op1, Amt, &Flags);
|
||||
|
@ -2759,17 +2764,19 @@ SDValue TargetLowering::BuildSDIV(SDNode *N, const APInt &Divisor,
|
|||
Q = DAG.getNode(ISD::SUB, dl, VT, Q, N->getOperand(0));
|
||||
Created->push_back(Q.getNode());
|
||||
}
|
||||
auto &DL = DAG.getDataLayout();
|
||||
// Shift right algebraic if shift value is nonzero
|
||||
if (magics.s > 0) {
|
||||
Q = DAG.getNode(ISD::SRA, dl, VT, Q,
|
||||
DAG.getConstant(magics.s, dl,
|
||||
getShiftAmountTy(Q.getValueType())));
|
||||
Q = DAG.getNode(
|
||||
ISD::SRA, dl, VT, Q,
|
||||
DAG.getConstant(magics.s, dl, getShiftAmountTy(Q.getValueType(), DL)));
|
||||
Created->push_back(Q.getNode());
|
||||
}
|
||||
// Extract the sign bit and add it to the quotient
|
||||
SDValue T = DAG.getNode(ISD::SRL, dl, VT, Q,
|
||||
DAG.getConstant(VT.getScalarSizeInBits() - 1, dl,
|
||||
getShiftAmountTy(Q.getValueType())));
|
||||
SDValue T =
|
||||
DAG.getNode(ISD::SRL, dl, VT, Q,
|
||||
DAG.getConstant(VT.getScalarSizeInBits() - 1, dl,
|
||||
getShiftAmountTy(Q.getValueType(), DL)));
|
||||
Created->push_back(T.getNode());
|
||||
return DAG.getNode(ISD::ADD, dl, VT, Q, T);
|
||||
}
|
||||
|
@ -2785,6 +2792,7 @@ SDValue TargetLowering::BuildUDIV(SDNode *N, const APInt &Divisor,
|
|||
|
||||
EVT VT = N->getValueType(0);
|
||||
SDLoc dl(N);
|
||||
auto &DL = DAG.getDataLayout();
|
||||
|
||||
// Check to see if we can do this.
|
||||
// FIXME: We should be more aggressive here.
|
||||
|
@ -2801,9 +2809,9 @@ SDValue TargetLowering::BuildUDIV(SDNode *N, const APInt &Divisor,
|
|||
// the divided value upfront.
|
||||
if (magics.a != 0 && !Divisor[0]) {
|
||||
unsigned Shift = Divisor.countTrailingZeros();
|
||||
Q = DAG.getNode(ISD::SRL, dl, VT, Q,
|
||||
DAG.getConstant(Shift, dl,
|
||||
getShiftAmountTy(Q.getValueType())));
|
||||
Q = DAG.getNode(
|
||||
ISD::SRL, dl, VT, Q,
|
||||
DAG.getConstant(Shift, dl, getShiftAmountTy(Q.getValueType(), DL)));
|
||||
Created->push_back(Q.getNode());
|
||||
|
||||
// Get magic number for the shifted divisor.
|
||||
|
@ -2828,21 +2836,22 @@ SDValue TargetLowering::BuildUDIV(SDNode *N, const APInt &Divisor,
|
|||
if (magics.a == 0) {
|
||||
assert(magics.s < Divisor.getBitWidth() &&
|
||||
"We shouldn't generate an undefined shift!");
|
||||
return DAG.getNode(ISD::SRL, dl, VT, Q,
|
||||
DAG.getConstant(magics.s, dl,
|
||||
getShiftAmountTy(Q.getValueType())));
|
||||
return DAG.getNode(
|
||||
ISD::SRL, dl, VT, Q,
|
||||
DAG.getConstant(magics.s, dl, getShiftAmountTy(Q.getValueType(), DL)));
|
||||
} else {
|
||||
SDValue NPQ = DAG.getNode(ISD::SUB, dl, VT, N->getOperand(0), Q);
|
||||
Created->push_back(NPQ.getNode());
|
||||
NPQ = DAG.getNode(ISD::SRL, dl, VT, NPQ,
|
||||
DAG.getConstant(1, dl,
|
||||
getShiftAmountTy(NPQ.getValueType())));
|
||||
NPQ = DAG.getNode(
|
||||
ISD::SRL, dl, VT, NPQ,
|
||||
DAG.getConstant(1, dl, getShiftAmountTy(NPQ.getValueType(), DL)));
|
||||
Created->push_back(NPQ.getNode());
|
||||
NPQ = DAG.getNode(ISD::ADD, dl, VT, NPQ, Q);
|
||||
Created->push_back(NPQ.getNode());
|
||||
return DAG.getNode(ISD::SRL, dl, VT, NPQ,
|
||||
DAG.getConstant(magics.s - 1, dl,
|
||||
getShiftAmountTy(NPQ.getValueType())));
|
||||
return DAG.getNode(
|
||||
ISD::SRL, dl, VT, NPQ,
|
||||
DAG.getConstant(magics.s - 1, dl,
|
||||
getShiftAmountTy(NPQ.getValueType(), DL)));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2928,8 +2937,9 @@ bool TargetLowering::expandMUL(SDNode *N, SDValue &Lo, SDValue &Hi, EVT HiLoVT,
|
|||
if (!LH.getNode() && !RH.getNode() &&
|
||||
isOperationLegalOrCustom(ISD::SRL, VT) &&
|
||||
isOperationLegalOrCustom(ISD::TRUNCATE, HiLoVT)) {
|
||||
auto &DL = DAG.getDataLayout();
|
||||
unsigned ShiftAmt = VT.getSizeInBits() - HiLoVT.getSizeInBits();
|
||||
SDValue Shift = DAG.getConstant(ShiftAmt, dl, getShiftAmountTy(VT));
|
||||
SDValue Shift = DAG.getConstant(ShiftAmt, dl, getShiftAmountTy(VT, DL));
|
||||
LH = DAG.getNode(ISD::SRL, dl, VT, N->getOperand(0), Shift);
|
||||
LH = DAG.getNode(ISD::TRUNCATE, dl, HiLoVT, LH);
|
||||
RH = DAG.getNode(ISD::SRL, dl, VT, N->getOperand(1), Shift);
|
||||
|
@ -2989,14 +2999,15 @@ bool TargetLowering::expandFP_TO_SINT(SDNode *Node, SDValue &Result,
|
|||
|
||||
SDValue Bits = DAG.getNode(ISD::BITCAST, dl, IntVT, Node->getOperand(0));
|
||||
|
||||
SDValue ExponentBits = DAG.getNode(ISD::SRL, dl, IntVT,
|
||||
DAG.getNode(ISD::AND, dl, IntVT, Bits, ExponentMask),
|
||||
DAG.getZExtOrTrunc(ExponentLoBit, dl, getShiftAmountTy(IntVT)));
|
||||
auto &DL = DAG.getDataLayout();
|
||||
SDValue ExponentBits = DAG.getNode(
|
||||
ISD::SRL, dl, IntVT, DAG.getNode(ISD::AND, dl, IntVT, Bits, ExponentMask),
|
||||
DAG.getZExtOrTrunc(ExponentLoBit, dl, getShiftAmountTy(IntVT, DL)));
|
||||
SDValue Exponent = DAG.getNode(ISD::SUB, dl, IntVT, ExponentBits, Bias);
|
||||
|
||||
SDValue Sign = DAG.getNode(ISD::SRA, dl, IntVT,
|
||||
DAG.getNode(ISD::AND, dl, IntVT, Bits, SignMask),
|
||||
DAG.getZExtOrTrunc(SignLowBit, dl, getShiftAmountTy(IntVT)));
|
||||
SDValue Sign = DAG.getNode(
|
||||
ISD::SRA, dl, IntVT, DAG.getNode(ISD::AND, dl, IntVT, Bits, SignMask),
|
||||
DAG.getZExtOrTrunc(SignLowBit, dl, getShiftAmountTy(IntVT, DL)));
|
||||
Sign = DAG.getSExtOrTrunc(Sign, dl, NVT);
|
||||
|
||||
SDValue R = DAG.getNode(ISD::OR, dl, IntVT,
|
||||
|
@ -3005,17 +3016,17 @@ bool TargetLowering::expandFP_TO_SINT(SDNode *Node, SDValue &Result,
|
|||
|
||||
R = DAG.getZExtOrTrunc(R, dl, NVT);
|
||||
|
||||
|
||||
R = DAG.getSelectCC(dl, Exponent, ExponentLoBit,
|
||||
DAG.getNode(ISD::SHL, dl, NVT, R,
|
||||
DAG.getZExtOrTrunc(
|
||||
DAG.getNode(ISD::SUB, dl, IntVT, Exponent, ExponentLoBit),
|
||||
dl, getShiftAmountTy(IntVT))),
|
||||
DAG.getNode(ISD::SRL, dl, NVT, R,
|
||||
DAG.getZExtOrTrunc(
|
||||
DAG.getNode(ISD::SUB, dl, IntVT, ExponentLoBit, Exponent),
|
||||
dl, getShiftAmountTy(IntVT))),
|
||||
ISD::SETGT);
|
||||
R = DAG.getSelectCC(
|
||||
dl, Exponent, ExponentLoBit,
|
||||
DAG.getNode(ISD::SHL, dl, NVT, R,
|
||||
DAG.getZExtOrTrunc(
|
||||
DAG.getNode(ISD::SUB, dl, IntVT, Exponent, ExponentLoBit),
|
||||
dl, getShiftAmountTy(IntVT, DL))),
|
||||
DAG.getNode(ISD::SRL, dl, NVT, R,
|
||||
DAG.getZExtOrTrunc(
|
||||
DAG.getNode(ISD::SUB, dl, IntVT, ExponentLoBit, Exponent),
|
||||
dl, getShiftAmountTy(IntVT, DL))),
|
||||
ISD::SETGT);
|
||||
|
||||
SDValue Ret = DAG.getNode(ISD::SUB, dl, NVT,
|
||||
DAG.getNode(ISD::XOR, dl, NVT, R, Sign),
|
||||
|
|
|
@ -878,15 +878,16 @@ void TargetLoweringBase::initActions() {
|
|||
setOperationAction(ISD::DEBUGTRAP, MVT::Other, Expand);
|
||||
}
|
||||
|
||||
MVT TargetLoweringBase::getScalarShiftAmountTy(EVT LHSTy) const {
|
||||
return MVT::getIntegerVT(8 * getDataLayout()->getPointerSize(0));
|
||||
MVT TargetLoweringBase::getScalarShiftAmountTy(const DataLayout &DL) const {
|
||||
return MVT::getIntegerVT(8 * DL.getPointerSize(0));
|
||||
}
|
||||
|
||||
EVT TargetLoweringBase::getShiftAmountTy(EVT LHSTy) const {
|
||||
EVT TargetLoweringBase::getShiftAmountTy(EVT LHSTy,
|
||||
const DataLayout &DL) const {
|
||||
assert(LHSTy.isInteger() && "Shift amount is not an integer type!");
|
||||
if (LHSTy.isVector())
|
||||
return LHSTy;
|
||||
return getScalarShiftAmountTy(LHSTy);
|
||||
return getScalarShiftAmountTy(DL);
|
||||
}
|
||||
|
||||
/// canOpTrap - Returns true if the operation can trap for the value type.
|
||||
|
|
|
@ -775,7 +775,7 @@ void AArch64TargetLowering::computeKnownBitsForTargetNode(
|
|||
}
|
||||
}
|
||||
|
||||
MVT AArch64TargetLowering::getScalarShiftAmountTy(EVT LHSTy) const {
|
||||
MVT AArch64TargetLowering::getScalarShiftAmountTy(const DataLayout &DL) const {
|
||||
return MVT::i64;
|
||||
}
|
||||
|
||||
|
|
|
@ -233,7 +233,7 @@ public:
|
|||
APInt &KnownOne, const SelectionDAG &DAG,
|
||||
unsigned Depth = 0) const override;
|
||||
|
||||
MVT getScalarShiftAmountTy(EVT LHSTy) const override;
|
||||
MVT getScalarShiftAmountTy(const DataLayout &DL) const override;
|
||||
|
||||
/// allowsMisalignedMemoryAccesses - Returns true if the target allows
|
||||
/// unaligned memory accesses of the specified type.
|
||||
|
|
|
@ -703,7 +703,7 @@ EVT SITargetLowering::getSetCCResultType(const DataLayout &DL, LLVMContext &Ctx,
|
|||
return EVT::getVectorVT(Ctx, MVT::i1, VT.getVectorNumElements());
|
||||
}
|
||||
|
||||
MVT SITargetLowering::getScalarShiftAmountTy(EVT VT) const {
|
||||
MVT SITargetLowering::getScalarShiftAmountTy(const DataLayout &) const {
|
||||
return MVT::i32;
|
||||
}
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ public:
|
|||
bool enableAggressiveFMAFusion(EVT VT) const override;
|
||||
EVT getSetCCResultType(const DataLayout &DL, LLVMContext &Context,
|
||||
EVT VT) const override;
|
||||
MVT getScalarShiftAmountTy(EVT VT) const override;
|
||||
MVT getScalarShiftAmountTy(const DataLayout &) const override;
|
||||
bool isFMAFasterThanFMulAndFAdd(EVT VT) const override;
|
||||
SDValue LowerOperation(SDValue Op, SelectionDAG &DAG) const override;
|
||||
SDValue PerformDAGCombine(SDNode *N, DAGCombinerInfo &DCI) const override;
|
||||
|
|
|
@ -72,7 +72,9 @@ namespace llvm {
|
|||
explicit MSP430TargetLowering(const TargetMachine &TM,
|
||||
const MSP430Subtarget &STI);
|
||||
|
||||
MVT getScalarShiftAmountTy(EVT LHSTy) const override { return MVT::i8; }
|
||||
MVT getScalarShiftAmountTy(const DataLayout &) const override {
|
||||
return MVT::i8;
|
||||
}
|
||||
|
||||
/// LowerOperation - Provide custom lowering hooks for some operations.
|
||||
SDValue LowerOperation(SDValue Op, SelectionDAG &DAG) const override;
|
||||
|
|
|
@ -227,7 +227,9 @@ namespace llvm {
|
|||
FastISel *createFastISel(FunctionLoweringInfo &funcInfo,
|
||||
const TargetLibraryInfo *libInfo) const override;
|
||||
|
||||
MVT getScalarShiftAmountTy(EVT LHSTy) const override { return MVT::i32; }
|
||||
MVT getScalarShiftAmountTy(const DataLayout &) const override {
|
||||
return MVT::i32;
|
||||
}
|
||||
|
||||
void LowerOperationWrapper(SDNode *N,
|
||||
SmallVectorImpl<SDValue> &Results,
|
||||
|
|
|
@ -838,8 +838,8 @@ static SDValue performMULCombine(SDNode *N, SelectionDAG &DAG,
|
|||
|
||||
if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(N->getOperand(1)))
|
||||
if (!VT.isVector())
|
||||
return genConstMult(N->getOperand(0), C->getZExtValue(), SDLoc(N),
|
||||
VT, TL->getScalarShiftAmountTy(VT), DAG);
|
||||
return genConstMult(N->getOperand(0), C->getZExtValue(), SDLoc(N), VT,
|
||||
TL->getScalarShiftAmountTy(DAG.getDataLayout()), DAG);
|
||||
|
||||
return SDValue(N, 0);
|
||||
}
|
||||
|
|
|
@ -500,7 +500,9 @@ public:
|
|||
const NVPTXTargetMachine *nvTM;
|
||||
|
||||
// PTX always uses 32-bit shift amounts
|
||||
MVT getScalarShiftAmountTy(EVT LHSTy) const override { return MVT::i32; }
|
||||
MVT getScalarShiftAmountTy(const DataLayout &) const override {
|
||||
return MVT::i32;
|
||||
}
|
||||
|
||||
TargetLoweringBase::LegalizeTypeAction
|
||||
getPreferredVectorAction(EVT VT) const override;
|
||||
|
|
|
@ -9858,7 +9858,7 @@ SDValue PPCTargetLowering::DAGCombineExtBoolTrunc(SDNode *N,
|
|||
|
||||
assert(N->getOpcode() == ISD::SIGN_EXTEND &&
|
||||
"Invalid extension type");
|
||||
EVT ShiftAmountTy = getShiftAmountTy(N->getValueType(0));
|
||||
EVT ShiftAmountTy = getShiftAmountTy(N->getValueType(0), DAG.getDataLayout());
|
||||
SDValue ShiftCst =
|
||||
DAG.getConstant(N->getValueSizeInBits(0) - PromBits, dl, ShiftAmountTy);
|
||||
return DAG.getNode(ISD::SRA, dl, N->getValueType(0),
|
||||
|
|
|
@ -423,7 +423,9 @@ namespace llvm {
|
|||
/// DAG node.
|
||||
const char *getTargetNodeName(unsigned Opcode) const override;
|
||||
|
||||
MVT getScalarShiftAmountTy(EVT LHSTy) const override { return MVT::i32; }
|
||||
MVT getScalarShiftAmountTy(const DataLayout &) const override {
|
||||
return MVT::i32;
|
||||
}
|
||||
|
||||
bool isCheapToSpeculateCttz() const override {
|
||||
return true;
|
||||
|
|
|
@ -85,7 +85,9 @@ namespace llvm {
|
|||
StringRef Constraint, MVT VT) const override;
|
||||
|
||||
bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const override;
|
||||
MVT getScalarShiftAmountTy(EVT LHSTy) const override { return MVT::i32; }
|
||||
MVT getScalarShiftAmountTy(const DataLayout &) const override {
|
||||
return MVT::i32;
|
||||
}
|
||||
|
||||
/// getSetCCResultType - Return the ISD::SETCC ValueType
|
||||
EVT getSetCCResultType(const DataLayout &DL, LLVMContext &Context,
|
||||
|
|
|
@ -339,7 +339,7 @@ public:
|
|||
const SystemZSubtarget &STI);
|
||||
|
||||
// Override TargetLowering.
|
||||
MVT getScalarShiftAmountTy(EVT LHSTy) const override {
|
||||
MVT getScalarShiftAmountTy(const DataLayout &) const override {
|
||||
return MVT::i32;
|
||||
}
|
||||
MVT getVectorIdxTy(const DataLayout &DL) const override {
|
||||
|
|
|
@ -4851,7 +4851,7 @@ static SDValue getVShift(bool isLeft, EVT VT, SDValue SrcOp,
|
|||
MVT ShVT = MVT::v2i64;
|
||||
unsigned Opc = isLeft ? X86ISD::VSHLDQ : X86ISD::VSRLDQ;
|
||||
SrcOp = DAG.getBitcast(ShVT, SrcOp);
|
||||
MVT ScalarShiftTy = TLI.getScalarShiftAmountTy(SrcOp.getValueType());
|
||||
MVT ScalarShiftTy = TLI.getScalarShiftAmountTy(DAG.getDataLayout());
|
||||
assert(NumBits % 8 == 0 && "Only support byte sized shifts");
|
||||
SDValue ShiftVal = DAG.getConstant(NumBits/8, dl, ScalarShiftTy);
|
||||
return DAG.getBitcast(VT, DAG.getNode(Opc, dl, ShVT, SrcOp, ShiftVal));
|
||||
|
@ -7406,9 +7406,9 @@ static SDValue lowerVectorShuffleAsElementInsertion(
|
|||
V2 = DAG.getBitcast(MVT::v2i64, V2);
|
||||
V2 = DAG.getNode(
|
||||
X86ISD::VSHLDQ, DL, MVT::v2i64, V2,
|
||||
DAG.getConstant(
|
||||
V2Index * EltVT.getSizeInBits()/8, DL,
|
||||
DAG.getTargetLoweringInfo().getScalarShiftAmountTy(MVT::v2i64)));
|
||||
DAG.getConstant(V2Index * EltVT.getSizeInBits() / 8, DL,
|
||||
DAG.getTargetLoweringInfo().getScalarShiftAmountTy(
|
||||
DAG.getDataLayout())));
|
||||
V2 = DAG.getBitcast(VT, V2);
|
||||
}
|
||||
}
|
||||
|
@ -16935,9 +16935,9 @@ static SDValue LowerMUL_LOHI(SDValue Op, const X86Subtarget *Subtarget,
|
|||
// If we have a signed multiply but no PMULDQ fix up the high parts of a
|
||||
// unsigned multiply.
|
||||
if (IsSigned && !Subtarget->hasSSE41()) {
|
||||
SDValue ShAmt =
|
||||
DAG.getConstant(31, dl,
|
||||
DAG.getTargetLoweringInfo().getShiftAmountTy(VT));
|
||||
SDValue ShAmt = DAG.getConstant(
|
||||
31, dl,
|
||||
DAG.getTargetLoweringInfo().getShiftAmountTy(VT, DAG.getDataLayout()));
|
||||
SDValue T1 = DAG.getNode(ISD::AND, dl, VT,
|
||||
DAG.getNode(ISD::SRA, dl, VT, Op0, ShAmt), Op1);
|
||||
SDValue T2 = DAG.getNode(ISD::AND, dl, VT,
|
||||
|
@ -21857,8 +21857,8 @@ static SDValue PerformEXTRACT_VECTOR_ELTCombine(SDNode *N, SelectionDAG &DAG,
|
|||
SDValue TopHalf = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, dl, MVT::i64, Cst,
|
||||
DAG.getConstant(1, dl, VecIdxTy));
|
||||
|
||||
SDValue ShAmt = DAG.getConstant(32, dl,
|
||||
DAG.getTargetLoweringInfo().getShiftAmountTy(MVT::i64));
|
||||
SDValue ShAmt = DAG.getConstant(
|
||||
32, dl, DAG.getTargetLoweringInfo().getShiftAmountTy(MVT::i64, DL));
|
||||
Vals[0] = DAG.getNode(ISD::TRUNCATE, dl, MVT::i32, BottomHalf);
|
||||
Vals[1] = DAG.getNode(ISD::TRUNCATE, dl, MVT::i32,
|
||||
DAG.getNode(ISD::SRA, dl, MVT::i64, BottomHalf, ShAmt));
|
||||
|
|
|
@ -598,7 +598,9 @@ namespace llvm {
|
|||
unsigned getJumpTableEncoding() const override;
|
||||
bool useSoftFloat() const override;
|
||||
|
||||
MVT getScalarShiftAmountTy(EVT LHSTy) const override { return MVT::i8; }
|
||||
MVT getScalarShiftAmountTy(const DataLayout &) const override {
|
||||
return MVT::i8;
|
||||
}
|
||||
|
||||
const MCExpr *
|
||||
LowerCustomJumpTableEntry(const MachineJumpTableInfo *MJTI,
|
||||
|
|
|
@ -101,7 +101,9 @@ namespace llvm {
|
|||
|
||||
|
||||
unsigned getJumpTableEncoding() const override;
|
||||
MVT getScalarShiftAmountTy(EVT LHSTy) const override { return MVT::i32; }
|
||||
MVT getScalarShiftAmountTy(const DataLayout &DL) const override {
|
||||
return MVT::i32;
|
||||
}
|
||||
|
||||
/// LowerOperation - Provide custom lowering hooks for some operations.
|
||||
SDValue LowerOperation(SDValue Op, SelectionDAG &DAG) const override;
|
||||
|
|
Loading…
Reference in New Issue