[TSAR, Memory] Update RedundantEdgeEliminationPass.

Author: yukatan1701

include/tsar/Transform/IR/RedundantEdgeElimination.h

@@ -43,4 +43,4 @@ class RedundantEdgeEliminationPass :
   bool runOnFunction(Function &F) override;
 };
 }
-#endif//TSAR_REDUNDANT_EDGE_ELIMINATION_H
+#endif//TSAR_REDUNDANT_EDGE_ELIMINATION_H

lib/Analysis/Memory/DefinedMemory.cpp

@@ -247,8 +247,7 @@ class AddUnknownAccessFunctor :
 /// loop nest associated with region `R`, this value will be set to `false`,
 /// `true` otherwise.
 std::pair<MemoryLocationRange, bool> aggregate(
-    DFRegion *R, const MemoryLocationRange &Loc,
-    const ReachDFFwk *Fwk) {
+    DFRegion *R, const MemoryLocationRange &Loc, const ReachDFFwk *Fwk) {
   typedef MemoryLocationRange::Dimension Dimension;
   typedef MemoryLocationRange::LocKind LocKind;
   typedef ICmpInst::Predicate Predicate;
@@ -438,6 +437,7 @@ std::pair<MemoryLocationRange, bool> aggregate(
                                        FinalSCEV);
           }
         }
+        LLVM_DEBUG(dbgs() << "[AGGREGATE] AddRecType: "; C->getType()->dump());
         auto ZeroItr = C->evaluateAtIteration(SE->getZero(C->getType()), *SE);
         auto IdxExprStep = AddRecStep / LoopStep;
         LLVM_DEBUG(dbgs() << "[AGGREGATE] LoopStep: " << LoopStep <<

lib/Transform/IR/RedundantEdgeElimination.cpp

@@ -53,15 +53,17 @@ bool RedundantEdgeEliminationPass::runOnFunction(Function &F) {
       if (auto *BI = dyn_cast<BranchInst>(TI)) {
         LLVM_DEBUG(dbgs() << "[REDUNDANT EDGE] instruction: "; BI->dump());
         if (BI->isConditional() && isa<ConstantInt>(BI->getCondition())) {
+          auto IsCondTrue = !cast<ConstantInt>(BI->getCondition())->equalsInt(0);
+          BI->getSuccessor(IsCondTrue ? 1 : 0)->removePredecessor(&BB);
           ReplaceInstWithInst(
-              BI, cast<ConstantInt>(BI->getCondition())->equalsInt(0) ?
-                  BranchInst::Create(BI->getSuccessor(1)) :
-                  BranchInst::Create(BI->getSuccessor(0)));
+              BI, IsCondTrue ?
+                  BranchInst::Create(BI->getSuccessor(0)) :
+                  BranchInst::Create(BI->getSuccessor(1)));
           LLVM_DEBUG(dbgs() << "[REDUNDANT EDGE] after: "; BB.dump());
         }
       }
     }
   }
   LLVM_DEBUG(dbgs() << "[REDUNDANT EDGE]: leave " << F.getName() << "\n");
   return true;
-}
+}