[TSAR, Memory] Check step of locations with variable bounds.

Author: yukatan1701

include/tsar/Analysis/Memory/MemorySetInfo.h

@@ -246,12 +246,14 @@ template<> struct MemorySetInfo<MemoryLocationRange> {
           !llvm::isa<llvm::SCEVConstant>(Left.End) ||
           !llvm::isa<llvm::SCEVConstant>(Right.Start) ||
           !llvm::isa<llvm::SCEVConstant>(Right.End)) {
-        auto CmpLeftStartRightEnd = compareSCEVs(Left.Start, Right.End, SE);
-        auto CmpRightStartLeftEnd = compareSCEVs(Right.Start, Left.End, SE);
-        if (CmpLeftStartRightEnd &&
-                (*CmpLeftStartRightEnd == 0 || *CmpLeftStartRightEnd == 1) ||
-            CmpRightStartLeftEnd &&
-                (*CmpRightStartLeftEnd == 0 || *CmpRightStartLeftEnd == 1)) {
+        auto CmpLSRE = compareSCEVs(Left.Start, Right.End, SE);
+        auto CmpRSLE = compareSCEVs(Right.Start, Left.End, SE);
+        if (Left.Step == Right.Step &&
+            llvm::isa<llvm::SCEVConstant>(Left.Step) &&
+            llvm::cast<llvm::SCEVConstant>(Left.Step)->
+                getAPInt().getSExtValue() == 1 &&
+            CmpLSRE && (*CmpLSRE == 0 || *CmpLSRE == 1) ||
+            CmpRSLE && (*CmpRSLE == 0 || *CmpRSLE == 1)) {
           ++JoinableDimCount;
           continue;
         } 
@@ -309,15 +311,13 @@ template<> struct MemorySetInfo<MemoryLocationRange> {
             !llvm::isa<llvm::SCEVConstant>(DimTo.End) ||
             !llvm::isa<llvm::SCEVConstant>(DimFrom.Start) ||
             !llvm::isa<llvm::SCEVConstant>(DimFrom.End)) {
-          auto CmpFromEndToStart = compareSCEVs(DimTo.Start, DimFrom.End, SE);
-          auto CmpToEndFromStart = compareSCEVs(DimFrom.Start, DimTo.End, SE);
-          if (CmpFromEndToStart &&
-              (*CmpFromEndToStart == 0 || *CmpFromEndToStart == 1)) {
+          auto CmpTSFE = compareSCEVs(DimTo.Start, DimFrom.End, SE);
+          auto CmpFSTE = compareSCEVs(DimFrom.Start, DimTo.End, SE);
+          if (CmpTSFE && (*CmpTSFE == 0 || *CmpTSFE == 1)) {
             DimTo.Start = DimFrom.Start;
             IsChanged = true;
           }
-          if (CmpToEndFromStart &&
-              (*CmpToEndFromStart == 0 || *CmpToEndFromStart == 1)) {
+          if (CmpFSTE && (*CmpFSTE == 0 || *CmpFSTE == 1)) {
             DimTo.End = DimFrom.End;
             IsChanged = true;
           }

lib/Analysis/Memory/DefinedMemory.cpp

@@ -427,14 +427,15 @@ std::pair<MemoryLocationRange, bool> aggregate(
         if (Bounds->getDirection() == Loop::LoopBounds::Direction::Increasing) {
           if (Predicate == Predicate::ICMP_SLT ||
               Predicate == Predicate::ICMP_ULT) {
-            FinalSCEV = SE->getMinusSCEV(FinalSCEV,
-                                         SE->getOne(FinalSCEV->getType()));
+            FinalSCEV = subtractSCEVAndCast(FinalSCEV,
+                                            SE->getOne(FinalSCEV->getType()),
+                                            SE);
           }
         } else {
           if (Predicate == Predicate::ICMP_SGT ||
               Predicate == Predicate::ICMP_UGT) {
-            FinalSCEV = SE->getAddExpr(SE->getOne(FinalSCEV->getType()),
-                                       FinalSCEV);
+            FinalSCEV = addSCEVAndCast(SE->getOne(FinalSCEV->getType()),
+                                       FinalSCEV, SE);
           }
         }
         LLVM_DEBUG(dbgs() << "[AGGREGATE] AddRecType: "; C->getType()->dump());
@@ -445,19 +446,19 @@ std::pair<MemoryLocationRange, bool> aggregate(
         if (LoopStep > 0 && IdxExprStep > 0) {
           DimInfo.Start = ZeroItr;
           DimInfo.End = C->evaluateAtIteration(
-              SE->getMinusSCEV(FinalSCEV, InitSCEV), *SE);
+              subtractSCEVAndCast(FinalSCEV, InitSCEV, SE), *SE);
         } else if (LoopStep > 0 && IdxExprStep < 0) {
           DimInfo.Start = C->evaluateAtIteration(
-              SE->getMinusSCEV(FinalSCEV, InitSCEV), *SE);
+              subtractSCEVAndCast(FinalSCEV, InitSCEV, SE), *SE);
           DimInfo.End = ZeroItr;
         } else if (LoopStep < 0 && IdxExprStep > 0) {
           DimInfo.Start = C->evaluateAtIteration(
-              SE->getMinusSCEV(InitSCEV, FinalSCEV), *SE);
+              subtractSCEVAndCast(InitSCEV, FinalSCEV, SE), *SE);
           DimInfo.End = ZeroItr;
         } else {
           DimInfo.Start = ZeroItr;
           DimInfo.End = C->evaluateAtIteration(
-              SE->getMinusSCEV(InitSCEV, FinalSCEV), *SE);
+              subtractSCEVAndCast(InitSCEV, FinalSCEV, SE), *SE);
         }
         auto CmpStartEnd = compareSCEVs(DimInfo.Start, DimInfo.End, SE);
         if (CmpStartEnd && *CmpStartEnd > 0) {