test

Author: dtcxzyw

llvm/include/llvm/Transforms/Utils/PredicateInfo.h

@@ -52,6 +52,7 @@
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallSet.h"
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/IR/ValueHandle.h"
@@ -186,6 +187,9 @@ class PredicateInfo {
   const PredicateBase *getPredicateInfoFor(const Value *V) const {
     return PredicateMap.lookup(V);
   }
+  const SmallVector<WeakVH> &getInsertedSSACopies() const {
+    return InsertedSSACopies;
+  }
 
 protected:
   // Used by PredicateInfo annotater, dumpers, and wrapper pass.
@@ -199,6 +203,7 @@ class PredicateInfo {
   // the Predicate Info, they belong to the ValueInfo structs in the ValueInfos
   // vector.
   DenseMap<const Value *, const PredicateBase *> PredicateMap;
+  SmallVector<WeakVH> InsertedSSACopies;
 };
 
 /// Printer pass for \c PredicateInfo.

llvm/lib/Transforms/Utils/PredicateInfo.cpp

@@ -524,6 +524,7 @@ Value *PredicateInfoBuilder::materializeStack(unsigned int &Counter,
       BitCastInst *PIC = CreateSSACopy(getBranchTerminator(ValInfo), Op,
                                        Op->getName() + "." + Twine(Counter++));
       PI.PredicateMap.insert({PIC, ValInfo});
+      PI.InsertedSSACopies.push_back(PIC);
       Result.Def = PIC;
     } else {
       auto *PAssume = dyn_cast<PredicateAssume>(ValInfo);
@@ -533,6 +534,7 @@ Value *PredicateInfoBuilder::materializeStack(unsigned int &Counter,
       // directly before it, assume(i1 true) is not a useful fact.
       BitCastInst *PIC = CreateSSACopy(PAssume->AssumeInst->getNextNode(), Op);
       PI.PredicateMap.insert({PIC, ValInfo});
+      PI.InsertedSSACopies.push_back(PIC);
       Result.Def = PIC;
     }
   }

llvm/lib/Transforms/Utils/SCCPSolver.cpp

@@ -21,6 +21,7 @@
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/InstVisitor.h"
+#include "llvm/IR/Instructions.h"
 #include "llvm/IR/NoFolder.h"
 #include "llvm/IR/PatternMatch.h"
 #include "llvm/Support/Casting.h"
@@ -775,18 +776,12 @@ class SCCPInstVisitor : public InstVisitor<SCCPInstVisitor> {
     if (It == FnPredicateInfo.end())
       return;
 
-    for (BasicBlock &BB : F) {
-      for (Instruction &Inst : llvm::make_early_inc_range(BB)) {
-        if (auto *BC = dyn_cast<BitCastInst>(&Inst)) {
-          if (BC->getType() == BC->getOperand(0)->getType()) {
-            if (It->second->getPredicateInfoFor(&Inst)) {
-              Value *Op = BC->getOperand(0);
-              Inst.replaceAllUsesWith(Op);
-              Inst.eraseFromParent();
-            }
-          }
-        }
-      }
+    for (auto &SSACopy : It->second->getInsertedSSACopies()) {
+      auto *BC = cast_or_null<Instruction>(SSACopy);
+      if (!BC)
+        continue;
+      BC->replaceAllUsesWith(BC->getOperand(0));
+      BC->eraseFromParent();
     }
   }