maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[DAGCombiner] give names to repeated calcs in isAlias(); NFCI 

llvm-svn: 300850
This commit is contained in:
Sanjay Patel 2017-04-20 16:15:08 +00:00
parent 83dc1c60aa
commit b7701bc9af
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
View File

@ -16099,9 +16099,11 @@ bool DAGCombiner::isAlias(LSBaseSDNode *Op0, LSBaseSDNode *Op1) const {
Base2, Offset2, GV2, CV2); Base2, Offset2, GV2, CV2);
// If they have a same base address then check to see if they overlap. // If they have a same base address then check to see if they overlap.
unsigned NumBytes0 = Op0->getMemoryVT().getSizeInBits() >> 3;
unsigned NumBytes1 = Op1->getMemoryVT().getSizeInBits() >> 3;
if (Base1 == Base2 || (GV1 && (GV1 == GV2)) || (CV1 && (CV1 == CV2))) if (Base1 == Base2 || (GV1 && (GV1 == GV2)) || (CV1 && (CV1 == CV2)))
return !((Offset1 + (Op0->getMemoryVT().getSizeInBits() >> 3)) <= Offset2 || return !((Offset1 + NumBytes0) <= Offset2 ||
(Offset2 + (Op1->getMemoryVT().getSizeInBits() >> 3)) <= Offset1); (Offset2 + NumBytes1) <= Offset1);
// It is possible for different frame indices to alias each other, mostly // It is possible for different frame indices to alias each other, mostly
// when tail call optimization reuses return address slots for arguments. // when tail call optimization reuses return address slots for arguments.
@ -16111,8 +16113,8 @@ bool DAGCombiner::isAlias(LSBaseSDNode *Op0, LSBaseSDNode *Op1) const {
MachineFrameInfo &MFI = DAG.getMachineFunction().getFrameInfo(); MachineFrameInfo &MFI = DAG.getMachineFunction().getFrameInfo();
Offset1 += MFI.getObjectOffset(cast<FrameIndexSDNode>(Base1)->getIndex()); Offset1 += MFI.getObjectOffset(cast<FrameIndexSDNode>(Base1)->getIndex());
Offset2 += MFI.getObjectOffset(cast<FrameIndexSDNode>(Base2)->getIndex()); Offset2 += MFI.getObjectOffset(cast<FrameIndexSDNode>(Base2)->getIndex());
return !((Offset1 + (Op0->getMemoryVT().getSizeInBits() >> 3)) <= Offset2 || return !((Offset1 + NumBytes0) <= Offset2 ||
(Offset2 + (Op1->getMemoryVT().getSizeInBits() >> 3)) <= Offset1); (Offset2 + NumBytes1) <= Offset1);
} }
// Otherwise, if we know what the bases are, and they aren't identical, then // Otherwise, if we know what the bases are, and they aren't identical, then
@ -16126,16 +16128,14 @@ bool DAGCombiner::isAlias(LSBaseSDNode *Op0, LSBaseSDNode *Op1) const {
// splitting vector types. // splitting vector types.
if ((Op0->getOriginalAlignment() == Op1->getOriginalAlignment()) && if ((Op0->getOriginalAlignment() == Op1->getOriginalAlignment()) &&
(Op0->getSrcValueOffset() != Op1->getSrcValueOffset()) && (Op0->getSrcValueOffset() != Op1->getSrcValueOffset()) &&
(Op0->getMemoryVT().getSizeInBits() >> 3 == (NumBytes0 == NumBytes1) && (Op0->getOriginalAlignment() > NumBytes0)) {
Op1->getMemoryVT().getSizeInBits() >> 3) &&
(Op0->getOriginalAlignment() > (Op0->getMemoryVT().getSizeInBits() >> 3))) {
int64_t OffAlign1 = Op0->getSrcValueOffset() % Op0->getOriginalAlignment(); int64_t OffAlign1 = Op0->getSrcValueOffset() % Op0->getOriginalAlignment();
int64_t OffAlign2 = Op1->getSrcValueOffset() % Op1->getOriginalAlignment(); int64_t OffAlign2 = Op1->getSrcValueOffset() % Op1->getOriginalAlignment();
// There is no overlap between these relatively aligned accesses of similar // There is no overlap between these relatively aligned accesses of similar
// size, return no alias. // size, return no alias.
if ((OffAlign1 + (Op0->getMemoryVT().getSizeInBits() >> 3)) <= OffAlign2 || if ((OffAlign1 + NumBytes0) <= OffAlign2 ||
(OffAlign2 + (Op1->getMemoryVT().getSizeInBits() >> 3)) <= OffAlign1) (OffAlign2 + NumBytes1) <= OffAlign1)
return false; return false;
} }
@ -16152,10 +16152,8 @@ bool DAGCombiner::isAlias(LSBaseSDNode *Op0, LSBaseSDNode *Op1) const {
// Use alias analysis information. // Use alias analysis information.
int64_t MinOffset = std::min(Op0->getSrcValueOffset(), int64_t MinOffset = std::min(Op0->getSrcValueOffset(),
Op1->getSrcValueOffset()); Op1->getSrcValueOffset());
int64_t Overlap1 = (Op0->getMemoryVT().getSizeInBits() >> 3) + int64_t Overlap1 = NumBytes0 + Op0->getSrcValueOffset() - MinOffset;
Op0->getSrcValueOffset() - MinOffset; int64_t Overlap2 = NumBytes1 + Op1->getSrcValueOffset() - MinOffset;
int64_t Overlap2 = (Op1->getMemoryVT().getSizeInBits() >> 3) +
Op1->getSrcValueOffset() - MinOffset;
AliasResult AAResult = AliasResult AAResult =
AA.alias(MemoryLocation(Op0->getMemOperand()->getValue(), Overlap1, AA.alias(MemoryLocation(Op0->getMemOperand()->getValue(), Overlap1,
UseTBAA ? Op0->getAAInfo() : AAMDNodes()), UseTBAA ? Op0->getAAInfo() : AAMDNodes()),