<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><meta http-equiv="Content-Type" content="text/html; charset=utf-8" class=""><div style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><meta http-equiv="Content-Type" content="text/html; charset=utf-8" class=""><div style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">Sorry for the breakage and thanks for reverting it. I’ll take a look.<div class=""><br class=""></div><div class="">Michael<br class=""><div class=""><br class=""><blockquote type="cite" class=""><div class="">On Apr 12, 2018, at 6:55 AM, Benjamin Kramer <<a href="mailto:benny.kra@gmail.com" class="">benny.kra@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">I'm still seeing stage2/3 miscompares of clang during bootstrap with this. Reverted in r329910.</div><br class=""><div class="gmail_quote"><div dir="ltr" class="">On Thu, Apr 12, 2018 at 12:40 AM Michael Zolotukhin via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:<br class=""></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mzolotukhin<br class="">
Date: Wed Apr 11 16:37:53 2018<br class="">
New Revision: 329865<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=329865&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=329865&view=rev</a><br class="">
Log:<br class="">
Reapply "[PR16756] Use SSAUpdaterBulk in JumpThreading." one more time.<br class="">
<br class="">
This reapplies commit r329644.<br class="">
<br class="">
Modified:<br class="">
llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp<br class="">
<br class="">
Modified: llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp?rev=329865&r1=329864&r2=329865&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp?rev=329865&r1=329864&r2=329865&view=diff</a><br class="">
==============================================================================<br class="">
--- llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp (original)<br class="">
+++ llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp Wed Apr 11 16:37:53 2018<br class="">
@@ -66,6 +66,7 @@<br class="">
#include "llvm/Transforms/Utils/BasicBlockUtils.h"<br class="">
#include "llvm/Transforms/Utils/Cloning.h"<br class="">
#include "llvm/Transforms/Utils/SSAUpdater.h"<br class="">
+#include "llvm/Transforms/Utils/SSAUpdaterBulk.h"<br class="">
#include "llvm/Transforms/Utils/ValueMapper.h"<br class="">
#include <algorithm><br class="">
#include <cassert><br class="">
@@ -1989,9 +1990,13 @@ bool JumpThreadingPass::ThreadEdge(Basic<br class="">
// now have to update all uses of the value to use either the original value,<br class="">
// the cloned value, or some PHI derived value. This can require arbitrary<br class="">
// PHI insertion, of which we are prepared to do, clean these up now.<br class="">
- SSAUpdater SSAUpdate;<br class="">
+ SSAUpdaterBulk SSAUpdate;<br class="">
SmallVector<Use*, 16> UsesToRename;<br class="">
+<br class="">
+ unsigned VarNum = 0;<br class="">
for (Instruction &I : *BB) {<br class="">
+ UsesToRename.clear();<br class="">
+<br class="">
// Scan all uses of this instruction to see if it is used outside of its<br class="">
// block, and if so, record them in UsesToRename.<br class="">
for (Use &U : I.uses()) {<br class="">
@@ -2008,19 +2013,15 @@ bool JumpThreadingPass::ThreadEdge(Basic<br class="">
// If there are no uses outside the block, we're done with this instruction.<br class="">
if (UsesToRename.empty())<br class="">
continue;<br class="">
+ SSAUpdate.AddVariable(VarNum, I.getName(), I.getType());<br class="">
<br class="">
- DEBUG(dbgs() << "JT: Renaming non-local uses of: " << I << "\n");<br class="">
-<br class="">
- // We found a use of I outside of BB. Rename all uses of I that are outside<br class="">
- // its block to be uses of the appropriate PHI node etc. See ValuesInBlocks<br class="">
- // with the two values we know.<br class="">
- SSAUpdate.Initialize(I.getType(), I.getName());<br class="">
- SSAUpdate.AddAvailableValue(BB, &I);<br class="">
- SSAUpdate.AddAvailableValue(NewBB, ValueMapping[&I]);<br class="">
-<br class="">
- while (!UsesToRename.empty())<br class="">
- SSAUpdate.RewriteUse(*UsesToRename.pop_back_val());<br class="">
- DEBUG(dbgs() << "\n");<br class="">
+ // We found a use of I outside of BB - we need to rename all uses of I that<br class="">
+ // are outside its block to be uses of the appropriate PHI node etc.<br class="">
+ SSAUpdate.AddAvailableValue(VarNum, BB, &I);<br class="">
+ SSAUpdate.AddAvailableValue(VarNum, NewBB, ValueMapping[&I]);<br class="">
+ for (auto U : UsesToRename)<br class="">
+ SSAUpdate.AddUse(VarNum, U);<br class="">
+ VarNum++;<br class="">
}<br class="">
<br class="">
// Ok, NewBB is good to go. Update the terminator of PredBB to jump to<br class="">
@@ -2037,6 +2038,10 @@ bool JumpThreadingPass::ThreadEdge(Basic<br class="">
{DominatorTree::Insert, PredBB, NewBB},<br class="">
{DominatorTree::Delete, PredBB, BB}});<br class="">
<br class="">
+ // Apply all updates we queued with DDT and get the updated Dominator Tree.<br class="">
+ DominatorTree *DT = &DDT->flush();<br class="">
+ SSAUpdate.RewriteAllUses(DT);<br class="">
+<br class="">
// At this point, the IR is fully up to date and consistent. Do a quick scan<br class="">
// over the new instructions and zap any that are constants or dead. This<br class="">
// frequently happens because of phi translation.<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div>
</div></blockquote></div><br class=""></div></div></div></body></html>