commit 9a38ab8a046fd8586ee6d03944c3d3f467e02bda
author Tobias Grosser <grosser@fim.uni-passau.de> Tue Nov 08 15:41:03 2011 +0000
committer Tobias Grosser <grosser@fim.uni-passau.de> Tue Nov 08 15:41:03 2011 +0000
tree 0c549833bf4ae259fdd611905b8608bd3859b4ff
parent 71133fe9c619aa0e51fa378755fd881ace9e5abd

Use a map to store the dimension of the the parameters

llvm-svn: 144083

polly/lib/Analysis/ScopInfo.cpp

diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp
index e0a3f82..64ebf03 100644
--- a/polly/lib/Analysis/ScopInfo.cpp
+++ b/polly/lib/Analysis/ScopInfo.cpp
@@ -846,21 +846,14 @@
 
 //===----------------------------------------------------------------------===//
 /// Scop class implement
-isl_id *Scop::getIdForParam(const SCEV *Parameter) const {
-  int i = 0;
+__isl_give isl_id *Scop::getIdForParam(const SCEV *Parameter) const {
+  ParamIdType::const_iterator IdIter = ParameterIds.find(Parameter);
 
-  for (const_param_iterator PI = param_begin(), PE = param_end(); PI != PE;
-       ++PI) {
-    if (Parameter == *PI) {
-      std::string ParameterName = "p" + convertInt(i);
-      isl_id *id = isl_id_alloc(getIslCtx(), ParameterName.c_str(),
-                                (void *) Parameter);
-      return id;
-    }
-    i++;
-  }
+  if (IdIter == ParameterIds.end())
+    return NULL;
 
-  return NULL;
+  std::string ParameterName = "p" + convertInt(IdIter->second);
+  return isl_id_alloc(getIslCtx(), ParameterName.c_str(), (void *) Parameter);
 }
 
 void Scop::buildContext(isl_ctx *IslCtx, ParamSetType *ParamSet) {
@@ -871,9 +864,8 @@
        PI != PE; ++PI) {
     const SCEV *Parameter = *PI;
     Parameters.push_back(Parameter);
-    std::string ParameterName = "p" + convertInt(i);
-    isl_id *id = isl_id_alloc(IslCtx, ParameterName.c_str(),
-                              (void *) Parameter);
+    ParameterIds.insert(std::pair<const SCEV*, int>(Parameter, i));
+    isl_id *id = getIdForParam(Parameter);
     Space = isl_space_set_dim_id(Space, isl_dim_param, i, id);
     i++;
   }
@@ -887,6 +879,7 @@
            isl_ctx *Context)
            : SE(&ScalarEvolution), R(tempScop.getMaxRegion()),
            MaxLoopDepth(tempScop.getMaxLoopDepth()) {
+  IslCtx = Context;
   buildContext(Context, &tempScop.getParamSet());
 
   SmallVector<Loop*, 8> NestLoops;
@@ -966,7 +959,7 @@
 
 void Scop::dump() const { print(dbgs()); }
 
-isl_ctx *Scop::getIslCtx() const { return isl_set_get_ctx(Context); }
+isl_ctx *Scop::getIslCtx() const { return IslCtx; }
 
 ScalarEvolution *Scop::getSE() const { return SE; }