commit 60b54f19e6a88c43abc6148c38d0a0ecc69a55f6
author Tobias Grosser <grosser@fim.uni-passau.de> Tue Nov 08 15:41:28 2011 +0000
committer Tobias Grosser <grosser@fim.uni-passau.de> Tue Nov 08 15:41:28 2011 +0000
tree 3e8be9723a6f0e3a60befe18f019e2d062b63004
parent 65b0058b56ad299c9bf6104e7f183505574e40bc

Detect Parameters directly on the SCEV.

Instead of using TempScop to find parameters, we detect them directly
on the SCEV. This allows us to remove the TempScop parameter detection
in a subsequent commit.

This fixes a bug reported by Marcello Maggioni <hayarms@gmail.com>

llvm-svn: 144087

polly/lib/Analysis/ScopInfo.cpp

diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp
index 686beb2..a1e64c0 100644
--- a/polly/lib/Analysis/ScopInfo.cpp
+++ b/polly/lib/Analysis/ScopInfo.cpp
@@ -23,6 +23,7 @@
 #include "polly/LinkAllPasses.h"
 #include "polly/Support/GICHelper.h"
 #include "polly/Support/ScopHelper.h"
+#include "polly/Support/SCEVValidator.h"
 
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/ScalarEvolutionExpressions.h"
@@ -80,8 +81,18 @@
   const Value *baseAddress;
 
 public:
-  static isl_pw_aff *getPwAff(const ScopStmt *stmt, const SCEV *scev,
+  static isl_pw_aff *getPwAff(ScopStmt *stmt, const SCEV *scev,
                               const Value *baseAddress = 0) {
+    Scop *S = stmt->getParent();
+    const Region *Reg = &S->getRegion();
+
+    if (baseAddress) {
+      Value *Base;
+      S->addParams(getParamsInAffineExpr(Reg, scev, *S->getSE(), &Base));
+    } else {
+      S->addParams(getParamsInAffineExpr(Reg, scev, *S->getSE()));
+    }
+
     SCEVAffinator Affinator(stmt, baseAddress);
     return Affinator.visit(scev);
   }
@@ -598,7 +609,6 @@
 }
 
 __isl_give isl_set *ScopStmt::buildConditionSet(const Comparison &Comp) {
-
   isl_pw_aff *L = SCEVAffinator::getPwAff(this, Comp.getLHS()->OriginalSCEV, 0);
   isl_pw_aff *R = SCEVAffinator::getPwAff(this, Comp.getRHS()->OriginalSCEV, 0);
 
@@ -626,7 +636,7 @@
 }
 
 __isl_give isl_set *ScopStmt::addLoopBoundsToDomain(__isl_take isl_set *Domain,
-                                                    TempScop &tempScop) const {
+                                                    TempScop &tempScop) {
   isl_space *Space;
   isl_local_space *LocalSpace;
 
@@ -852,6 +862,22 @@
 
 //===----------------------------------------------------------------------===//
 /// Scop class implement
+
+void Scop::addParams(std::vector<const SCEV*> NewParameters) {
+  for (std::vector<const SCEV*>::iterator PI = NewParameters.begin(),
+       PE = NewParameters.end(); PI != PE; ++PI) {
+    const SCEV *Parameter = *PI;
+
+    if (ParameterIds.find(Parameter) != ParameterIds.end())
+      continue;
+
+    int dimension = Parameters.size();
+
+    Parameters.push_back(Parameter);
+    ParameterIds[Parameter] = dimension;
+  }
+}
+
 __isl_give isl_id *Scop::getIdForParam(const SCEV *Parameter) const {
   ParamIdType::const_iterator IdIter = ParameterIds.find(Parameter);
 
@@ -862,17 +888,6 @@
   return isl_id_alloc(getIslCtx(), ParameterName.c_str(), (void *) Parameter);
 }
 
-void Scop::initializeParameters(ParamSetType *ParamSet) {
-  int i = 0;
-  for (ParamSetType::iterator PI = ParamSet->begin(), PE = ParamSet->end();
-       PI != PE; ++PI) {
-    const SCEV *Parameter = *PI;
-    Parameters.push_back(Parameter);
-    ParameterIds.insert(std::pair<const SCEV*, int>(Parameter, i));
-    i++;
-  }
-}
-
 void Scop::buildContext() {
   isl_space *Space = isl_space_params_alloc(IslCtx, 0);
   Context = isl_set_universe (Space);
@@ -880,7 +895,7 @@
 
 void Scop::realignParams() {
   // Add all parameters into a common model.
-  isl_space *Space = isl_space_params_alloc(IslCtx, Parameters.size());
+  isl_space *Space = isl_space_params_alloc(IslCtx, ParameterIds.size());
 
   for (ParamIdType::iterator PI = ParameterIds.begin(), PE = ParameterIds.end();
        PI != PE; ++PI) {
@@ -901,7 +916,6 @@
            : SE(&ScalarEvolution), R(tempScop.getMaxRegion()),
            MaxLoopDepth(tempScop.getMaxLoopDepth()) {
   IslCtx = Context;
-  initializeParameters(&tempScop.getParamSet());
   buildContext();
 
   SmallVector<Loop*, 8> NestLoops;
@@ -964,6 +978,14 @@
   }
 
   OS.indent(4) << getContextStr() << "\n";
+
+  for (ParamVecType::const_iterator PI = Parameters.begin(),
+       PE = Parameters.end(); PI != PE; ++PI) {
+    const SCEV *Parameter = *PI;
+    int Dim = ParameterIds.find(Parameter)->second;
+
+    OS.indent(4) << "p" << Dim << ": " << *Parameter << "\n";
+  }
 }
 
 void Scop::printStatements(raw_ostream &OS) const {