Index: lib/Transforms/Scalar/ADCE.cpp
===================================================================
--- lib/Transforms/Scalar/ADCE.cpp
+++ lib/Transforms/Scalar/ADCE.cpp
@@ -26,6 +26,7 @@
#include "llvm/IR/BasicBlock.h"
#include "llvm/IR/CFG.h"
#include "llvm/IR/DebugInfoMetadata.h"
+#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/InstIterator.h"
#include "llvm/IR/Instructions.h"
#include "llvm/IR/IntrinsicInst.h"
@@ -37,11 +38,17 @@
#define DEBUG_TYPE "adce"
STATISTIC(NumRemoved, "Number of instructions removed");
+STATISTIC(NumBranchesRemoved, "Number of branch instructions removed");
// This is a tempoary option until we change the interface
// to this pass based on optimization level.
static cl::opt<bool> RemoveControlFlowFlag("adce-remove-control-flow",
- cl::init(false), cl::Hidden);
+ cl::init(true), cl::Hidden);
+
+// This option enables removing of may-be-infinite loops which have no other
+// effect.
+static cl::opt<bool> RemoveLoops("adce-remove-loops", cl::init(false),
+ cl::Hidden);
namespace {
/// Information about Instructions
@@ -97,8 +104,9 @@
/// Set of blocks with not known to have live terminators.
SmallPtrSet<BasicBlock *, 16> BlocksWithDeadTerminators;
- /// The set of blocks which we have determined are live in the
- /// most recent iteration of propagating liveness.
+ /// The set of blocks which we have determined whose control
+ /// dependence sources must be live and which have not had
+ /// those dependences analyized.
SmallPtrSet<BasicBlock *, 16> NewLiveBlocks;
/// Set up auxiliary data structures for Instructions and BasicBlocks and
@@ -113,7 +121,10 @@
void markLiveInstructions();
/// Mark an instruction as live.
void markLive(Instruction *I);
-
+ /// Mark a block as live.
+ void markLive(BlockInfoType &BB);
+ void markLive(BasicBlock *BB) { markLive(BlockInfo[BB]); }
+
/// Mark terminators of control predecessors of a PHI node live.
void markPhiLive(PHINode *PN);
@@ -130,6 +141,18 @@
/// was removed.
bool removeDeadInstructions();
+ /// Identify connected sections of the control flow grap which have
+ /// dead terminators and rewrite the control flow graph to remove them.
+ void updateDeadRegions();
+ void updateDeadRegions(BasicBlock *BB,
+ SmallPtrSet<BasicBlock *, 16> *VisitedBlocks);
+
+ /// Make the terminator of this block an unconditional branch to \p Target.
+ void makeUnconditional(BasicBlock *BB, BasicBlock *Target);
+ /// The collection of unconditional branch instructions created
+ /// by makeUnconditional.
+ SmallVector<Instruction *, 16> NewBranches;
+
public:
AggressiveDeadCodeElimination(Function &F, PostDominatorTree &PDT)
: F(F), PDT(PDT) {}
@@ -186,23 +209,45 @@
if (!RemoveControlFlowFlag)
return;
- // This is temporary: will update with post order traveral to
- // find loop bottoms
- SmallPtrSet<BasicBlock *, 16> Seen;
- for (auto &BB : F) {
- Seen.insert(&BB);
- TerminatorInst *Term = BB.getTerminator();
- if (isLive(Term))
- continue;
+ if (!RemoveLoops) {
- for (auto Succ : successors(&BB))
- if (Seen.count(Succ)) {
- // back edge....
- markLive(Term);
+ // Iterate over blocks in lexical order and
+ // treat all edges to a block already seen as loop back edges
+ // and mark the branch live it if there is a back edge.
+ SmallPtrSet<BasicBlock *, 16> Seen;
+ for (auto &BB : F) {
+ Seen.insert(&BB);
+ TerminatorInst *Term = BB.getTerminator();
+ if (isLive(Term))
+ continue;
+
+ for (auto Succ : successors(&BB))
+ if (Seen.count(Succ)) {
+ // back edge....
+ markLive(Term);
+ break;
+ }
+ }
+ }
+
+ // Mark blocks live if there is no path from the block to the
+ // return of the function or a successor for which this is true.
+ // This protects IDFCalculator which cannot handle such blocks.
+ for (auto &BBInfoPair : BlockInfo) {
+ auto &BBInfo = BBInfoPair.second;
+ if (BBInfo.terminatorIsLive())
+ continue;
+ auto *BB = BBInfo.BB;
+ if (!PDT.getNode(BB)) {
+ markLive(BBInfo.Terminator);
+ continue;
+ }
+ for (auto Succ : successors(BB))
+ if (!PDT.getNode(Succ)) {
+ markLive(BBInfo.Terminator);
break;
}
}
- // End temporary handling of loops.
// Mark blocks live if there is no path from the block to the
// return of the function or a successor for which this is true.
@@ -278,32 +323,19 @@
Instruction *LiveInst = Worklist.pop_back_val();
DEBUG(dbgs() << "work live: "; LiveInst->dump(););
- // Collect the live debug info scopes attached to this instruction.
- if (const DILocation *DL = LiveInst->getDebugLoc())
- collectLiveScopes(*DL);
-
for (Use &OI : LiveInst->operands())
if (Instruction *Inst = dyn_cast<Instruction>(OI))
markLive(Inst);
-
+
if (auto *PN = dyn_cast<PHINode>(LiveInst))
markPhiLive(PN);
}
+
+ // After data flow liveness has been identified, examine which branch
+ // decisions are required to determine live instructions are executed.
markLiveBranchesFromControlDependences();
- if (Worklist.empty()) {
- // Temporary until we can actually delete branches.
- SmallVector<TerminatorInst *, 16> DeadTerminators;
- for (auto *BB : BlocksWithDeadTerminators)
- DeadTerminators.push_back(BB->getTerminator());
- for (auto *I : DeadTerminators)
- markLive(I);
- assert(BlocksWithDeadTerminators.empty());
- // End temporary.
- }
} while (!Worklist.empty());
-
- assert(BlocksWithDeadTerminators.empty());
}
void AggressiveDeadCodeElimination::markLive(Instruction *I) {
@@ -316,13 +348,26 @@
Info.Live = true;
Worklist.push_back(I);
+ // Collect the live debug info scopes attached to this instruction.
+ if (const DILocation *DL = I->getDebugLoc())
+ collectLiveScopes(*DL);
+
// Mark the containing block live
auto &BBInfo = *Info.Block;
- if (BBInfo.Terminator == I)
+ if (BBInfo.Terminator == I) {
BlocksWithDeadTerminators.erase(BBInfo.BB);
+ // For live terminators, mark destination blocks
+ // live to preserve this control flow edges.
+ if (!BBInfo.UnconditionalBranch)
+ for (auto *BB : successors(I->getParent()))
+ markLive(BB);
+ }
+ markLive(BBInfo);
+}
+
+void AggressiveDeadCodeElimination::markLive(BlockInfoType &BBInfo) {
if (BBInfo.Live)
return;
-
DEBUG(dbgs() << "mark block live: " << BBInfo.BB->getName() << '\n');
BBInfo.Live = true;
if (!BBInfo.CFLive) {
@@ -332,7 +377,7 @@
// Mark unconditional branches at the end of live
// blocks as live since there is no work to do for them later
- if (BBInfo.UnconditionalBranch && I != BBInfo.Terminator)
+ if (BBInfo.UnconditionalBranch)
markLive(BBInfo.Terminator);
}
@@ -421,8 +466,38 @@
//===----------------------------------------------------------------------===//
bool AggressiveDeadCodeElimination::removeDeadInstructions() {
+ // Updates control and dataflow around dead blocks
+ updateDeadRegions();
+
+ // Mark newly inserted branches live; as a side effect loop invalidates the
+ // pointers stored in BlockInfo.
+ for (Instruction *I : NewBranches)
+ InstInfo[I].Live = true;
+
+ DEBUG({
+ for (Instruction &I : instructions(F)) {
+ // Check if the instruction is alive.
+ if (isLive(&I))
+ continue;
+
+ if (auto *DII = dyn_cast<DbgInfoIntrinsic>(&I)) {
+ // Check if the scope of this variable location is alive.
+ if (AliveScopes.count(DII->getDebugLoc()->getScope()))
+ continue;
+
+ // If intrinsic is pointing at a live SSA value, there may be an
+ // earlier optimization bug: if we know the location of the variable,
+ // why isn't the scope of the location alive?
+ if (Value *V = DII->getVariableLocation())
+ if (Instruction *II = dyn_cast<Instruction>(V))
+ if (isLive(II))
+ dbgs() << "Dropping debug info for " << *DII << "\n";
+ }
+ }
+ });
+
// The inverse of the live set is the dead set. These are those instructions
- // which have no side effects and do not influence the control flow or return
+ // that have no side effects and do not influence the control flow or return
// value of the function, and may therefore be deleted safely.
// NOTE: We reuse the Worklist vector here for memory efficiency.
for (Instruction &I : instructions(F)) {
@@ -430,23 +505,12 @@
if (isLive(&I))
continue;
- assert(!I.isTerminator() && "NYI: Removing Control Flow");
-
if (auto *DII = dyn_cast<DbgInfoIntrinsic>(&I)) {
// Check if the scope of this variable location is alive.
if (AliveScopes.count(DII->getDebugLoc()->getScope()))
continue;
// Fallthrough and drop the intrinsic.
- DEBUG({
- // If intrinsic is pointing at a live SSA value, there may be an
- // earlier optimization bug: if we know the location of the variable,
- // why isn't the scope of the location alive?
- if (Value *V = DII->getVariableLocation())
- if (Instruction *II = dyn_cast<Instruction>(V))
- if (isLive(II))
- dbgs() << "Dropping debug info for " << *DII << "\n";
- });
}
// Prepare to delete.
@@ -459,9 +523,163 @@
I->eraseFromParent();
}
+ for (auto BB : BlocksWithDeadTerminators) {
+ auto &DB = BlockInfo[BB];
+ if (!DB.Live) {
+ NumBranchesRemoved += 1;
+ DB.BB->eraseFromParent();
+ }
+ }
+
return !Worklist.empty();
}
+// A dead region is the set of dead blocks with a common live post-dominator.
+void AggressiveDeadCodeElimination::updateDeadRegions() {
+
+ DEBUG({
+ dbgs() << "final dead terminator blocks: " << '\n';
+ for (auto *BB : BlocksWithDeadTerminators)
+ dbgs() << '\t' << BB->getName()
+ << (BlockInfo[BB].Live ? " LIVE\n" : "\n");
+ });
+
+ // Set of blocks processed so far.
+ SmallPtrSet<BasicBlock *, 16> VisitedBlocks;
+
+ // Find an unprocsesed block which identifies a new dead region.
+ for (BasicBlock *BB : BlocksWithDeadTerminators) {
+ if (!VisitedBlocks.insert(BB).second)
+ continue;
+ updateDeadRegions(BB, &VisitedBlocks);
+ }
+}
+
+void AggressiveDeadCodeElimination::updateDeadRegions(
+ BasicBlock *BB, SmallPtrSet<BasicBlock *, 16> *VisitedBlocks) {
+
+ // Gather all basic blocks in a connected region
+ // of dead blocks.
+ SmallPtrSet<BasicBlock *, 16> DeadRegionBlocks;
+
+ // Live blocks which are control flow predecessors of some block
+ // in this region.
+ SmallPtrSet<BasicBlock *, 16> LivePredecessors;
+
+ // The unique live post-dominator for this set of blocks.
+ BasicBlock *LivePDOM = nullptr;
+
+ // Explore the connected component
+ SmallVector<BasicBlock *, 16> DeadWorklist;
+ auto addDeadBlock = [VisitedBlocks, &DeadWorklist](BasicBlock *BB) {
+ if (VisitedBlocks->insert(BB).second)
+ DeadWorklist.push_back(BB);
+ };
+
+ // Find connected component of dead blocks.
+ DeadWorklist.push_back(BB);
+ while (!DeadWorklist.empty()) {
+ BasicBlock *BB = DeadWorklist.pop_back_val();
+ assert(!isLive(BB->getTerminator()));
+ DeadRegionBlocks.insert(BB);
+
+ // If this block is not live, then scan to see if there
+ // are predecessors blocks which also have dead terminators and
+ // should be part of this region.
+ if (!BlockInfo[BB].Live) {
+ for (auto PredBB : predecessors(BB)) {
+ if (BlocksWithDeadTerminators.count(PredBB))
+ addDeadBlock(PredBB);
+ else
+ LivePredecessors.insert(PredBB);
+ }
+ } else
+ LivePredecessors.insert(BB);
+
+ // Scan for dead successors. A live successor will be the
+ // unique post-dominator for all of the blocks in this region.
+ for (auto SuccBB : successors(BB)) {
+ if (!BlockInfo[SuccBB].Live)
+ addDeadBlock(SuccBB);
+ else if (LivePDOM)
+ assert(LivePDOM == SuccBB);
+ else
+ LivePDOM = SuccBB;
+ }
+ }
+
+ // Update each live phi based on the new incoming edges.
+ for (auto it = LivePDOM->begin(); PHINode *PN = dyn_cast<PHINode>(it); ++it) {
+ if (!isLive(PN))
+ continue;
+
+ // Unique value which reaches LivePDOM from any predecessor in
+ // DeadRegionBlocks.
+ Value *DeadPathValue = nullptr;
+
+ // Remove reaching definitions from dead predecessors, record reaching value
+ // from these dead blocks.
+ for (int64_t i = PN->getNumIncomingValues() - 1; i >= 0; --i) {
+ auto *PredBB = PN->getIncomingBlock(i);
+ if (DeadRegionBlocks.count(PredBB) == 0)
+ continue;
+
+ if (!DeadPathValue)
+ DeadPathValue = PN->getIncomingValue(i);
+ else
+ assert(DeadPathValue == PN->getIncomingValue(i));
+ PN->removeIncomingValue(i, /*DeletePHIIfEmpty*/ false);
+ }
+ assert(DeadPathValue && "Failed to find value for dead predecessor");
+ // Add edges from live predecessors.
+ for (auto PredBB : LivePredecessors)
+ PN->addIncoming(DeadPathValue, PredBB);
+ }
+
+ // Update control flow edges to bypass dead blocks.
+ for (auto PredBB : LivePredecessors) {
+ auto PredTerm = PredBB->getTerminator();
+ if (!isLive(PredBB->getTerminator())) {
+ // This is a live block but the terminator is not live so all
+ // control reaches the LivePdom, so we make the terminator
+ // an unconditional branch to that destination (B29 in the example
+ // above).
+ makeUnconditional(PredBB, LivePDOM);
+ continue;
+ }
+
+ auto NumSucc = PredTerm->getNumSuccessors();
+ for (unsigned Idx = 0; Idx != NumSucc; ++Idx) {
+ auto Succ = PredTerm->getSuccessor(Idx);
+ if (DeadRegionBlocks.count(Succ))
+ PredTerm->setSuccessor(Idx, LivePDOM);
+ }
+ }
+}
+
+void AggressiveDeadCodeElimination::makeUnconditional(BasicBlock *BB,
+ BasicBlock *Target) {
+ TerminatorInst *PredTerm = BB->getTerminator();
+ // Collect the live debug info scopes attached to this instruction.
+ if (const DILocation *DL = PredTerm->getDebugLoc())
+ collectLiveScopes(*DL);
+
+ // Just mark live an existing unconditional branch
+ if (isUnconditionalBranch(PredTerm)) {
+ PredTerm->setSuccessor(0, Target);
+ InstInfo[PredTerm].Live = true;
+ return;
+ }
+ DEBUG(dbgs() << "making unconditional " << BB->getName() << '\n');
+ NumBranchesRemoved += 1;
+ IRBuilder<> Builder(PredTerm);
+ auto NewTerm = Builder.CreateBr(Target);
+ // Don't update InstInfo to protect pointers into it from BlockInfoVec
+ NewBranches.push_back(NewTerm);
+ if (const DILocation *DL = PredTerm->getDebugLoc())
+ NewTerm->setDebugLoc(DL);
+}
+
//===----------------------------------------------------------------------===//
//
// Pass Manager integration code
@@ -494,7 +712,8 @@
void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.addRequired<PostDominatorTreeWrapperPass>();
- AU.setPreservesCFG(); // TODO -- will remove when we start removing branches
+ if (!RemoveControlFlowFlag)
+ AU.setPreservesCFG();
AU.addPreserved<GlobalsAAWrapperPass>();
}
};
Index: test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
===================================================================
--- test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
+++ test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
@@ -4,7 +4,8 @@
; removed even though there were uses still around. Now the uses are filled
; in with a dummy value before the PHI is deleted.
;
-; RUN: opt < %s -adce
+; RUN: opt < %s -S -adce | grep bb1
+; RUN: opt < %s -S -adce -adce-remove-loops | FileCheck %s
%node_t = type { double*, %node_t*, %node_t**, double**, double*, i32, i32 }
@@ -14,6 +15,8 @@
store %node_t* %nodelist, %node_t** %nodelist.upgrd.1
br label %bb1
+; CHECK-NOT: bb1:
+; CHECK-NOT: bb2:
bb1: ; preds = %bb0
%reg107 = load %node_t*, %node_t** %nodelist.upgrd.1 ; <%node_t*> [#uses=2]
%cond211 = icmp eq %node_t* %reg107, null ; <i1> [#uses=1]
Index: test/Transforms/ADCE/2002-05-28-Crash-distilled.ll
===================================================================
--- test/Transforms/ADCE/2002-05-28-Crash-distilled.ll
+++ test/Transforms/ADCE/2002-05-28-Crash-distilled.ll
@@ -1,12 +1,14 @@
; This testcase is a distilled form of: 2002-05-28-Crash.ll
; RUN: opt < %s -adce
+; RUN: opt < %s -adce -adce-remove-loops -S | FileCheck %s
define float @test(i32 %i) {
%F = sitofp i32 %i to float ; <float> [#uses=1]
%I = bitcast i32 %i to i32 ; <i32> [#uses=1]
br label %Loop
+; CHECK-NOT: Loop:
Loop: ; preds = %Loop, %0
%B = icmp ne i32 %I, 0 ; <i1> [#uses=1]
br i1 %B, label %Out, label %Loop
Index: test/Transforms/ADCE/2002-05-28-Crash.ll
===================================================================
--- test/Transforms/ADCE/2002-05-28-Crash.ll
+++ test/Transforms/ADCE/2002-05-28-Crash.ll
@@ -12,6 +12,7 @@
;}
;
; RUN: opt < %s -adce
+; RUN: opt < %s -adce -adce-remove-loops -S | FileCheck %s
define i32 @rx_bitset_empty(i32 %size, i32* %set) {
bb1:
@@ -30,6 +31,7 @@
%cond232 = icmp ne i32 %reg125, 0 ; <i1> [#uses=1]
br i1 %cond232, label %bb3, label %bb2
+; CHECK-NOT: bb2:
bb2: ; preds = %bb2, %bb1
%cann-indvar = phi i32 [ 0, %bb1 ], [ %add1-indvar, %bb2 ] ; <i32> [#uses=2]
%reg130-scale = mul i32 %cann-indvar, -1 ; <i32> [#uses=1]
Index: test/Transforms/ADCE/2002-07-17-AssertionFailure.ll
===================================================================
--- test/Transforms/ADCE/2002-07-17-AssertionFailure.ll
+++ test/Transforms/ADCE/2002-07-17-AssertionFailure.ll
@@ -3,11 +3,12 @@
; block in this function, it would work fine, but that would be the part we
; have to fix now, wouldn't it....
;
-; RUN: opt < %s -adce
+; RUN: opt < %s -adce -S | FileCheck %s
define void @foo(i8* %reg5481) {
%cast611 = bitcast i8* %reg5481 to i8** ; <i8**> [#uses=1]
%reg162 = load i8*, i8** %cast611 ; <i8*> [#uses=1]
+; CHECK-NOT: ptrtoint
ptrtoint i8* %reg162 to i32 ; <i32>:1 [#uses=0]
ret void
}
Index: test/Transforms/ADCE/2002-07-17-PHIAssertion.ll
===================================================================
--- test/Transforms/ADCE/2002-07-17-PHIAssertion.ll
+++ test/Transforms/ADCE/2002-07-17-PHIAssertion.ll
@@ -1,6 +1,6 @@
; This testcase was extracted from the gzip SPEC benchmark
;
-; RUN: opt < %s -adce
+; RUN: opt < %s -adce | FileCheck %s
@bk = external global i32 ; <i32*> [#uses=2]
@hufts = external global i32 ; <i32*> [#uses=1]
@@ -16,6 +16,8 @@
bb3: ; preds = %bb2
br label %UnifiedExitNode
+; CHECK-NOT: bb4:
+; CHECK-NOT: bb5:
bb4: ; preds = %bb2
%reg117 = load i32, i32* @hufts ; <i32> [#uses=2]
%cond241 = icmp ule i32 %reg117, %reg128 ; <i1> [#uses=1]
Index: test/Transforms/ADCE/2002-07-29-Segfault.ll
===================================================================
--- test/Transforms/ADCE/2002-07-29-Segfault.ll
+++ test/Transforms/ADCE/2002-07-29-Segfault.ll
@@ -1,4 +1,5 @@
; RUN: opt < %s -adce -disable-output
+; RUN: opt < %s -adce -disable-output -adce-remove-loops
define void @test() {
br label %BB3
Index: test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll
===================================================================
--- test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll
+++ test/Transforms/ADCE/2003-01-22-PredecessorProblem.ll
@@ -1,14 +1,17 @@
; Testcase reduced from 197.parser by bugpoint
; RUN: opt < %s -adce
+; RUN: opt < %s -adce -adce-remove-loops -S | FileCheck %s
define void @conjunction_prune() {
; <label>:0
br label %bb19
+; CHECK-NOT: bb19:
bb19: ; preds = %bb23, %bb22, %0
%reg205 = phi i8* [ null, %bb22 ], [ null, %bb23 ], [ null, %0 ] ; <i8*> [#uses=1]
br i1 false, label %bb21, label %bb22
+; CHECK-NOT: bb21:
bb21: ; preds = %bb19
%cast455 = bitcast i8* %reg205 to i8** ; <i8**> [#uses=0]
br label %bb22
Index: test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll
===================================================================
--- test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll
+++ test/Transforms/ADCE/2003-04-25-PHIPostDominateProblem.ll
@@ -2,7 +2,8 @@
; entries for it's postdominator. But I think this can only happen when the
; PHI node is dead, so we just avoid patching up dead PHI nodes.
-; RUN: opt < %s -adce
+; RUN: opt < %s -adce -S | FileCheck %s
+; RUN: opt < %s -adce -adce-remove-loops -S | FileCheck %s
target datalayout = "e-p:32:32"
@@ -14,6 +15,8 @@
%k.1 = phi i32 [ %k.0, %endif ], [ 0, %entry ] ; <i32> [#uses=1]
br i1 false, label %no_exit, label %return
+; CHECK-NOT: then:
+; CHECK-NOT: else:
no_exit: ; preds = %loopentry
br i1 false, label %then, label %else
Index: test/Transforms/ADCE/2003-06-11-InvalidCFG.ll
===================================================================
--- test/Transforms/ADCE/2003-06-11-InvalidCFG.ll
+++ test/Transforms/ADCE/2003-06-11-InvalidCFG.ll
@@ -1,4 +1,5 @@
; RUN: opt < %s -adce -disable-output
+; RUN: opt < %s -adce -adce-remove-loops -disable-output
@G = external global i32* ; <i32**> [#uses=1]
Index: test/Transforms/ADCE/2003-06-24-BadSuccessor.ll
===================================================================
--- test/Transforms/ADCE/2003-06-24-BadSuccessor.ll
+++ test/Transforms/ADCE/2003-06-24-BadSuccessor.ll
@@ -1,4 +1,6 @@
; RUN: opt < %s -adce -disable-output
+; RUN: opt < %s -adce -adce-remove-loops=true -disable-output
+
target datalayout = "e-p:32:32"
%struct..CppObjTypeDesc = type { i32, i16, i16 }
%struct..TypeToken = type { i32, i16, i16 }
@@ -30,6 +32,7 @@
br i1 false, label %no_exit.1, label %loopentry.0
no_exit.1: ; preds = %loopentry.1
+; CHECK: switch
switch i32 0, label %label.17 [
i32 2, label %label.11
i32 19, label %label.10
Index: test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
===================================================================
--- test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
+++ test/Transforms/ADCE/2003-06-24-BasicFunctionality.ll
@@ -1,4 +1,5 @@
-; RUN: opt < %s -adce -simplifycfg -S | not grep then:
+; RUN: opt < %s -adce -S | FileCheck %s
+; RUN: opt < %s -adce -adce-remove-loops -S | FileCheck %s
define void @dead_test8(i32* %data.1, i32 %idx.1) {
entry:
@@ -20,6 +21,10 @@
%tmp.161 = icmp ne i32 %k.1, %tmp.14 ; <i1> [#uses=1]
br i1 %tmp.161, label %then, label %else
+; CHECK-NOT: %tmp.161
+; CHECK-NOT: then:
+; CHECK-NOT: else
+
then: ; preds = %no_exit
%inc.0 = add i32 %k.1, 1 ; <i32> [#uses=1]
br label %endif
Index: test/Transforms/ADCE/2003-09-15-InfLoopCrash.ll
===================================================================
--- test/Transforms/ADCE/2003-09-15-InfLoopCrash.ll
+++ test/Transforms/ADCE/2003-09-15-InfLoopCrash.ll
@@ -1,4 +1,5 @@
; RUN: opt < %s -adce -disable-output
+; RUN: opt < %s -adce -adce-remove-loops -disable-output
define i32 @main() {
br label %loop
Index: test/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll
===================================================================
--- test/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll
+++ test/Transforms/ADCE/2003-11-16-MissingPostDominanceInfo.ll
@@ -1,4 +1,6 @@
; RUN: opt < %s -adce -simplifycfg -S | grep call
+; RUN: opt < %s -adce -adce-remove-loops -simplifycfg -S | grep call
+
declare void @exit(i32)
define i32 @main(i32 %argc) {
Index: test/Transforms/ADCE/2004-05-04-UnreachableBlock.ll
===================================================================
--- test/Transforms/ADCE/2004-05-04-UnreachableBlock.ll
+++ test/Transforms/ADCE/2004-05-04-UnreachableBlock.ll
@@ -1,4 +1,5 @@
; RUN: opt < %s -adce -disable-output
+; RUN: opt < %s -adce -adce-remove-loops -disable-output
define void @test() {
entry:
Index: test/Transforms/ADCE/2016-09-06.ll
===================================================================
--- /dev/null
+++ test/Transforms/ADCE/2016-09-06.ll
@@ -0,0 +1,59 @@
+; RUN: opt < %s -sroa -adce -adce-remove-loops -S | FileCheck %s
+; ModuleID = 'test1.bc'
+source_filename = "test1.c"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+; Function Attrs: nounwind uwtable
+define i32 @foo(i32, i32, i32) #0 {
+ %4 = alloca i32, align 4
+ %5 = alloca i32, align 4
+ %6 = alloca i32, align 4
+ %7 = alloca i32, align 4
+ %8 = alloca i32, align 4
+ store i32 %0, i32* %4, align 4
+ store i32 %1, i32* %5, align 4
+ store i32 %2, i32* %6, align 4
+ store i32 0, i32* %7, align 4
+ %9 = load i32, i32* %5, align 4
+ %I10 = icmp ne i32 %9, 0
+ br i1 %I10, label %B11, label %B21
+
+B11:
+ store i32 0, i32* %8, align 4
+ br label %B12
+
+; CHECK-NOT: B12:
+; CHECK-NOT: B16:
+; CHECK-NOT: B17:
+; CHECK-NOT: B20:
+
+B12:
+ %I13 = load i32, i32* %8, align 4
+ %I14 = load i32, i32* %6, align 4
+ %I15 = icmp slt i32 %I13, %I14
+ br i1 %I15, label %B16, label %B20
+
+B16:
+ br label %B17
+
+B17:
+ %I18 = load i32, i32* %8, align 4
+ %I19 = add nsw i32 %I18, 1
+ store i32 %I19, i32* %8, align 4
+ br label %B12
+
+B20:
+ store i32 1, i32* %7, align 4
+ br label %B21
+
+B21:
+ %I22 = load i32, i32* %7, align 4
+ ret i32 %I22
+}
+
+attributes #0 = { nounwind uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.ident = !{!0}
+
+!0 = !{!"clang version 4.0.0 (http://llvm.org/git/clang.git 5864a13abf4490e76ae2eb0896198e1305927df2)"}
Index: test/Transforms/ADCE/basictest1.ll
===================================================================
--- test/Transforms/ADCE/basictest1.ll
+++ test/Transforms/ADCE/basictest1.ll
@@ -1,4 +1,6 @@
-; RUN: opt < %s -adce -simplifycfg | llvm-dis
+; RUN: opt < %s -adce -S | FileCheck %s
+; RUN: opt < %s -adce -adce-remove-loops -S | FileCheck %s
+
%FILE = type { i32, i8*, i8*, i8, i8, i32, i32, i32 }
%spec_fd_t = type { i32, i32, i32, i8* }
@__iob = external global [20 x %FILE] ; <[20 x %FILE]*> [#uses=1]
@@ -26,6 +28,8 @@
%cond266 = icmp sle i32 %reg109, 4 ; <i1> [#uses=1]
br i1 %cond266, label %bb3, label %bb2
+; CHECK-NOT: bb2:
+
bb2: ; preds = %0
%cast273 = getelementptr [17 x i8], [17 x i8]* @.LC12, i64 0, i64 0 ; <i8*> [#uses=0]
br label %bb3
@@ -57,6 +61,9 @@
%cond271 = icmp sle i32 %reg134, 4 ; <i1> [#uses=1]
br i1 %cond271, label %bb8, label %bb7
+; CHECK-NOT: bb7:
+; CHECK-NOT: bb8:
+
bb7: ; preds = %bb6
%cast277 = getelementptr [4 x i8], [4 x i8]* @.LC10, i64 0, i64 0 ; <i8*> [#uses=0]
br label %bb8
@@ -79,6 +86,8 @@
%cond272 = icmp sle i32 %reg163, 4 ; <i1> [#uses=1]
br i1 %cond272, label %bb11, label %bb10
+; CHECK-NOT: bb10:
+
bb10: ; preds = %bb9
%cast279 = getelementptr [4 x i8], [4 x i8]* @.LC11, i64 0, i64 0 ; <i8*> [#uses=0]
br label %bb11
Index: test/Transforms/ADCE/basictest2.ll
===================================================================
--- test/Transforms/ADCE/basictest2.ll
+++ test/Transforms/ADCE/basictest2.ll
@@ -1,4 +1,6 @@
-; RUN: opt < %s -adce -simplifycfg | llvm-dis
+; RUN: opt < %s -adce -disable-output
+; RUN: opt < %s -adce -adce-remove-loops -S | FileCheck %s
+
%FILE = type { i32, i8*, i8*, i8, i8, i32, i32, i32 }
%spec_fd_t = type { i32, i32, i32, i8* }
@__iob = external global [20 x %FILE] ; <[20 x %FILE]*> [#uses=1]
@@ -26,6 +28,7 @@
%cond266 = icmp sle i32 %reg109, 4 ; <i1> [#uses=1]
br i1 %cond266, label %bb3, label %bb2
+; CHECK-NOT: bb2:
bb2: ; preds = %0
%cast273 = getelementptr [17 x i8], [17 x i8]* @.LC12, i64 0, i64 0 ; <i8*> [#uses=0]
br label %bb3
@@ -52,6 +55,8 @@
%cond270 = icmp slt i32 %reg1321, %reg1331 ; <i1> [#uses=1]
br i1 %cond270, label %bb9, label %bb6
+; CHECK-NOT: bb7:
+; CHECK-NOT: bb8:
bb6: ; preds = %bb5
%reg134 = load i32, i32* @dbglvl ; <i32> [#uses=1]
%cond271 = icmp sle i32 %reg134, 4 ; <i1> [#uses=1]
@@ -79,6 +84,7 @@
%cond272 = icmp sle i32 %reg163, 4 ; <i1> [#uses=1]
br i1 %cond272, label %bb11, label %bb10
+; CHECK-NOT: bb10:
bb10: ; preds = %bb9
%cast279 = getelementptr [4 x i8], [4 x i8]* @.LC11, i64 0, i64 0 ; <i8*> [#uses=0]
br label %bb11