Commit 11396641 authored by Simon Pilgrim's avatar Simon Pilgrim
Browse files

[DAG] Cleanup DAGCombiner::CombineConsecutiveLoads early-outs. NFCI. 

We had some similar hasOneUse/isNON_EXTLoad early-outs spread out over different parts of the method - we should pull them all together.

Noticed while triaging PR45116
parent 8e29b4b3

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

+6 −5
Original line number Diff line number Diff line
@@ -12536,8 +12536,8 @@ static SDNode *getBuildPairElt(SDNode *N, unsigned i) { 
SDValue DAGCombiner::CombineConsecutiveLoads(SDNode *N, EVT VT) {

  assert(N->getOpcode() == ISD::BUILD_PAIR);













  LoadSDNode *LD1 = dyn_cast<LoadSDNode>(getBuildPairElt(N, 0));













  LoadSDNode *LD2 = dyn_cast<LoadSDNode>(getBuildPairElt(N, 1));













  auto *LD1 = dyn_cast<LoadSDNode>(getBuildPairElt(N, 0));













  auto *LD2 = dyn_cast<LoadSDNode>(getBuildPairElt(N, 1));





























  // A BUILD_PAIR is always having the least significant part in elt 0 and the















  // most significant part in elt 1. So when combining into one large load, we









@@ -12545,13 +12545,14 @@ SDValue DAGCombiner::CombineConsecutiveLoads(SDNode *N, EVT VT) {













  if (DAG.getDataLayout().isBigEndian())















    std::swap(LD1, LD2);



























  if (!LD1 || !LD2 || !ISD::isNON_EXTLoad(LD1) || !LD1->hasOneUse() ||













  if (!LD1 || !LD2 || !ISD::isNON_EXTLoad(LD1) || !ISD::isNON_EXTLoad(LD2) ||













      !LD1->hasOneUse() || !LD2->hasOneUse() ||















      LD1->getAddressSpace() != LD2->getAddressSpace())















    return SDValue();



























  EVT LD1VT = LD1->getValueType(0);















  unsigned LD1Bytes = LD1VT.getStoreSize();













  if (ISD::isNON_EXTLoad(LD2) && LD2->hasOneUse() &&













      DAG.areNonVolatileConsecutiveLoads(LD2, LD1, LD1Bytes, 1)) {













  if (DAG.areNonVolatileConsecutiveLoads(LD2, LD1, LD1Bytes, 1)) {















    Align Alignment = LD1->getAlign();















    Align NewAlign = DAG.getDataLayout().getABITypeAlign(















        VT.getTypeForEVT(*DAG.getContext()));