Simplify RecursivelyDeleteDeadPHINode. The only functionality change

should be that if the phi is used by a side-effect free instruction with
no uses then the phi and the instruction now get zapped (checked by the
unittest).

llvm-svn: 126124
This commit is contained in:
Duncan Sands 2011-02-21 16:27:36 +00:00
parent 5decec97e5
commit 6dcd49bc2b
2 changed files with 22 additions and 28 deletions

View File

@ -262,12 +262,13 @@ bool llvm::RecursivelyDeleteTriviallyDeadInstructions(Value *V) {
/// areAllUsesEqual - Check whether the uses of a value are all the same. /// areAllUsesEqual - Check whether the uses of a value are all the same.
/// This is similar to Instruction::hasOneUse() except this will also return /// This is similar to Instruction::hasOneUse() except this will also return
/// true when there are multiple uses that all refer to the same value. /// true when there are no uses or multiple uses that all refer to the same
/// value.
static bool areAllUsesEqual(Instruction *I) { static bool areAllUsesEqual(Instruction *I) {
Value::use_iterator UI = I->use_begin(); Value::use_iterator UI = I->use_begin();
Value::use_iterator UE = I->use_end(); Value::use_iterator UE = I->use_end();
if (UI == UE) if (UI == UE)
return false; return true;
User *TheUse = *UI; User *TheUse = *UI;
for (++UI; UI != UE; ++UI) { for (++UI; UI != UE; ++UI) {
@ -283,34 +284,21 @@ static bool areAllUsesEqual(Instruction *I) {
/// delete it. If that makes any of its operands trivially dead, delete them /// delete it. If that makes any of its operands trivially dead, delete them
/// too, recursively. Return true if the PHI node is actually deleted. /// too, recursively. Return true if the PHI node is actually deleted.
bool llvm::RecursivelyDeleteDeadPHINode(PHINode *PN) { bool llvm::RecursivelyDeleteDeadPHINode(PHINode *PN) {
if (PN->use_empty()) { SmallPtrSet<Instruction*, 4> Visited;
PN->eraseFromParent(); for (Instruction *I = PN; areAllUsesEqual(I) && !I->mayHaveSideEffects();
return true; I = cast<Instruction>(*I->use_begin())) {
} if (I->use_empty())
return RecursivelyDeleteTriviallyDeadInstructions(I);
// We can remove a PHI if it is on a cycle in the def-use graph // If we find an instruction more than once, we're on a cycle that
// where each node in the cycle has degree one, i.e. only one use,
// and is an instruction with no side effects.
if (!areAllUsesEqual(PN))
return false;
bool Changed = false;
SmallPtrSet<PHINode *, 4> PHIs;
PHIs.insert(PN);
for (Instruction *I = cast<Instruction>(*PN->use_begin());
areAllUsesEqual(I) && !I->mayHaveSideEffects();
I = cast<Instruction>(*I->use_begin()))
// If we find a PHI more than once, we're on a cycle that
// won't prove fruitful. // won't prove fruitful.
if (PHINode *IP = dyn_cast<PHINode>(I)) if (!Visited.insert(I)) {
if (!PHIs.insert(IP)) { // Break the cycle and delete the instruction and its operands.
// Break the cycle and delete the PHI and its operands. I->replaceAllUsesWith(UndefValue::get(I->getType()));
IP->replaceAllUsesWith(UndefValue::get(IP->getType())); return RecursivelyDeleteTriviallyDeadInstructions(I);
(void)RecursivelyDeleteTriviallyDeadInstructions(IP);
Changed = true;
break;
} }
return Changed; }
return false;
} }
/// SimplifyInstructionsInBlock - Scan the specified basic block and try to /// SimplifyInstructionsInBlock - Scan the specified basic block and try to

View File

@ -47,6 +47,12 @@ TEST(Local, RecursivelyDeleteDeadPHINodes) {
EXPECT_TRUE(RecursivelyDeleteDeadPHINode(phi)); EXPECT_TRUE(RecursivelyDeleteDeadPHINode(phi));
builder.SetInsertPoint(bb0);
phi = builder.CreatePHI(Type::getInt32Ty(C));
builder.CreateAdd(phi, phi);
EXPECT_TRUE(RecursivelyDeleteDeadPHINode(phi));
bb0->dropAllReferences(); bb0->dropAllReferences();
bb1->dropAllReferences(); bb1->dropAllReferences();
delete bb0; delete bb0;