[polly] r249000 - [FIX] Erase stall results during the SCoP detection

[Johannes Doerfert via llvm-commits]

Author: jdoerfert
Date: Thu Oct  1 05:59:14 2015
New Revision: 249000

URL: http://llvm.org/viewvc/llvm-project?rev=249000&view=rev
Log:
[FIX] Erase stall results during the SCoP detection

  With this patch we erase cached results for regions that are invalid
  as early as possible. If we do not (as before), it is possible that
  two expanded regions will have the same address and the tracked
  results for both are mixed. Currently this would "only" cause
  pessimism in later passes but that will change when we allow invariant
  loads in the SCoP.  Additionally, it triggers non-deterministic
  results as we might dismiss a later region because of results cached
  for an earlier one.

  There is no test case as the problem occurs only non-deterministically.


Modified:
    polly/trunk/include/polly/ScopDetection.h
    polly/trunk/lib/Analysis/ScopDetection.cpp

Modified: polly/trunk/include/polly/ScopDetection.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopDetection.h?rev=249000&r1=248999&r2=249000&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopDetection.h (original)
+++ polly/trunk/include/polly/ScopDetection.h Thu Oct  1 05:59:14 2015
@@ -194,6 +194,14 @@ private:
   // Remember a list of errors for every region.
   mutable RejectLogsContainer RejectLogs;
 
+  /// @brief Remove cached results for @p R.
+  void removeCachedResults(const Region &R);
+
+  /// @brief Remove cached results for the children of @p R recursively.
+  ///
+  /// @returns The number of regions erased regions.
+  unsigned removeCachedResultsRecursively(const Region &R);
+
   /// @brief Add the region @p AR as over approximated sub-region in @p Context.
   ///
   /// @param AR      The non-affine subregion.

Modified: polly/trunk/lib/Analysis/ScopDetection.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=249000&r1=248999&r2=249000&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Thu Oct  1 05:59:14 2015
@@ -813,11 +813,14 @@ Region *ScopDetection::expandRegion(Regi
       // If the exit is valid check all blocks
       //  - if true, a valid region was found => store it + keep expanding
       //  - if false, .tbd. => stop  (should this really end the loop?)
-      if (!allBlocksValid(Context) || Context.Log.hasErrors())
+      if (!allBlocksValid(Context) || Context.Log.hasErrors()) {
+        removeCachedResults(*ExpandedRegion);
         break;
+      }
 
       // Store this region, because it is the greatest valid (encountered so
       // far).
+      removeCachedResults(*LastValidRegion);
       LastValidRegion = std::move(ExpandedRegion);
 
       // Create and test the next greater region (if any)
@@ -848,32 +851,33 @@ static bool regionWithoutLoops(Region &R
   return true;
 }
 
-// Remove all direct and indirect children of region R from the region set Regs,
-// but do not recurse further if the first child has been found.
-//
-// Return the number of regions erased from Regs.
-static unsigned eraseAllChildren(ScopDetection::RegionSet &Regs,
-                                 const Region &R) {
+unsigned ScopDetection::removeCachedResultsRecursively(const Region &R) {
   unsigned Count = 0;
   for (auto &SubRegion : R) {
-    if (Regs.count(SubRegion.get())) {
+    if (ValidRegions.count(SubRegion.get())) {
+      removeCachedResults(*SubRegion.get());
       ++Count;
-      Regs.remove(SubRegion.get());
-    } else {
-      Count += eraseAllChildren(Regs, *SubRegion);
-    }
+    } else
+      Count += removeCachedResultsRecursively(*SubRegion);
   }
   return Count;
 }
 
+void ScopDetection::removeCachedResults(const Region &R) {
+  ValidRegions.remove(&R);
+  BoxedLoopsMap.erase(&R);
+  NonAffineSubRegionMap.erase(&R);
+}
+
 void ScopDetection::findScops(Region &R) {
   DetectionContext Context(R, *AA, NonAffineSubRegionMap[&R], BoxedLoopsMap[&R],
                            false /*verifying*/);
 
   bool RegionIsValid = false;
-  if (!DetectUnprofitable && regionWithoutLoops(R, LI))
+  if (!DetectUnprofitable && regionWithoutLoops(R, LI)) {
+    removeCachedResults(R);
     invalid<ReportUnprofitable>(Context, /*Assert=*/true, &R);
-  else
+  } else
     RegionIsValid = isValidRegion(Context);
 
   bool HasErrors = !RegionIsValid || Context.Log.size() > 0;
@@ -881,7 +885,9 @@ void ScopDetection::findScops(Region &R)
   if (PollyTrackFailures && HasErrors)
     RejectLogs.insert(std::make_pair(&R, Context.Log));
 
-  if (!HasErrors) {
+  if (HasErrors) {
+    removeCachedResults(R);
+  } else {
     ++ValidRegion;
     ValidRegions.insert(&R);
     return;
@@ -919,11 +925,11 @@ void ScopDetection::findScops(Region &R)
 
     R.addSubRegion(ExpandedR, true);
     ValidRegions.insert(ExpandedR);
-    ValidRegions.remove(CurrentRegion);
+    removeCachedResults(*CurrentRegion);
 
     // Erase all (direct and indirect) children of ExpandedR from the valid
     // regions and update the number of valid regions.
-    ValidRegion -= eraseAllChildren(ValidRegions, *ExpandedR);
+    ValidRegion -= removeCachedResultsRecursively(*ExpandedR);
   }
 }
 
@@ -1084,6 +1090,10 @@ bool ScopDetection::runOnFunction(llvm::
   if (ReportLevel)
     printLocations(F);
 
+  assert(ValidRegions.size() == BoxedLoopsMap.size() &&
+         "Cached more results than valid regions");
+  assert(ValidRegions.size() == NonAffineSubRegionMap.size() &&
+         "Cached more results than valid regions");
   return false;
 }