commit cd01a363d6860be52e6c4dfa55737617e07a8549
author Tobias Grosser <tobias@grosser.es> Fri Feb 17 08:12:36 2017 +0000
committer Tobias Grosser <tobias@grosser.es> Fri Feb 17 08:12:36 2017 +0000
tree 95fecba31c586d4efc9eaffb9ba3e38fef358850
parent 65ce9362b8353513f5cd8fc8803932a50ec923aa

[ScopInfo] Add statistics to count loops after scop modeling

llvm-svn: 295431

polly/lib/Analysis/ScopDetection.cpp

diff --git a/polly/lib/Analysis/ScopDetection.cpp b/polly/lib/Analysis/ScopDetection.cpp
index bcdbe22..418b42b 100644
--- a/polly/lib/Analysis/ScopDetection.cpp
+++ b/polly/lib/Analysis/ScopDetection.cpp
@@ -1132,7 +1132,7 @@
 ///        count that is not known to be less than @MinProfitableTrips.
 ScopDetection::LoopStats
 ScopDetection::countBeneficialSubLoops(Loop *L, ScalarEvolution &SE,
-                                       unsigned MinProfitableTrips) const {
+                                       unsigned MinProfitableTrips) {
   auto *TripCount = SE.getBackedgeTakenCount(L);
 
   int NumLoops = 1;
@@ -1152,22 +1152,22 @@
 }
 
 ScopDetection::LoopStats
-ScopDetection::countBeneficialLoops(Region *R,
-                                    unsigned MinProfitableTrips) const {
+ScopDetection::countBeneficialLoops(Region *R, ScalarEvolution &SE,
+                                    LoopInfo &LI, unsigned MinProfitableTrips) {
   int LoopNum = 0;
   int MaxLoopDepth = 0;
 
-  auto L = LI->getLoopFor(R->getEntry());
+  auto L = LI.getLoopFor(R->getEntry());
   L = L ? R->outermostLoopInRegion(L) : nullptr;
   L = L ? L->getParentLoop() : nullptr;
 
   auto SubLoops =
-      L ? L->getSubLoopsVector() : std::vector<Loop *>(LI->begin(), LI->end());
+      L ? L->getSubLoopsVector() : std::vector<Loop *>(LI.begin(), LI.end());
 
   for (auto &SubLoop : SubLoops)
     if (R->contains(SubLoop)) {
       LoopStats Stats =
-          countBeneficialSubLoops(SubLoop, *SE, MinProfitableTrips);
+          countBeneficialSubLoops(SubLoop, SE, MinProfitableTrips);
       LoopNum += Stats.NumLoops;
       MaxLoopDepth = std::max(MaxLoopDepth, Stats.MaxDepth);
     }
@@ -1388,7 +1388,8 @@
   if (!Context.hasStores || !Context.hasLoads)
     return invalid<ReportUnprofitable>(Context, /*Assert=*/true, &CurRegion);
 
-  int NumLoops = countBeneficialLoops(&CurRegion, MIN_LOOP_TRIP_COUNT).NumLoops;
+  int NumLoops =
+      countBeneficialLoops(&CurRegion, *SE, *LI, MIN_LOOP_TRIP_COUNT).NumLoops;
   int NumAffineLoops = NumLoops - Context.BoxedLoopsSet.size();
 
   // Scops with at least two loops may allow either loop fusion or tiling and
@@ -1616,7 +1617,7 @@
       continue;
     if (!ValidRegions.count(&DC.CurRegion))
       continue;
-    LoopStats Stats = countBeneficialLoops(&DC.CurRegion, 0);
+    LoopStats Stats = countBeneficialLoops(&DC.CurRegion, *SE, *LI, 0);
     updateLoopCountStatistic(Stats, false /* OnlyProfitable */);
     if (isProfitableRegion(DC)) {
       updateLoopCountStatistic(Stats, true /* OnlyProfitable */);
@@ -1627,7 +1628,7 @@
   }
 
   NumProfScopRegions += ValidRegions.size();
-  NumLoopsOverall += countBeneficialLoops(TopRegion, 0).NumLoops;
+  NumLoopsOverall += countBeneficialLoops(TopRegion, *SE, *LI, 0).NumLoops;
 
   // Only makes sense when we tracked errors.
   if (PollyTrackFailures)