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

[DAG] Move extload check in store merge. NFC. 

Move candidate check from later check to initial candidate check.

llvm-svn: 309698
This commit is contained in:
Nirav Dave 2017-08-01 16:00:47 +00:00
parent 4bf1d7ad81
commit b5a0af6b6e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12569,7 +12569,6 @@ void DAGCombiner::getStoreMergeCandidates(
if (IsLoadSrc) if (IsLoadSrc)
LBasePtr = BaseIndexOffset::match( LBasePtr = BaseIndexOffset::match(
cast<LoadSDNode>(St->getValue())->getBasePtr(), DAG); cast<LoadSDNode>(St->getValue())->getBasePtr(), DAG);
auto CandidateMatch = [&](StoreSDNode *Other, BaseIndexOffset &Ptr, auto CandidateMatch = [&](StoreSDNode *Other, BaseIndexOffset &Ptr,
int64_t &Offset) -> bool { int64_t &Offset) -> bool {
if (Other->isVolatile() || Other->isIndexed()) if (Other->isVolatile() || Other->isIndexed())
@ -12583,6 +12582,9 @@ void DAGCombiner::getStoreMergeCandidates(
// The Load's Base Ptr must also match // The Load's Base Ptr must also match
if (LoadSDNode *OtherLd = dyn_cast<LoadSDNode>(Other->getValue())) { if (LoadSDNode *OtherLd = dyn_cast<LoadSDNode>(Other->getValue())) {
auto LPtr = BaseIndexOffset::match(OtherLd->getBasePtr(), DAG); auto LPtr = BaseIndexOffset::match(OtherLd->getBasePtr(), DAG);
// We do not handle extended loads
if (OtherLd->getExtensionType() != ISD::NON_EXTLOAD)
return false;
if (!(LBasePtr.equalBaseIndex(LPtr, DAG))) if (!(LBasePtr.equalBaseIndex(LPtr, DAG)))
return false; return false;
} else } else
@ -12938,10 +12940,6 @@ bool DAGCombiner::MergeConsecutiveStores(StoreSDNode *St) {
if (Ld->isVolatile() || Ld->isIndexed()) if (Ld->isVolatile() || Ld->isIndexed())
break; break;
// We do not accept ext loads.
if (Ld->getExtensionType() != ISD::NON_EXTLOAD)
break;
// The stored memory type must be the same. // The stored memory type must be the same.
if (Ld->getMemoryVT() != MemVT) if (Ld->getMemoryVT() != MemVT)
break; break;