<div dir="ltr"><div dir="ltr" class="gmail_msg">Hi Aditya, this commit breaks Transforms/SimplifyCFG/sink-common-code.ll. </div><div dir="ltr" class="gmail_msg"><br></div><div class="gmail_msg">I've reverted it with r297845 :(</div><div class="gmail_msg"><br></div><div class="gmail_msg">- Eric</div><br class="gmail_msg"><div class="gmail_quote gmail_msg"><div dir="ltr" class="gmail_msg">On Wed, Mar 15, 2017 at 3:38 PM Aditya Kumar via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br class="gmail_msg"></div><blockquote class="gmail_quote gmail_msg" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: hiraditya<br class="gmail_msg">
Date: Wed Mar 15 09:26:45 2017<br class="gmail_msg">
New Revision: 297839<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=297839&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=297839&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
Refactor SimplifyCFG:canSinkInstructions [NFC]<br class="gmail_msg">
<br class="gmail_msg">
Modified:<br class="gmail_msg">
llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=297839&r1=297838&r2=297839&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=297839&r1=297838&r2=297839&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Wed Mar 15 09:26:45 2017<br class="gmail_msg">
@@ -1463,39 +1463,39 @@ static bool canSinkInstructions(<br class="gmail_msg">
if (!isa<StoreInst>(I0)) {<br class="gmail_msg">
auto *PNUse = dyn_cast<PHINode>(*I0->user_begin());<br class="gmail_msg">
auto *Succ = I0->getParent()->getTerminator()->getSuccessor(0);<br class="gmail_msg">
- if (!all_of(Insts, [&PNUse,&Succ](const Instruction *I) -> bool {<br class="gmail_msg">
+ if (!PNUse || PNUse->getParent() != Succ)<br class="gmail_msg">
+ return false;<br class="gmail_msg">
+ if (!all_of(Insts, [&PNUse](const Instruction *I) -> bool {<br class="gmail_msg">
auto *U = cast<Instruction>(*I->user_begin());<br class="gmail_msg">
- return (PNUse &&<br class="gmail_msg">
- PNUse->getParent() == Succ &&<br class="gmail_msg">
- PNUse->getIncomingValueForBlock(I->getParent()) == I) ||<br class="gmail_msg">
- U->getParent() == I->getParent();<br class="gmail_msg">
+ return (PNUse->getIncomingValueForBlock(I->getParent()) == I) ||<br class="gmail_msg">
+ U->getParent() == I->getParent();<br class="gmail_msg">
}))<br class="gmail_msg">
return false;<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
+ // Because SROA can't handle speculating stores of selects, try not<br class="gmail_msg">
+ // to sink loads or stores of allocas when we'd have to create a PHI for<br class="gmail_msg">
+ // the address operand. Also, because it is likely that loads or stores<br class="gmail_msg">
+ // of allocas will disappear when Mem2Reg/SROA is run, don't sink them.<br class="gmail_msg">
+ // This can cause code churn which can have unintended consequences down<br class="gmail_msg">
+ // the line - see <a href="https://llvm.org/bugs/show_bug.cgi?id=30244" rel="noreferrer" class="gmail_msg" target="_blank">https://llvm.org/bugs/show_bug.cgi?id=30244</a>.<br class="gmail_msg">
+ // FIXME: This is a workaround for a deficiency in SROA - see<br class="gmail_msg">
+ // <a href="https://llvm.org/bugs/show_bug.cgi?id=30188" rel="noreferrer" class="gmail_msg" target="_blank">https://llvm.org/bugs/show_bug.cgi?id=30188</a><br class="gmail_msg">
+ if (isa<StoreInst>(I0) &&<br class="gmail_msg">
+ any_of(Insts, [](const Instruction *I) {<br class="gmail_msg">
+ return isa<AllocaInst>(I->getOperand(1));<br class="gmail_msg">
+ }))<br class="gmail_msg">
+ return false;<br class="gmail_msg">
+ if (isa<LoadInst>(I0) && any_of(Insts, [](const Instruction *I) {<br class="gmail_msg">
+ return isa<AllocaInst>(I->getOperand(0));<br class="gmail_msg">
+ }))<br class="gmail_msg">
+ return false;<br class="gmail_msg">
+<br class="gmail_msg">
for (unsigned OI = 0, OE = I0->getNumOperands(); OI != OE; ++OI) {<br class="gmail_msg">
if (I0->getOperand(OI)->getType()->isTokenTy())<br class="gmail_msg">
// Don't touch any operand of token type.<br class="gmail_msg">
return false;<br class="gmail_msg">
<br class="gmail_msg">
- // Because SROA can't handle speculating stores of selects, try not<br class="gmail_msg">
- // to sink loads or stores of allocas when we'd have to create a PHI for<br class="gmail_msg">
- // the address operand. Also, because it is likely that loads or stores<br class="gmail_msg">
- // of allocas will disappear when Mem2Reg/SROA is run, don't sink them.<br class="gmail_msg">
- // This can cause code churn which can have unintended consequences down<br class="gmail_msg">
- // the line - see <a href="https://llvm.org/bugs/show_bug.cgi?id=30244" rel="noreferrer" class="gmail_msg" target="_blank">https://llvm.org/bugs/show_bug.cgi?id=30244</a>.<br class="gmail_msg">
- // FIXME: This is a workaround for a deficiency in SROA - see<br class="gmail_msg">
- // <a href="https://llvm.org/bugs/show_bug.cgi?id=30188" rel="noreferrer" class="gmail_msg" target="_blank">https://llvm.org/bugs/show_bug.cgi?id=30188</a><br class="gmail_msg">
- if (OI == 1 && isa<StoreInst>(I0) &&<br class="gmail_msg">
- any_of(Insts, [](const Instruction *I) {<br class="gmail_msg">
- return isa<AllocaInst>(I->getOperand(1));<br class="gmail_msg">
- }))<br class="gmail_msg">
- return false;<br class="gmail_msg">
- if (OI == 0 && isa<LoadInst>(I0) && any_of(Insts, [](const Instruction *I) {<br class="gmail_msg">
- return isa<AllocaInst>(I->getOperand(0));<br class="gmail_msg">
- }))<br class="gmail_msg">
- return false;<br class="gmail_msg">
-<br class="gmail_msg">
auto SameAsI0 = [&I0, OI](const Instruction *I) {<br class="gmail_msg">
assert(I->getNumOperands() == I0->getNumOperands());<br class="gmail_msg">
return I->getOperand(OI) == I0->getOperand(OI);<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
llvm-commits mailing list<br class="gmail_msg">
<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
</blockquote></div></div>