From: Tom Stellard Date: Mon, 21 Oct 2013 20:07:30 +0000 (+0000) Subject: SimplifyCFG: Don't duplicate calls to functions marked noduplicate v2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f2089e1dd810236f716c1a45fa1e561dce5074e8;p=oota-llvm.git SimplifyCFG: Don't duplicate calls to functions marked noduplicate v2 v2: - Use CI->cannotDuplicate() git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193115 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 083328652fd..1398697dc55 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1561,6 +1561,19 @@ static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *ThenBB) { return true; } +/// \returns True if this block contains a CallInst with the NoDuplicate +/// attribute. +static bool HasNoDuplicateCall(const BasicBlock *BB) { + for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I != E; ++I) { + const CallInst *CI = dyn_cast(I); + if (!CI) + continue; + if (CI->cannotDuplicate()) + return true; + } + return false; +} + /// BlockIsSimpleEnoughToThreadThrough - Return true if we can thread a branch /// across this block. static bool BlockIsSimpleEnoughToThreadThrough(BasicBlock *BB) { @@ -1608,6 +1621,8 @@ static bool FoldCondBranchOnPHI(BranchInst *BI, const DataLayout *TD) { // Now we know that this block has multiple preds and two succs. if (!BlockIsSimpleEnoughToThreadThrough(BB)) return false; + if (HasNoDuplicateCall(BB)) return false; + // Okay, this is a simple enough basic block. See if any phi values are // constants. for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) { diff --git a/test/Transforms/SimplifyCFG/attr-noduplicate.ll b/test/Transforms/SimplifyCFG/attr-noduplicate.ll new file mode 100644 index 00000000000..523aa51bb84 --- /dev/null +++ b/test/Transforms/SimplifyCFG/attr-noduplicate.ll @@ -0,0 +1,37 @@ +; RUN: opt < %s -simplifycfg -S | FileCheck %s + +; This test checks that the SimplifyCFG pass won't duplicate a call to a +; function marked noduplicate. +; +; CHECK-LABEL: @noduplicate +; CHECK: call void @barrier +; CHECK-NOT: call void @barrier +define void @noduplicate(i32 %cond, i32* %out) { +entry: + %out1 = getelementptr i32* %out, i32 1 + %out2 = getelementptr i32* %out, i32 2 + %cmp = icmp eq i32 %cond, 0 + br i1 %cmp, label %if.then, label %if.end + +if.then: + store i32 5, i32* %out + br label %if.end + +if.end: + call void @barrier() #0 + br i1 %cmp, label %cond.end, label %cond.false + +cond.false: + store i32 5, i32* %out1 + br label %cond.end + +cond.end: + %value = phi i32 [ 1, %cond.false ], [ 0, %if.end ] + store i32 %value, i32* %out2 + ret void +} + +; Function Attrs: noduplicate nounwind +declare void @barrier() #0 + +attributes #0 = { noduplicate nounwind }