[TSAR, Memory] Fix 'index out of bounds' for an initialization of a basic block.

Author: yukatan1701

include/tsar/Analysis/Memory/DefinedMemory.h

@@ -393,7 +393,7 @@ class DefUseSet {
   }
 
   /// TODO: description
-  void addExplicitAccessAndDFNode(const llvm::Value *Ptr, const DFNode *N) {
+  void addExplicitAccessNode(const llvm::Value *Ptr, const DFNode *N) {
     assert(Ptr && "Location pointer must not be null!");
     mCollapsableExplicitAccesses.try_emplace(Ptr).first->second.insert(N);
   }

lib/Analysis/Memory/DefinedMemory.cpp

@@ -413,6 +413,7 @@ std::pair<MemoryLocationRange, bool> aggregate(
             break;
           }
         } else {
+          // TODO: more adequate value
           TripCount = 100500;
         }
       }
@@ -521,8 +522,10 @@ std::pair<MemoryLocationRange, bool> aggregate(
           "Dimension bounds and step must be specified!");
       if (isa<SCEVConstant>(DimInfo.End) &&
           cast<SCEVConstant>(DimInfo.End)->getAPInt().
-            getSExtValue() >= DimInfo.DimSize && DimensionN != 0) {
-        LLVM_DEBUG(dbgs() << "[AGGREGATE] Array index out of bounds.");
+            getSExtValue() >= DimInfo.DimSize && DimensionN != 0 && N != nullptr) {
+        auto End = cast<SCEVConstant>(DimInfo.End)->getAPInt().
+            getSExtValue();
+        LLVM_DEBUG(dbgs() << "[AGGREGATE] Array index out of bounds. End = " << End << ", DimSize = " << DimInfo.DimSize << "\n");
         break;
       }
       ResLoc.DimList.push_back(DimInfo);
@@ -875,7 +878,7 @@ void DataFlowTraits<ReachDFFwk*>::initialize(
             DU->addExplicitAccess(ALoc);
             auto ColLoc = aggregate(nullptr, nullptr, ALoc, DFF).first;
             if (ColLoc.Kind == MemoryLocationRange::LocKind::Collapsed) {
-              DU->addExplicitAccessAndDFNode(ALoc.Ptr, N);
+              DU->addExplicitAccessNode(ALoc.Ptr, N);
             }
           }
         }
@@ -1098,7 +1101,22 @@ void ReachDFFwk::collapse(DFRegion *R) {
       LLVM_DEBUG(printLocInfo("[COLLAPSE] Collapse Use location: ", Loc));
       distribute(aggregate(R, N, Loc, this), Loc, OwnUses, OtherUses);
     }
+    /*LLVM_DEBUG(
+      dbgs() << "[COLLAPSE] OwnUses:\n";
+      for (auto &Loc : OwnUses)
+        printLocationSource(dbgs(), Loc, &getDomTree(), true); dbgs() << "\n";
+      dbgs() << "[COLLAPSE] OtherUses:\n";
+      for (auto &Pair : OtherUses) {
+        printLocationSource(dbgs(), Pair.first, &getDomTree(), true); dbgs() << "\n";
+        printLocationSource(dbgs(), Pair.second, &getDomTree(), true); dbgs() << "\n";
+      }
+    );
     OwnUses.clarify(OtherUses);
+    LLVM_DEBUG(
+      dbgs() << "[COLLAPSE] OwnUses after clarify:\n";
+      for (auto &Loc : OwnUses)
+        printLocationSource(dbgs(), Loc, &getDomTree(), true); dbgs() << "\n";
+    );*/
     for (auto &Loc : OwnUses) {
       SmallVector<MemoryLocationRange, 4> UseDiff;
       if (MustReachIn.subtractFrom(Loc, UseDiff)) {

lib/Analysis/Memory/MemoryLocationRange.cpp

@@ -36,7 +36,8 @@ using namespace tsar;
 using namespace llvm;
 
 #undef DEBUG_TYPE
-#define DEBUG_TYPE "def-mem"
+//#define DEBUG_TYPE "def-mem"
+#define DEBUG_TYPE "live-mem"
 
 namespace {
 typedef int64_t ColumnT;