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

[LICM] Don't require AST in LoopPromoter (NFC) 

While promotion currently always has an AST available, it is only
relevant for invalidation purposes in LoopPromoter, so we do not
need to have it as a hard dependency.
This commit is contained in:
Nikita Popov 2020-10-13 21:56:59 +02:00
parent edf415b5b2
commit 3b31f05372
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/Transforms/Scalar/LICM.cpp
View File

@ -1782,7 +1782,7 @@ class LoopPromoter : public LoadAndStorePromoter {
SmallVectorImpl<Instruction *> &LoopInsertPts; SmallVectorImpl<Instruction *> &LoopInsertPts;
SmallVectorImpl<MemoryAccess *> &MSSAInsertPts; SmallVectorImpl<MemoryAccess *> &MSSAInsertPts;
PredIteratorCache &PredCache; PredIteratorCache &PredCache;
AliasSetTracker &AST; AliasSetTracker *AST;
MemorySSAUpdater *MSSAU; MemorySSAUpdater *MSSAU;
LoopInfo &LI; LoopInfo &LI;
DebugLoc DL; DebugLoc DL;
@ -1812,7 +1812,7 @@ public:
SmallVectorImpl<BasicBlock *> &LEB, SmallVectorImpl<BasicBlock *> &LEB,
SmallVectorImpl<Instruction *> &LIP, SmallVectorImpl<Instruction *> &LIP,
SmallVectorImpl<MemoryAccess *> &MSSAIP, PredIteratorCache &PIC, SmallVectorImpl<MemoryAccess *> &MSSAIP, PredIteratorCache &PIC,
AliasSetTracker &ast, MemorySSAUpdater *MSSAU, LoopInfo &li, AliasSetTracker *ast, MemorySSAUpdater *MSSAU, LoopInfo &li,
DebugLoc dl, int alignment, bool UnorderedAtomic, DebugLoc dl, int alignment, bool UnorderedAtomic,
const AAMDNodes &AATags, ICFLoopSafetyInfo &SafetyInfo) const AAMDNodes &AATags, ICFLoopSafetyInfo &SafetyInfo)
: LoadAndStorePromoter(Insts, S), SomePtr(SP), PointerMustAliases(PMA), : LoadAndStorePromoter(Insts, S), SomePtr(SP), PointerMustAliases(PMA),
@ -1869,11 +1869,13 @@ public:
void replaceLoadWithValue(LoadInst *LI, Value *V) const override { void replaceLoadWithValue(LoadInst *LI, Value *V) const override {
// Update alias analysis. // Update alias analysis.
AST.copyValue(LI, V); if (AST)
AST->copyValue(LI, V);
} }
void instructionDeleted(Instruction *I) const override { void instructionDeleted(Instruction *I) const override {
SafetyInfo.removeInstruction(I); SafetyInfo.removeInstruction(I);
AST.deleteValue(I); if (AST)
AST->deleteValue(I);
if (MSSAU) if (MSSAU)
MSSAU->removeMemoryAccess(I); MSSAU->removeMemoryAccess(I);
} }
@ -1919,7 +1921,7 @@ bool llvm::promoteLoopAccessesToScalars(
ICFLoopSafetyInfo *SafetyInfo, OptimizationRemarkEmitter *ORE) { ICFLoopSafetyInfo *SafetyInfo, OptimizationRemarkEmitter *ORE) {
// Verify inputs. // Verify inputs.
assert(LI != nullptr && DT != nullptr && CurLoop != nullptr && assert(LI != nullptr && DT != nullptr && CurLoop != nullptr &&
CurAST != nullptr && SafetyInfo != nullptr && SafetyInfo != nullptr &&
"Unexpected Input to promoteLoopAccessesToScalars"); "Unexpected Input to promoteLoopAccessesToScalars");
Value *SomePtr = *PointerMustAliases.begin(); Value *SomePtr = *PointerMustAliases.begin();
@ -2147,7 +2149,7 @@ bool llvm::promoteLoopAccessesToScalars(
SmallVector<PHINode *, 16> NewPHIs; SmallVector<PHINode *, 16> NewPHIs;
SSAUpdater SSA(&NewPHIs); SSAUpdater SSA(&NewPHIs);
LoopPromoter Promoter(SomePtr, LoopUses, SSA, PointerMustAliases, ExitBlocks, LoopPromoter Promoter(SomePtr, LoopUses, SSA, PointerMustAliases, ExitBlocks,
InsertPts, MSSAInsertPts, PIC, *CurAST, MSSAU, *LI, DL, InsertPts, MSSAInsertPts, PIC, CurAST, MSSAU, *LI, DL,
Alignment.value(), SawUnorderedAtomic, AATags, Alignment.value(), SawUnorderedAtomic, AATags,
*SafetyInfo); *SafetyInfo);