[llvm] r345914 - [NFC][LICM] Factor out instruction erasing logic
Max Kazantsev via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 1 17:21:46 PDT 2018
Author: mkazantsev
Date: Thu Nov 1 17:21:45 2018
New Revision: 345914
URL: http://llvm.org/viewvc/llvm-project?rev=345914&view=rev
Log:
[NFC][LICM] Factor out instruction erasing logic
This patch factors out a function that makes all required updates
whenever an instruction gets erased.
Differential Revision: https://reviews.llvm.org/D54011
Reviewed By: apilipenko
Modified:
llvm/trunk/lib/Transforms/Scalar/LICM.cpp
Modified: llvm/trunk/lib/Transforms/Scalar/LICM.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LICM.cpp?rev=345914&r1=345913&r2=345914&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LICM.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LICM.cpp Thu Nov 1 17:21:45 2018
@@ -123,6 +123,8 @@ CloneInstructionInExitBlock(Instruction
const LoopInfo *LI,
const LoopSafetyInfo *SafetyInfo);
+static void eraseInstruction(Instruction &I, AliasSetTracker *AST);
+
namespace {
struct LoopInvariantCodeMotion {
using ASTrackerMapTy = DenseMap<Loop *, std::unique_ptr<AliasSetTracker>>;
@@ -404,8 +406,7 @@ bool llvm::sinkRegion(DomTreeNode *N, Al
LLVM_DEBUG(dbgs() << "LICM deleting dead inst: " << I << '\n');
salvageDebugInfo(I);
++II;
- CurAST->deleteValue(&I);
- I.eraseFromParent();
+ eraseInstruction(I, CurAST);
Changed = true;
continue;
}
@@ -422,8 +423,7 @@ bool llvm::sinkRegion(DomTreeNode *N, Al
if (sink(I, LI, DT, CurLoop, SafetyInfo, ORE, FreeInLoop)) {
if (!FreeInLoop) {
++II;
- CurAST->deleteValue(&I);
- I.eraseFromParent();
+ eraseInstruction(I, CurAST);
}
Changed = true;
}
@@ -480,10 +480,8 @@ bool llvm::hoistRegion(DomTreeNode *N, A
<< '\n');
CurAST->copyValue(&I, C);
I.replaceAllUsesWith(C);
- if (isInstructionTriviallyDead(&I, TLI)) {
- CurAST->deleteValue(&I);
- I.eraseFromParent();
- }
+ if (isInstructionTriviallyDead(&I, TLI))
+ eraseInstruction(I, CurAST);
Changed = true;
continue;
}
@@ -519,7 +517,7 @@ bool llvm::hoistRegion(DomTreeNode *N, A
Product->setFastMathFlags(I.getFastMathFlags());
Product->insertAfter(&I);
I.replaceAllUsesWith(Product);
- I.eraseFromParent();
+ eraseInstruction(I, CurAST);
hoist(*ReciprocalDivisor, DT, CurLoop, SafetyInfo, ORE);
Changed = true;
@@ -888,6 +886,12 @@ CloneInstructionInExitBlock(Instruction
return New;
}
+static void eraseInstruction(Instruction &I, AliasSetTracker *AST) {
+ if (AST)
+ AST->deleteValue(&I);
+ I.eraseFromParent();
+}
+
static Instruction *sinkThroughTriviallyReplaceablePHI(
PHINode *TPN, Instruction *I, LoopInfo *LI,
SmallDenseMap<BasicBlock *, Instruction *, 32> &SunkCopies,
@@ -1086,7 +1090,7 @@ static bool sink(Instruction &I, LoopInf
Instruction *New = sinkThroughTriviallyReplaceablePHI(PN, &I, LI, SunkCopies,
SafetyInfo, CurLoop);
PN->replaceAllUsesWith(New);
- PN->eraseFromParent();
+ eraseInstruction(*PN, nullptr);
Changed = true;
}
return Changed;
@@ -1516,7 +1520,7 @@ bool llvm::promoteLoopAccessesToScalars(
// If the SSAUpdater didn't use the load in the preheader, just zap it now.
if (PreheaderLoad->use_empty())
- PreheaderLoad->eraseFromParent();
+ eraseInstruction(*PreheaderLoad, CurAST);
return true;
}
More information about the llvm-commits
mailing list