[llvm-commits] [polly] r144232 - in /polly/trunk: include/polly/TempScopInfo.h lib/Analysis/TempScopInfo.cpp test/ScopInfo/simple_loop_0.ll

[Tobias Grosser]

Author: grosser
Date: Wed Nov  9 16:35:15 2011
New Revision: 144232

URL: http://llvm.org/viewvc/llvm-project?rev=144232&view=rev
Log:
Remove unused parameters from TempScop

Removed:
    polly/trunk/test/ScopInfo/simple_loop_0.ll
Modified:
    polly/trunk/include/polly/TempScopInfo.h
    polly/trunk/lib/Analysis/TempScopInfo.cpp

Modified: polly/trunk/include/polly/TempScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/TempScopInfo.h?rev=144232&r1=144231&r2=144232&view=diff
==============================================================================
--- polly/trunk/include/polly/TempScopInfo.h (original)
+++ polly/trunk/include/polly/TempScopInfo.h Wed Nov  9 16:35:15 2011
@@ -104,9 +104,6 @@
   // The Region.
   Region &R;
 
-  // Parameters used in this Scop.
-  ParamSetType Params;
-
   // The max loop depth of this Scop
   unsigned MaxLoopDepth;
 
@@ -130,14 +127,6 @@
 public:
   ~TempScop();
 
-  /// @name Information about this Temporary Scop.
-  ///
-  //@{
-  /// @brief Get the parameters used in this Scop.
-  ///
-  /// @return The parameters use in region.
-  ParamSetType &getParamSet() { return Params; }
-
   /// @brief Get the maximum Region contained by this Scop.
   ///
   /// @return The maximum Region contained by this Scop.
@@ -268,8 +257,7 @@
 
   bool isReduction(BasicBlock &BB);
 
-  void buildAccessFunctions(Region &RefRegion, ParamSetType &Params,
-                            BasicBlock &BB);
+  void buildAccessFunctions(Region &RefRegion, BasicBlock &BB);
 
   void buildLoopBounds(TempScop &Scop);
 

Modified: polly/trunk/lib/Analysis/TempScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=144232&r1=144231&r2=144232&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/TempScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/TempScopInfo.cpp Wed Nov  9 16:35:15 2011
@@ -63,13 +63,8 @@
 }
 
 void TempScop::print(raw_ostream &OS, ScalarEvolution *SE, LoopInfo *LI) const {
-  OS << "Scop: " << R.getNameStr() << "\tParameters: (";
-  // Print Parameters.
-  for (ParamSetType::const_iterator PI = Params.begin(), PE = Params.end();
-    PI != PE; ++PI)
-    OS << **PI << ", ";
-
-  OS << "), Max Loop Depth: "<< MaxLoopDepth <<"\n";
+  OS << "Scop: " << R.getNameStr() << ", Max Loop Depth: "<< MaxLoopDepth
+    << "\n";
 
   printDetail(OS, SE, LI, &R, 0);
 }
@@ -79,8 +74,7 @@
                            unsigned ind) const {
 }
 
-void TempScopInfo::buildAccessFunctions(Region &R, ParamSetType &Parameter,
-                                        BasicBlock &BB) {
+void TempScopInfo::buildAccessFunctions(Region &R, BasicBlock &BB) {
   AccFuncSetType Functions;
 
   for (BasicBlock::iterator I = BB.begin(), E = --BB.end(); I != E; ++I) {
@@ -226,7 +220,7 @@
   for (Region::block_iterator I = R.block_begin(), E = R.block_end();
        I != E; ++I) {
     BasicBlock *BB =  I->getNodeAs<BasicBlock>();
-    buildAccessFunctions(R, TScop->getParamSet(), *BB);
+    buildAccessFunctions(R, *BB);
     buildCondition(BB, R.getEntry(), *TScop);
   }
 

Removed: polly/trunk/test/ScopInfo/simple_loop_0.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/simple_loop_0.ll?rev=144231&view=auto
==============================================================================
--- polly/trunk/test/ScopInfo/simple_loop_0.ll (original)
+++ polly/trunk/test/ScopInfo/simple_loop_0.ll (removed)
@@ -1,33 +0,0 @@
-; RUN: opt %loadPolly %defaultOpts -polly-analyze-ir  -analyze %s | FileCheck %s
-
-;void f(long a[], long N) {
-;  long i;
-;  for (i = 0; i < 128; ++i)
-;    a[i] = a[i] - a[i + 2];
-;}
-
-target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
-target triple = "x86_64-unknown-linux-gnu"
-
-define void @f(i64* nocapture %a, i64 %N) nounwind {
-entry:
-  br label %bb
-
-bb:                                               ; preds = %bb, %entry
-  %i.03 = phi i64 [ 0, %entry ], [ %3, %bb ]      ; <i64> [#uses=3]
-  %scevgep = getelementptr i64* %a, i64 %i.03     ; <i64*> [#uses=2]
-  %tmp = add i64 %i.03, 2                        ; <i64> [#uses=1]
-  %scevgep4 = getelementptr i64* %a, i64 %tmp     ; <i64*> [#uses=1]
-  %0 = load i64* %scevgep, align 8                ; <i64> [#uses=1]
-  %1 = load i64* %scevgep4, align 8               ; <i64> [#uses=1]
-  %2 = sub i64 %0, %1                             ; <i64> [#uses=1]
-  store i64 %2, i64* %scevgep, align 8
-  %3 = add nsw i64 %i.03, 1                       ; <i64> [#uses=2]
-  %exitcond = icmp eq i64 %3, 128                 ; <i1> [#uses=1]
-  br i1 %exitcond, label %return, label %bb
-
-return:                                           ; preds = %bb
-  ret void
-}
-
-; CHECK: Scop: bb => return        Parameters: ()