UseListOrder: Guarantee that shuffles change use-list order

Change shuffleUseLists() always to change use-list order by rejecting
orders that have no changes.

This is part of PR5680.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214584 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/IR/UseListOrder.cpp b/lib/IR/UseListOrder.cpp
index 7d845d1185b7a9599692803629425ca94089a2e5..0b0ad9223120a5cd5ac5215bea9be44c03b58b49 100644 (file)
--- a/lib/IR/UseListOrder.cpp
+++ b/lib/IR/UseListOrder.cpp
@@ -63,17 +63,20 @@ static void shuffleValueUseLists(Value *V, std::minstd_rand0 &Gen,
   DEBUG(dbgs() << "V = "; V->dump());
   std::uniform_int_distribution<short> Dist(10, 99);
   SmallDenseMap<const Use *, short, 16> Order;
-  for (const Use &U : V->uses()) {
-    auto I = Dist(Gen);
-    Order[&U] = I;
-    DEBUG(dbgs() << " - order: " << I << ", op = " << U.getOperandNo()
-                 << ", U = ";
-          U.getUser()->dump());
-  }
+  auto compareUses =
+      [&Order](const Use &L, const Use &R) { return Order[&L] < Order[&R]; };
+  do {
+    for (const Use &U : V->uses()) {
+      auto I = Dist(Gen);
+      Order[&U] = I;
+      DEBUG(dbgs() << " - order: " << I << ", op = " << U.getOperandNo()
+                   << ", U = ";
+            U.getUser()->dump());
+    }
+  } while (std::is_sorted(V->use_begin(), V->use_end(), compareUses));
 
   DEBUG(dbgs() << " => shuffle\n");
-  V->sortUseList(
-      [&Order](const Use &L, const Use &R) { return Order[&L] < Order[&R]; });
+  V->sortUseList(compareUses);
 
   DEBUG({
     for (const Use &U : V->uses()) {