[polly] r225067 - Drop all constant scheduling dimensions

Tobias Grosser tobias at grosser.es
Thu Jan 1 15:01:13 PST 2015


Author: grosser
Date: Thu Jan  1 17:01:11 2015
New Revision: 225067

URL: http://llvm.org/viewvc/llvm-project?rev=225067&view=rev
Log:
Drop all constant scheduling dimensions

Schedule dimensions that have the same constant value accross all statements do
not carry any information, but due to the increased dimensionality of the
schedule cost compile time. To not pay this cost, we remove constant dimensions
if possible.

Modified:
    polly/trunk/include/polly/CodeGen/CodeGeneration.h
    polly/trunk/include/polly/ScopInfo.h
    polly/trunk/lib/Analysis/ScopInfo.cpp
    polly/trunk/test/DeadCodeElimination/non-affine.ll
    polly/trunk/test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll
    polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel.ll
    polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel_parametric.ll
    polly/trunk/test/Isl/Ast/OpenMP/nested_loop_inner_parallel.ll
    polly/trunk/test/Isl/Ast/OpenMP/nested_loop_outer_parallel.ll
    polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_non_parallel.ll
    polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel.ll
    polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel_computeout.ll
    polly/trunk/test/Isl/Ast/aliasing_parametric_simple_1.ll
    polly/trunk/test/Isl/Ast/aliasing_parametric_simple_2.ll
    polly/trunk/test/Isl/Ast/reduction_different_reduction_clauses.ll
    polly/trunk/test/Isl/Ast/reduction_in_one_dimension.ll
    polly/trunk/test/Isl/Ast/reduction_multiple_dimensions.ll
    polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_2.ll
    polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_3.ll
    polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_4.ll
    polly/trunk/test/Isl/Ast/run-time-condition.ll
    polly/trunk/test/Isl/Ast/simple-run-time-condition.ll
    polly/trunk/test/Isl/Ast/single_loop_strip_mine.ll
    polly/trunk/test/Isl/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll
    polly/trunk/test/Isl/CodeGen/20110312-Fail-without-basicaa.ll
    polly/trunk/test/Isl/CodeGen/20120403-RHS-type-mismatch.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-iv.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-2.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-3.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/loop-bounds-reference-outer-ids.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/reference-other-bb.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/reference-preceeding-loop.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/single_loop.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/single_loop_with_loop_invariant_baseptr.ll
    polly/trunk/test/Isl/CodeGen/OpenMP/single_parallel_loop___%for.i---%exit.jscop
    polly/trunk/test/Isl/CodeGen/OpenMP/two-parallel-loops-reference-outer-indvar.ll
    polly/trunk/test/Isl/CodeGen/aliasing_multidimensional_access.ll
    polly/trunk/test/Isl/CodeGen/create-conditional-scop.ll
    polly/trunk/test/Isl/CodeGen/loop_with_condition.ll
    polly/trunk/test/Isl/CodeGen/loop_with_condition_2.ll
    polly/trunk/test/Isl/CodeGen/loop_with_condition_ineq.ll
    polly/trunk/test/Isl/CodeGen/loop_with_condition_nested.ll
    polly/trunk/test/Isl/CodeGen/reduction_2.ll
    polly/trunk/test/Isl/CodeGen/simple_nonaffine_loop.ll
    polly/trunk/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll
    polly/trunk/test/Isl/CodeGen/single_do_loop_ll_max_iterations.ll
    polly/trunk/test/Isl/CodeGen/single_do_loop_scev_replace.ll
    polly/trunk/test/Isl/CodeGen/single_loop.ll
    polly/trunk/test/Isl/CodeGen/single_loop_int_max_iterations.ll
    polly/trunk/test/Isl/CodeGen/single_loop_ll_max_iterations.ll
    polly/trunk/test/Isl/CodeGen/single_loop_param.ll
    polly/trunk/test/Isl/CodeGen/split_edges.ll
    polly/trunk/test/Isl/CodeGen/split_edges_2.ll
    polly/trunk/test/Isl/CodeGen/test-invalid-operands-for-select.ll
    polly/trunk/test/Isl/CodeGen/test.ll
    polly/trunk/test/Isl/CodeGen/two-scops-in-row.ll
    polly/trunk/test/Isl/single_loop_param_less_equal.ll
    polly/trunk/test/Isl/single_loop_param_less_than.ll
    polly/trunk/test/ScopInfo/loop_affine_bound_0.ll
    polly/trunk/test/ScopInfo/loop_affine_bound_1.ll
    polly/trunk/test/ScopInfo/loop_affine_bound_2.ll
    polly/trunk/test/ScopInfo/loop_carry.ll
    polly/trunk/test/ScopInfo/multidim_2d-diagonal-matrix.ll
    polly/trunk/test/ScopInfo/multidim_2d_outer_parametric_offset.ll
    polly/trunk/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll
    polly/trunk/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll
    polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll
    polly/trunk/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll
    polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll
    polly/trunk/test/ScopInfo/multidim_only_ivs_2d.ll
    polly/trunk/test/ScopInfo/multidim_only_ivs_3d.ll
    polly/trunk/test/ScopInfo/multidim_only_ivs_3d_cast.ll
    polly/trunk/test/ScopInfo/multidim_only_ivs_3d_reverse.ll
    polly/trunk/test/ScopInfo/non_affine_parametric_loop.ll
    polly/trunk/test/ScopInfo/scalar.ll
    polly/trunk/test/ScopInfo/simple_loop_1.ll

Modified: polly/trunk/include/polly/CodeGen/CodeGeneration.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/CodeGen/CodeGeneration.h?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/include/polly/CodeGen/CodeGeneration.h (original)
+++ polly/trunk/include/polly/CodeGen/CodeGeneration.h Thu Jan  1 17:01:11 2015
@@ -46,6 +46,8 @@ static inline int getNumberOfIterations(
   Identity = isl_map_add_dims(Identity, isl_dim_in, 1);
   Identity = isl_map_add_dims(Identity, isl_dim_out, 1);
 
+  Domain = isl_set_reset_tuple_id(Domain);
+
   isl_map *Map =
       isl_map_from_domain_and_range(isl_set_copy(Domain), isl_set_copy(Domain));
   isl_set_free(Domain);

Modified: polly/trunk/include/polly/ScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopInfo.h?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopInfo.h (original)
+++ polly/trunk/include/polly/ScopInfo.h Thu Jan  1 17:01:11 2015
@@ -815,6 +815,13 @@ public:
   /// @returns True if __no__ error occurred, false otherwise.
   bool buildAliasGroups(AliasAnalysis &AA);
 
+  //// @brief Drop all constant dimensions from statment schedules.
+  ///
+  ///  Schedule dimensions that are constant accross the scop do not carry
+  ///  any information, but would cost compile time due to the increased number
+  ///  of scheduling dimensions. To not pay this cost, we remove them.
+  void dropConstantScheduleDims();
+
   /// @brief Return all alias groups for this SCoP.
   const MinMaxVectorVectorTy &getAliasGroups() const {
     return MinMaxAliasGroups;

Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Thu Jan  1 17:01:11 2015
@@ -1478,6 +1478,42 @@ static unsigned getMaxLoopDepthInRegion(
   return MaxLD - MinLD + 1;
 }
 
+void Scop::dropConstantScheduleDims() {
+  isl_union_map *FullSchedule = getSchedule();
+
+  if (isl_union_map_n_map(FullSchedule) == 0) {
+    isl_union_map_free(FullSchedule);
+    return;
+  }
+
+  isl_set *ScheduleSpace =
+      isl_set_from_union_set(isl_union_map_range(FullSchedule));
+  isl_map *DropDimMap = isl_set_identity(isl_set_copy(ScheduleSpace));
+
+  int NumDimsDropped = 0;
+  for (unsigned i = 0; i < isl_set_dim(ScheduleSpace, isl_dim_set); i++)
+    if (i % 2 == 0) {
+      isl_val *FixedVal =
+          isl_set_plain_get_val_if_fixed(ScheduleSpace, isl_dim_set, i);
+      if (isl_val_is_int(FixedVal)) {
+        DropDimMap =
+            isl_map_project_out(DropDimMap, isl_dim_out, i - NumDimsDropped, 1);
+        NumDimsDropped++;
+      }
+      isl_val_free(FixedVal);
+    }
+
+  DropDimMap = isl_map_set_tuple_id(
+      DropDimMap, isl_dim_out, isl_map_get_tuple_id(DropDimMap, isl_dim_in));
+  for (auto *S : *this) {
+    isl_map *Schedule = S->getScattering();
+    Schedule = isl_map_apply_range(Schedule, isl_map_copy(DropDimMap));
+    S->setScattering(Schedule);
+  }
+  isl_set_free(ScheduleSpace);
+  isl_map_free(DropDimMap);
+}
+
 Scop::Scop(TempScop &tempScop, LoopInfo &LI, ScalarEvolution &ScalarEvolution,
            isl_ctx *Context)
     : SE(&ScalarEvolution), R(tempScop.getMaxRegion()),
@@ -1497,6 +1533,7 @@ Scop::Scop(TempScop &tempScop, LoopInfo
   realignParams();
   addParameterBounds();
   simplifyAssumedContext();
+  dropConstantScheduleDims();
 
   assert(NestLoops.empty() && "NestLoops not empty at top level!");
 }

Modified: polly/trunk/test/DeadCodeElimination/non-affine.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/DeadCodeElimination/non-affine.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/DeadCodeElimination/non-affine.ll (original)
+++ polly/trunk/test/DeadCodeElimination/non-affine.ll Thu Jan  1 17:01:11 2015
@@ -1,6 +1,6 @@
 ; RUN: opt %loadPolly -polly-allow-nonaffine -polly-dce -polly-ast -analyze < %s | FileCheck %s
 ;
-; CHECK: for (int c1 = 0; c1 <= 1023; c1 += 1)
+; CHECK: for (int c0 = 0; c0 <= 1023; c0 += 1)
 ;
 ;    void f(int *A) {
 ;      for (int i = 0; i < 1024; i++)

Modified: polly/trunk/test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll (original)
+++ polly/trunk/test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll Thu Jan  1 17:01:11 2015
@@ -4,7 +4,7 @@
 ;
 ; CHECK: Read: { [Stmt_for_cond[i0] -> MemRef_sum[0]] -> MemRef_sum[0] : i0 >= 0 and i0 <= 100 }
 ; CHECK: Write: { [Stmt_for_cond[i0] -> MemRef_sum[0]] -> MemRef_sum[0] : i0 >= 0 and i0 <= 100 }
-; CHECK: Schedule: { Stmt_for_cond[i0] -> scattering[0, i0, 0]; [Stmt_for_cond[i0] -> MemRef_sum[0]] -> scattering[0, i0, 0] : i0 <= 100 and i0 >= 0 }
+; CHECK: Schedule: { [Stmt_for_cond[i0] -> MemRef_sum[0]] -> scattering[i0] : i0 <= 100 and i0 >= 0; Stmt_for_cond[i0] -> scattering[i0] }
 ; CHECK: Wrapped Dependences:
 ; CHECK: RAW dependences:
 ; CHECK:   { [Stmt_for_cond[i0] -> MemRef_sum[0]] -> [Stmt_for_cond[1 + i0] -> MemRef_sum[0]] : i0 >= 0 and i0 <= 99 }

Modified: polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel.ll (original)
+++ polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel.ll Thu Jan  1 17:01:11 2015
@@ -44,9 +44,9 @@ ret:
 ; annotations.
 
 ; CHECK:     #pragma omp parallel for
-; CHECK:     for (int c1 = 0; c1 <= 1023; c1 += 1)
+; CHECK:     for (int c0 = 0; c0 <= 1023; c0 += 1)
 ; CHECK-NOT:   #pragma omp parallel for
 ; CHECK:       #pragma simd
 ; CHECK-NOT:   #pragma omp parallel for
-; CHECK:       for (int c3 = 0; c3 <= 1023; c3 += 1)
-; CHECK:         Stmt_loop_body(c1, c3);
+; CHECK:       for (int c1 = 0; c1 <= 1023; c1 += 1)
+; CHECK:         Stmt_loop_body(c0, c1);

Modified: polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel_parametric.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel_parametric.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel_parametric.ll (original)
+++ polly/trunk/test/Isl/Ast/OpenMP/nested_loop_both_parallel_parametric.ll Thu Jan  1 17:01:11 2015
@@ -43,7 +43,7 @@ ret:
 
 ; CHECK: if (n <= 1024 ? 1 : 0)
 ; CHECK:   #pragma omp parallel for
-; CHECK:   for (int c1 = 0; c1 < n; c1 += 1)
+; CHECK:   for (int c0 = 0; c0 < n; c0 += 1)
 ; CHECK:     #pragma simd
-; CHECK:     for (int c3 = 0; c3 < n; c3 += 1)
-; CHECK:       Stmt_loop_body(c1, c3);
+; CHECK:     for (int c1 = 0; c1 < n; c1 += 1)
+; CHECK:       Stmt_loop_body(c0, c1);

Modified: polly/trunk/test/Isl/Ast/OpenMP/nested_loop_inner_parallel.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/OpenMP/nested_loop_inner_parallel.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/OpenMP/nested_loop_inner_parallel.ll (original)
+++ polly/trunk/test/Isl/Ast/OpenMP/nested_loop_inner_parallel.ll Thu Jan  1 17:01:11 2015
@@ -40,8 +40,8 @@ ret:
   ret void
 }
 
-; CHECK: for (int c1 = 0; c1 < n; c1 += 1)
+; CHECK: for (int c0 = 0; c0 < n; c0 += 1)
 ; CHECK:   #pragma simd
 ; CHECK:   #pragma omp parallel for
-; CHECK:   for (int c3 = 0; c3 < n; c3 += 1)
-; CHECK:     Stmt_loop_body(c1, c3);
+; CHECK:   for (int c1 = 0; c1 < n; c1 += 1)
+; CHECK:     Stmt_loop_body(c0, c1);

Modified: polly/trunk/test/Isl/Ast/OpenMP/nested_loop_outer_parallel.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/OpenMP/nested_loop_outer_parallel.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/OpenMP/nested_loop_outer_parallel.ll (original)
+++ polly/trunk/test/Isl/Ast/OpenMP/nested_loop_outer_parallel.ll Thu Jan  1 17:01:11 2015
@@ -41,6 +41,6 @@ ret:
 }
 
 ; CHECK: #pragma omp parallel for
-; CHECK: for (int c1 = 0; c1 < n; c1 += 1)
-; CHECK:   for (int c3 = 0; c3 < n; c3 += 1)
-; CHECK:     Stmt_loop_body(c1, c3);
+; CHECK: for (int c0 = 0; c0 < n; c0 += 1)
+; CHECK:   for (int c1 = 0; c1 < n; c1 += 1)
+; CHECK:     Stmt_loop_body(c0, c1);

Modified: polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_non_parallel.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_non_parallel.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_non_parallel.ll (original)
+++ polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_non_parallel.ll Thu Jan  1 17:01:11 2015
@@ -30,5 +30,5 @@ ret:
   ret void
 }
 
-; CHECK: for (int c1 = 0; c1 < n; c1 += 1)
-; CHECK:   Stmt_loop_body(c1)
+; CHECK: for (int c0 = 0; c0 < n; c0 += 1)
+; CHECK:   Stmt_loop_body(c0)

Modified: polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel.ll (original)
+++ polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel.ll Thu Jan  1 17:01:11 2015
@@ -32,5 +32,5 @@ ret:
 
 ; CHECK: #pragma simd
 ; CHECK: #pragma omp parallel for
-; CHECK: for (int c1 = 0; c1 < n; c1 += 1)
-; CHECK:   Stmt_loop_body(c1)
+; CHECK: for (int c0 = 0; c0 < n; c0 += 1)
+; CHECK:   Stmt_loop_body(c0)

Modified: polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel_computeout.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel_computeout.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel_computeout.ll (original)
+++ polly/trunk/test/Isl/Ast/OpenMP/single_loop_param_parallel_computeout.ll Thu Jan  1 17:01:11 2015
@@ -32,5 +32,5 @@ ret:
 
 ; CHECK-NOT: #pragma simd
 ; CHECK-NOT: #pragma omp parallel for
-; CHECK: for (int c1 = 0; c1 < n; c1 += 1)
-; CHECK:   Stmt_loop_body(c1)
+; CHECK: for (int c0 = 0; c0 < n; c0 += 1)
+; CHECK:   Stmt_loop_body(c0)

Modified: polly/trunk/test/Isl/Ast/aliasing_parametric_simple_1.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/aliasing_parametric_simple_1.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/aliasing_parametric_simple_1.ll (original)
+++ polly/trunk/test/Isl/Ast/aliasing_parametric_simple_1.ll Thu Jan  1 17:01:11 2015
@@ -6,8 +6,8 @@
 ;    }
 ;
 ; CHECK: if (1 && (&MemRef_A[1024] <= &MemRef_B[c] || &MemRef_B[c + 1] <= &MemRef_A[0]))
-; CHECK:     for (int c1 = 0; c1 <= 1023; c1 += 1)
-; CHECK:       Stmt_for_body(c1);
+; CHECK:     for (int c0 = 0; c0 <= 1023; c0 += 1)
+; CHECK:       Stmt_for_body(c0);
 ; CHECK: else
 ; CHECK:     /* original code */
 ;

Modified: polly/trunk/test/Isl/Ast/aliasing_parametric_simple_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/aliasing_parametric_simple_2.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/aliasing_parametric_simple_2.ll (original)
+++ polly/trunk/test/Isl/Ast/aliasing_parametric_simple_2.ll Thu Jan  1 17:01:11 2015
@@ -6,8 +6,8 @@
 ;    }
 ;
 ; CHECK: if (1 && (&MemRef_A[1024] <= &MemRef_B[c >= 15 ? 5 : c - 10] || &MemRef_B[c <= 15 ? 6 : c - 9] <= &MemRef_A[0]))
-; CHECK:     for (int c1 = 0; c1 <= 1023; c1 += 1)
-; CHECK:       Stmt_for_body(c1);
+; CHECK:     for (int c0 = 0; c0 <= 1023; c0 += 1)
+; CHECK:       Stmt_for_body(c0);
 ; CHECK: else
 ; CHECK:    /* original code */
 ;

Modified: polly/trunk/test/Isl/Ast/reduction_different_reduction_clauses.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/reduction_different_reduction_clauses.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/reduction_different_reduction_clauses.ll (original)
+++ polly/trunk/test/Isl/Ast/reduction_different_reduction_clauses.ll Thu Jan  1 17:01:11 2015
@@ -2,8 +2,8 @@
 ;
 ; CHECK: #pragma simd reduction (+ : sum{{[1,2]}}, sum{{[1,2]}}) reduction (* : prod) reduction (| : or) reduction (& : and)
 ; CHECK: #pragma known-parallel reduction (+ : sum{{[1,2]}}, sum{{[1,2]}}) reduction (* : prod) reduction (| : or) reduction (& : and)
-; CHECK: for (int c1 = 0; c1 < N; c1 += 1)
-; CHECK:   Stmt_for_body(c1);
+; CHECK: for (int c0 = 0; c0 < N; c0 += 1)
+; CHECK:   Stmt_for_body(c0);
 ;
 ;    void f(int N, int *restrict sum1, int *restrict sum2, int *restrict prod,
 ;           int *restrict and, int *restrict or ) {

Modified: polly/trunk/test/Isl/Ast/reduction_in_one_dimension.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/reduction_in_one_dimension.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/reduction_in_one_dimension.ll (original)
+++ polly/trunk/test/Isl/Ast/reduction_in_one_dimension.ll Thu Jan  1 17:01:11 2015
@@ -3,10 +3,10 @@
 ; Verify that we won't privatize anything in the outer dimension
 ;
 ; CHECK:    #pragma known-parallel
-; CHECK:    for (int c1 = 0; c1 < 2 * n; c1 += 1)
+; CHECK:    for (int c0 = 0; c0 < 2 * n; c0 += 1)
 ; CHECK:      #pragma simd reduction
-; CHECK:      for (int c3 = 0; c3 <= 1023; c3 += 1)
-; CHECK:        Stmt_for_body3(c1, c3);
+; CHECK:      for (int c1 = 0; c1 <= 1023; c1 += 1)
+; CHECK:        Stmt_for_body3(c0, c1);
 ;
 ;    void foo(int *A, long n) {
 ;      for (long i = 0; i < 2 * n; i++)

Modified: polly/trunk/test/Isl/Ast/reduction_multiple_dimensions.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/reduction_multiple_dimensions.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/reduction_multiple_dimensions.ll (original)
+++ polly/trunk/test/Isl/Ast/reduction_multiple_dimensions.ll Thu Jan  1 17:01:11 2015
@@ -2,11 +2,11 @@
 ;
 ; CHECK-NOT:#pragma known-parallel reduction
 ; CHECK:    #pragma known-parallel
-; CHECK:    for (int c1 = 0; c1 <= 2047; c1 += 1)
-; CHECK:      for (int c3 = 0; c3 <= 1023; c3 += 1)
+; CHECK:    for (int c0 = 0; c0 <= 2047; c0 += 1)
+; CHECK:      for (int c1 = 0; c1 <= 1023; c1 += 1)
 ; CHECK:        #pragma simd reduction
-; CHECK:        for (int c5 = 0; c5 <= 511; c5 += 1)
-; CHECK:          Stmt_for_body6(c1, c3, c5);
+; CHECK:        for (int c2 = 0; c2 <= 511; c2 += 1)
+; CHECK:          Stmt_for_body6(c0, c1, c2);
 ;
 ;    void rmd(int *A) {
 ;      for (long i = 0; i < 2048; i++)

Modified: polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_2.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_2.ll (original)
+++ polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_2.ll Thu Jan  1 17:01:11 2015
@@ -2,11 +2,11 @@
 ;
 ; CHECK-NOT:#pragma known-parallel reduction
 ; CHECK:    #pragma known-parallel
-; CHECK:    for (int c1 = 0; c1 <= 2047; c1 += 1)
-; CHECK:      for (int c3 = 0; c3 <= 1023; c3 += 1)
+; CHECK:    for (int c0 = 0; c0 <= 2047; c0 += 1)
+; CHECK:      for (int c1 = 0; c1 <= 1023; c1 += 1)
 ; CHECK:        #pragma simd reduction
-; CHECK:        for (int c5 = 0; c5 <= 511; c5 += 1)
-; CHECK:          Stmt_for_body6(c1, c3, c5);
+; CHECK:        for (int c2 = 0; c2 <= 511; c2 += 1)
+; CHECK:          Stmt_for_body6(c0, c1, c2);
 ;
 ;    void rmd2(int *A) {
 ;      for (long i = 0; i < 2048; i++)

Modified: polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_3.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_3.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_3.ll (original)
+++ polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_3.ll Thu Jan  1 17:01:11 2015
@@ -2,11 +2,11 @@
 ;
 ; CHECK-NOT:#pragma known-parallel reduction
 ; CHECK:    #pragma known-parallel
-; CHECK:    for (int c1 = 0; c1 <= 2047; c1 += 1)
-; CHECK:      for (int c3 = 0; c3 <= 1023; c3 += 1)
+; CHECK:    for (int c0 = 0; c0 <= 2047; c0 += 1)
+; CHECK:      for (int c1 = 0; c1 <= 1023; c1 += 1)
 ; CHECK:        #pragma simd reduction
-; CHECK:        for (int c5 = 0; c5 <= 511; c5 += 1)
-; CHECK:          Stmt_for_body6(c1, c3, c5);
+; CHECK:        for (int c2 = 0; c2 <= 511; c2 += 1)
+; CHECK:          Stmt_for_body6(c0, c1, c2);
 ;
 ;    void rmd3(int *A) {
 ;      for (long i = 0; i < 2048; i++)

Modified: polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_4.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_4.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_4.ll (original)
+++ polly/trunk/test/Isl/Ast/reduction_multiple_dimensions_4.ll Thu Jan  1 17:01:11 2015
@@ -2,11 +2,11 @@
 ;
 ; CHECK-NOT:#pragma known-parallel reduction
 ; CHECK:    #pragma known-parallel
-; CHECK:    for (int c1 = 0; c1 <= 2047; c1 += 1)
-; CHECK:      for (int c3 = 0; c3 <= 1023; c3 += 1)
+; CHECK:    for (int c0 = 0; c0 <= 2047; c0 += 1)
+; CHECK:      for (int c1 = 0; c1 <= 1023; c1 += 1)
 ; CHECK:        #pragma simd reduction
-; CHECK:        for (int c5 = 0; c5 <= 511; c5 += 1)
-; CHECK:          Stmt_for_body6(c1, c3, c5);
+; CHECK:        for (int c2 = 0; c2 <= 511; c2 += 1)
+; CHECK:          Stmt_for_body6(c0, c1, c2);
 ;
 ;    void rmd4(int *A) {
 ;      for (long i = 0; i < 2048; i++)

Modified: polly/trunk/test/Isl/Ast/run-time-condition.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/run-time-condition.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/run-time-condition.ll (original)
+++ polly/trunk/test/Isl/Ast/run-time-condition.ll Thu Jan  1 17:01:11 2015
@@ -29,8 +29,8 @@ for.end:
 }
 
 ; CHECK: if (1)
-; CHECK:     for (int c1 = 0; c1 <= 1023; c1 += 1)
-; CHECK:       Stmt_for_body(c1);
+; CHECK:     for (int c0 = 0; c0 <= 1023; c0 += 1)
+; CHECK:       Stmt_for_body(c0);
 ; CHECK: else
 ; CHECK:     {  /* original code */ }
 

Modified: polly/trunk/test/Isl/Ast/simple-run-time-condition.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/simple-run-time-condition.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/simple-run-time-condition.ll (original)
+++ polly/trunk/test/Isl/Ast/simple-run-time-condition.ll Thu Jan  1 17:01:11 2015
@@ -26,12 +26,12 @@ target triple = "x86_64-unknown-linux-gn
 
 ; CHECK:     if (o >= 1) {
 ; CHECK:       for (int c1 = 0; c1 < n; c1 += 1)
-; CHECK:         for (int c3 = 0; c3 < m; c3 += 1)
-; CHECK:           Stmt_for_j(c1, c3);
+; CHECK:         for (int c2 = 0; c2 < m; c2 += 1)
+; CHECK:           Stmt_for_j(c1, c2);
 ; CHECK:     } else
 ; CHECK:       for (int c1 = 0; c1 < n; c1 += 1)
-; CHECK:         for (int c3 = 0; c3 < m; c3 += 1)
-; CHECK:           Stmt_for_j_1(c1, c3);
+; CHECK:         for (int c2 = 0; c2 < m; c2 += 1)
+; CHECK:           Stmt_for_j_1(c1, c2);
 
 ; CHECK: else
 ; CHECK:     {  /* original code */ }

Modified: polly/trunk/test/Isl/Ast/single_loop_strip_mine.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/single_loop_strip_mine.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/single_loop_strip_mine.ll (original)
+++ polly/trunk/test/Isl/Ast/single_loop_strip_mine.ll Thu Jan  1 17:01:11 2015
@@ -29,8 +29,8 @@ for.end:
   ret void
 }
 
-; CHECK: for (int c1 = 0; c1 <= 1023; c1 += 1)
-; CHECK:     Stmt_for_body(c1);
+; CHECK: for (int c0 = 0; c0 <= 1023; c0 += 1)
+; CHECK:     Stmt_for_body(c0);
 
 ; CHECK-VECTOR: #pragma known-parallel
 ; CHECK-VECTOR: for (int c0 = 0; c0 <= 1023; c0 += 4)

Modified: polly/trunk/test/Isl/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll (original)
+++ polly/trunk/test/Isl/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll Thu Jan  1 17:01:11 2015
@@ -25,6 +25,6 @@ for.inc:
 for.end:                                          ; preds = %a
   br label %for.cond5
 
-for.cond5:                                        ; preds = %for.inc17, %for.end
+for.cond5:                                        ; preds = %for.inc07, %for.end
   ret void
 }

Modified: polly/trunk/test/Isl/CodeGen/20110312-Fail-without-basicaa.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/20110312-Fail-without-basicaa.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/20110312-Fail-without-basicaa.ll (original)
+++ polly/trunk/test/Isl/CodeGen/20110312-Fail-without-basicaa.ll Thu Jan  1 17:01:11 2015
@@ -13,11 +13,11 @@ entry.split:
   br label %for.body
 
 for.body:                                         ; preds = %for.body, %entry.split
-  %j.01 = phi i32 [ 0, %entry.split ], [ %inc3, %for.body ]
+  %j.01 = phi i32 [ 0, %entry.split ], [ %inc1, %for.body ]
   %t.02.reload = load float* %t.02.reg2mem
   %inc = fadd float %t.02.reload, 1.000000e+00
-  %inc3 = add nsw i32 %j.01, 1
-  %exitcond = icmp eq i32 %inc3, 5000001
+  %inc1 = add nsw i32 %j.01, 1
+  %exitcond = icmp eq i32 %inc1, 5000001
   store float %inc, float* %t.02.reg2mem
   br i1 %exitcond, label %for.end, label %for.body
 

Modified: polly/trunk/test/Isl/CodeGen/20120403-RHS-type-mismatch.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/20120403-RHS-type-mismatch.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/20120403-RHS-type-mismatch.ll (original)
+++ polly/trunk/test/Isl/CodeGen/20120403-RHS-type-mismatch.ll Thu Jan  1 17:01:11 2015
@@ -17,8 +17,8 @@ for.body:
   br i1 undef, label %for.body, label %for.cond5.preheader
 
 for.body7:                                        ; preds = %for.body7, %for.cond5.preheader
-  %i.128 = phi i64 [ 0, %for.cond5.preheader ], [ %inc17, %for.body7 ]
-  %inc17 = add nsw i64 %i.128, 1
+  %i.128 = phi i64 [ 0, %for.cond5.preheader ], [ %inc07, %for.body7 ]
+  %inc07 = add nsw i64 %i.128, 1
   store i64 undef, i64* %hi.129.reg2mem
   br i1 false, label %for.body7, label %for.end18
 

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-iv.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-iv.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-iv.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-iv.ll Thu Jan  1 17:01:11 2015
@@ -6,8 +6,8 @@
 ; properly forward the value of this expression to the subfunction.
 
 ; AST: #pragma omp parallel for
-; AST: for (int c1 = 0; c1 <= 1023; c1 += 1)
-; AST:  Stmt_for_j(c1);
+; AST: for (int c0 = 0; c0 <= 1023; c0 += 1)
+; AST:  Stmt_for_j(c0);
 
 ; IR: @single_parallel_loop.polly.subfn
 

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-2.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-2.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-2.ll Thu Jan  1 17:01:11 2015
@@ -3,8 +3,8 @@
 
 ; AST: #pragma simd
 ; AST: #pragma omp parallel for
-; AST: for (int c1 = 0; c1 <= 1023; c1 += 1)
-; AST:   Stmt_for_i(c1);
+; AST: for (int c0 = 0; c0 <= 1023; c0 += 1)
+; AST:   Stmt_for_i(c0);
 
 ; IR: getelementptr inbounds { [1024 x double]* }* %polly.par.userContext, i32 0, i32 0
 

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-3.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-3.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-3.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values-3.ll Thu Jan  1 17:01:11 2015
@@ -9,8 +9,8 @@
 ; properly forwarded to the subfunction.
 
 ; AST: #pragma omp parallel for
-; AST: for (int c1 = 0; c1 < cols; c1 += 1)
-; AST:   Stmt_for_body(c1);
+; AST: for (int c0 = 0; c0 < cols; c0 += 1)
+; AST:   Stmt_for_body(c0);
 
 ; IR: @foo.polly.subfn
 
@@ -40,8 +40,8 @@ end:
 ; expression defined outside of the scop.
 
 ; AST: #pragma omp parallel for
-; AST: for (int c1 = 0; c1 < cols; c1 += 1)
-; AST:   Stmt_for_body(c1);
+; AST: for (int c0 = 0; c0 < cols; c0 += 1)
+; AST:   Stmt_for_body(c0);
 
 ; IR: @bar.polly.subfn
 

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/loop-body-references-outer-values.ll Thu Jan  1 17:01:11 2015
@@ -12,8 +12,8 @@
 
 ; AST: #pragma simd
 ; AST: #pragma omp parallel for
-; AST: for (int c1 = 0; c1 <= 99; c1 += 1)
-; AST:   Stmt_for_body(c1);
+; AST: for (int c0 = 0; c0 <= 99; c0 += 1)
+; AST:   Stmt_for_body(c0);
 
 ; IR-LABEL: polly.start:
 ; IR-NEXT:  %0 = bitcast { float* }* %polly.par.userContext to i8*

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/loop-bounds-reference-outer-ids.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/loop-bounds-reference-outer-ids.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/loop-bounds-reference-outer-ids.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/loop-bounds-reference-outer-ids.ll Thu Jan  1 17:01:11 2015
@@ -16,12 +16,12 @@
 ; k-loop, are correctly passed to the subfunction.
 
 ; AST: #pragma minimal dependence distance: 1
-; AST: for (int c1 = max(0, -n + 1); c1 <= 99; c1 += 1)
+; AST: for (int c0 = max(0, -n + 1); c0 <= 99; c0 += 1)
 ; AST:   #pragma omp parallel for
-; AST:   for (int c3 = 0; c3 <= 99; c3 += 1)
+; AST:   for (int c1 = 0; c1 <= 99; c1 += 1)
 ; AST:     #pragma minimal dependence distance: 1
-; AST:     for (int c5 = 0; c5 < n + c1; c5 += 1)
-; AST:       Stmt_for_body6(c1, c3, c5);
+; AST:     for (int c2 = 0; c2 < n + c0; c2 += 1)
+; AST:       Stmt_for_body6(c0, c1, c2);
 
 ; IR: %polly.par.userContext = alloca { i64, i64 }
 ; IR: %4 = bitcast { i64, i64 }* %polly.par.userContext to i8*
@@ -47,16 +47,16 @@ define void @loop_references_outer_ids(i
 entry:
   br label %for.cond
 
-for.cond:                                         ; preds = %for.inc13, %entry
-  %i.0 = phi i64 [ 0, %entry ], [ %inc14, %for.inc13 ]
+for.cond:                                         ; preds = %for.inc03, %entry
+  %i.0 = phi i64 [ 0, %entry ], [ %inc04, %for.inc03 ]
   %exitcond1 = icmp ne i64 %i.0, 100
   br i1 %exitcond1, label %for.body, label %for.end15
 
 for.body:                                         ; preds = %for.cond
   br label %for.cond1
 
-for.cond1:                                        ; preds = %for.inc10, %for.body
-  %j.0 = phi i64 [ 0, %for.body ], [ %inc11, %for.inc10 ]
+for.cond1:                                        ; preds = %for.inc00, %for.body
+  %j.0 = phi i64 [ 0, %for.body ], [ %inc01, %for.inc00 ]
   %exitcond = icmp ne i64 %j.0, 100
   br i1 %exitcond, label %for.body3, label %for.end12
 
@@ -84,17 +84,17 @@ for.inc:
   br label %for.cond4
 
 for.end:                                          ; preds = %for.cond4
-  br label %for.inc10
+  br label %for.inc00
 
-for.inc10:                                        ; preds = %for.end
-  %inc11 = add nsw i64 %j.0, 1
+for.inc00:                                        ; preds = %for.end
+  %inc01 = add nsw i64 %j.0, 1
   br label %for.cond1
 
 for.end12:                                        ; preds = %for.cond1
-  br label %for.inc13
+  br label %for.inc03
 
-for.inc13:                                        ; preds = %for.end12
-  %inc14 = add nsw i64 %i.0, 1
+for.inc03:                                        ; preds = %for.end12
+  %inc04 = add nsw i64 %i.0, 1
   br label %for.cond
 
 for.end15:                                        ; preds = %for.cond

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/reference-other-bb.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/reference-other-bb.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/reference-other-bb.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/reference-other-bb.ll Thu Jan  1 17:01:11 2015
@@ -14,12 +14,12 @@ sw.bb3:
   br i1 %cmp75, label %for.body, label %end
 
 for.body:
-  %i.16 = phi i32 [ %inc14, %for.body ], [ 0, %sw.bb3 ]
+  %i.16 = phi i32 [ %inc04, %for.body ], [ 0, %sw.bb3 ]
   %idxprom11 = sext i32 %i.16 to i64
   %arrayidx12 = getelementptr inbounds double* %tmp, i64 %idxprom11
   store double 1.0, double* %arrayidx12, align 8
-  %inc14 = add nsw i32 %i.16, 1
-  %cmp7 = icmp slt i32 %inc14, %sendcount
+  %inc04 = add nsw i32 %i.16, 1
+  %cmp7 = icmp slt i32 %inc04, %sendcount
   br i1 %cmp7, label %for.body, label %end
 
 end:

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/reference-preceeding-loop.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/reference-preceeding-loop.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/reference-preceeding-loop.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/reference-preceeding-loop.ll Thu Jan  1 17:01:11 2015
@@ -9,13 +9,13 @@
 ; AST: if (symbol >= p_2 + 1) {
 ; AST-NEXT:   #pragma simd
 ; AST-NEXT:   #pragma omp parallel for
-; AST-NEXT:   for (int c1 = 0; c1 < p_0 + symbol; c1 += 1)
-; AST-NEXT:     Stmt_while_body(c1);
+; AST-NEXT:   for (int c0 = 0; c0 < p_0 + symbol; c0 += 1)
+; AST-NEXT:     Stmt_while_body(c0);
 ; AST-NEXT: } else
 ; AST-NEXT:   #pragma simd
 ; AST-NEXT:   #pragma omp parallel for
-; AST-NEXT:   for (int c1 = 0; c1 <= p_0 + p_2; c1 += 1)
-; AST-NEXT:     Stmt_while_body(c1);
+; AST-NEXT:   for (int c0 = 0; c0 <= p_0 + p_2; c0 += 1)
+; AST-NEXT:     Stmt_while_body(c0);
 
 ; IR: @update_model.polly.subfn
 ; IR: @update_model.polly.subfn1
@@ -30,8 +30,8 @@ entry:
   br label %for.one
 
 for.one:
-  %i.1 = phi i64 [ %dec17, %for.one ], [ %symbol, %entry ]
-  %dec17 = add nsw i64 %i.1, -1
+  %i.1 = phi i64 [ %dec07, %for.one ], [ %symbol, %entry ]
+  %dec07 = add nsw i64 %i.1, -1
   br i1 undef, label %for.one, label %while.body
 
 while.body:

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/single_loop.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/single_loop.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/single_loop.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/single_loop.ll Thu Jan  1 17:01:11 2015
@@ -19,14 +19,14 @@
 
 ; AST: #pragma simd
 ; AST: #pragma omp parallel for
-; AST: for (int c1 = 0; c1 <= 1023; c1 += 1)
-; AST:   Stmt_S(c1);
+; AST: for (int c0 = 0; c0 <= 1023; c0 += 1)
+; AST:   Stmt_S(c0);
 
 ; AST-STRIDE4: #pragma omp parallel for
-; AST-STRIDE4: for (int c1 = 0; c1 <= 1023; c1 += 4)
+; AST-STRIDE4: for (int c0 = 0; c0 <= 1023; c0 += 4)
 ; AST-STRIDE4:   #pragma simd
-; AST-STRIDE4:   for (int c2 = c1; c2 <= c1 + 3; c2 += 1)
-; AST-STRIDE4:     Stmt_S(c2);
+; AST-STRIDE4:   for (int c1 = c0; c1 <= c0 + 3; c1 += 1)
+; AST-STRIDE4:     Stmt_S(c1);
 
 ; IR-LABEL: single_parallel_loop()
 ; IR-NEXT: entry

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/single_loop_with_loop_invariant_baseptr.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/single_loop_with_loop_invariant_baseptr.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/single_loop_with_loop_invariant_baseptr.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/single_loop_with_loop_invariant_baseptr.ll Thu Jan  1 17:01:11 2015
@@ -12,8 +12,8 @@
 
 ; AST: #pragma simd
 ; AST: #pragma omp parallel for
-; AST: for (int c1 = 0; c1 <= 1023; c1 += 1)
-; AST:   Stmt_S(c1);
+; AST: for (int c0 = 0; c0 <= 1023; c0 += 1)
+; AST:   Stmt_S(c0);
 
 ; IR: @single_parallel_loop.polly.subfn
 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-n8:16:32:64"

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/single_parallel_loop___%for.i---%exit.jscop
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/single_parallel_loop___%25for.i---%25exit.jscop?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/single_parallel_loop___%for.i---%exit.jscop (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/single_parallel_loop___%for.i---%exit.jscop Thu Jan  1 17:01:11 2015
@@ -11,7 +11,7 @@
          ],
          "domain" : "{ Stmt_S[i0] : i0 >= 0 and i0 <= 1023 }",
          "name" : "Stmt_S",
-         "schedule" : "{ Stmt_S[i0] -> scattering[0, floor(i0/4) * 4, i0] }"
+         "schedule" : "{ Stmt_S[i0] -> scattering[floor(i0/4) * 4, i0] }"
       }
    ]
 }

Modified: polly/trunk/test/Isl/CodeGen/OpenMP/two-parallel-loops-reference-outer-indvar.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/OpenMP/two-parallel-loops-reference-outer-indvar.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/OpenMP/two-parallel-loops-reference-outer-indvar.ll (original)
+++ polly/trunk/test/Isl/CodeGen/OpenMP/two-parallel-loops-reference-outer-indvar.ll Thu Jan  1 17:01:11 2015
@@ -7,13 +7,13 @@
 ; AST: if (nj >= p_1 + 3) {
 ; AST:   #pragma simd
 ; AST:   #pragma omp parallel for
-; AST:   for (int c1 = 0; c1 < p_0 + nj - 1; c1 += 1)
-; AST:     Stmt_for_body35(c1);
+; AST:   for (int c0 = 0; c0 < p_0 + nj - 1; c0 += 1)
+; AST:     Stmt_for_body35(c0);
 ; AST: } else
 ; AST:   #pragma simd
 ; AST:   #pragma omp parallel for
-; AST:   for (int c1 = 0; c1 <= p_0 + p_1; c1 += 1)
-; AST:     Stmt_for_body35(c1);
+; AST:   for (int c0 = 0; c0 <= p_0 + p_1; c0 += 1)
+; AST:     Stmt_for_body35(c0);
 
 ; IR: @foo.polly.subfn
 ; IR: @foo.polly.subfn1

Modified: polly/trunk/test/Isl/CodeGen/aliasing_multidimensional_access.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/aliasing_multidimensional_access.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/aliasing_multidimensional_access.ll (original)
+++ polly/trunk/test/Isl/CodeGen/aliasing_multidimensional_access.ll Thu Jan  1 17:01:11 2015
@@ -21,16 +21,16 @@ define void @foo(i64 %n, i64 %m, i64 %p,
 entry:
   br label %for.cond
 
-for.cond:                                         ; preds = %for.inc13, %entry
-  %i.0 = phi i64 [ 0, %entry ], [ %inc14, %for.inc13 ]
+for.cond:                                         ; preds = %for.inc03, %entry
+  %i.0 = phi i64 [ 0, %entry ], [ %inc04, %for.inc03 ]
   %exitcond2 = icmp ne i64 %i.0, 100
   br i1 %exitcond2, label %for.body, label %for.end15
 
 for.body:                                         ; preds = %for.cond
   br label %for.cond1
 
-for.cond1:                                        ; preds = %for.inc10, %for.body
-  %j.0 = phi i64 [ 0, %for.body ], [ %inc11, %for.inc10 ]
+for.cond1:                                        ; preds = %for.inc00, %for.body
+  %j.0 = phi i64 [ 0, %for.body ], [ %inc01, %for.inc00 ]
   %exitcond1 = icmp ne i64 %j.0, 150
   br i1 %exitcond1, label %for.body3, label %for.end12
 
@@ -60,17 +60,17 @@ for.inc:
   br label %for.cond4
 
 for.end:                                          ; preds = %for.cond4
-  br label %for.inc10
+  br label %for.inc00
 
-for.inc10:                                        ; preds = %for.end
-  %inc11 = add nsw i64 %j.0, 1
+for.inc00:                                        ; preds = %for.end
+  %inc01 = add nsw i64 %j.0, 1
   br label %for.cond1
 
 for.end12:                                        ; preds = %for.cond1
-  br label %for.inc13
+  br label %for.inc03
 
-for.inc13:                                        ; preds = %for.end12
-  %inc14 = add nsw i64 %i.0, 1
+for.inc03:                                        ; preds = %for.end12
+  %inc04 = add nsw i64 %i.0, 1
   br label %for.cond
 
 for.end15:                                        ; preds = %for.cond

Modified: polly/trunk/test/Isl/CodeGen/create-conditional-scop.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/create-conditional-scop.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/create-conditional-scop.ll (original)
+++ polly/trunk/test/Isl/CodeGen/create-conditional-scop.ll Thu Jan  1 17:01:11 2015
@@ -9,19 +9,19 @@ define void @foo() nounwind {
 entry:
   br i1 undef, label %while.cond14.preheader, label %for.body7.single_entry.single_entry
 
-while.cond14.preheader:                           ; preds = %for.inc12, %for.body7.single_entry.single_entry, %entry
+while.cond14.preheader:                           ; preds = %for.inc02, %for.body7.single_entry.single_entry, %entry
   ret void
 
-for.body7.single_entry.single_entry:              ; preds = %for.inc12, %entry
+for.body7.single_entry.single_entry:              ; preds = %for.inc02, %entry
   br i1 undef, label %while.cond14.preheader, label %while.body
 
 while.body:                                       ; preds = %while.body, %for.body7.single_entry.single_entry
   %indvar35 = phi i32 [ %0, %while.body ], [ 0, %for.body7.single_entry.single_entry ]
   %0 = add i32 %indvar35, 1
   %exitcond2 = icmp eq i32 %0, 0
-  br i1 %exitcond2, label %for.inc12, label %while.body
+  br i1 %exitcond2, label %for.inc02, label %while.body
 
-for.inc12:                                        ; preds = %while.body
+for.inc02:                                        ; preds = %while.body
   br i1 undef, label %while.cond14.preheader, label %for.body7.single_entry.single_entry
 }
 

Modified: polly/trunk/test/Isl/CodeGen/loop_with_condition.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/loop_with_condition.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/loop_with_condition.ll (original)
+++ polly/trunk/test/Isl/CodeGen/loop_with_condition.ll Thu Jan  1 17:01:11 2015
@@ -166,10 +166,10 @@ define i32 @main() nounwind {
 
 declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind
 
-; CHECK: for (int c1 = 0; c1 <= 1023; c1 += 1) {
-; CHECK:   if (c1 >= 513) {
-; CHECK:     Stmt_5(c1);
+; CHECK: for (int c0 = 0; c0 <= 1023; c0 += 1) {
+; CHECK:   if (c0 >= 513) {
+; CHECK:     Stmt_5(c0);
 ; CHECK:   } else
-; CHECK:     Stmt_4(c1);
-; CHECK:   Stmt_6(c1);
+; CHECK:     Stmt_4(c0);
+; CHECK:   Stmt_6(c0);
 ; CHECK: }

Modified: polly/trunk/test/Isl/CodeGen/loop_with_condition_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/loop_with_condition_2.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/loop_with_condition_2.ll (original)
+++ polly/trunk/test/Isl/CodeGen/loop_with_condition_2.ll Thu Jan  1 17:01:11 2015
@@ -4,12 +4,12 @@
 ; there is a conditional inside.
 
 ; CHECK: #pragma simd
-; CHECK: for (int c1 = 0; c1 <= 1023; c1 += 1) {
-; CHECK:   if (c1 >= m + 1025) {
-; CHECK:     Stmt_if_else(c1);
+; CHECK: for (int c0 = 0; c0 <= 1023; c0 += 1) {
+; CHECK:   if (c0 >= m + 1025) {
+; CHECK:     Stmt_if_else(c0);
 ; CHECK:   } else
-; CHECK:     Stmt_if_then(c1);
-; CHECK:   Stmt_if_end(c1);
+; CHECK:     Stmt_if_then(c0);
+; CHECK:   Stmt_if_end(c0);
 ; CHECK: }
 
 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-n8:16:32:64"
@@ -91,8 +91,8 @@ for.inc:
 for.end:                                          ; preds = %for.cond
   br label %for.cond6
 
-for.cond6:                                        ; preds = %for.inc32, %for.end
-  %indvar = phi i64 [ %indvar.next, %for.inc32 ], [ 0, %for.end ]
+for.cond6:                                        ; preds = %for.inc12, %for.end
+  %indvar = phi i64 [ %indvar.next, %for.inc12 ], [ 0, %for.end ]
   %arrayidx15 = getelementptr [1024 x i32]* @A, i64 0, i64 %indvar
   %i.1 = trunc i64 %indvar to i32
   %cmp8 = icmp slt i32 %i.1, 1024
@@ -124,9 +124,9 @@ if.end30:
   br label %if.end31
 
 if.end31:                                         ; preds = %if.end30
-  br label %for.inc32
+  br label %for.inc12
 
-for.inc32:                                        ; preds = %if.end31
+for.inc12:                                        ; preds = %if.end31
   %indvar.next = add i64 %indvar, 1
   br label %for.cond6
 

Modified: polly/trunk/test/Isl/CodeGen/loop_with_condition_ineq.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/loop_with_condition_ineq.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/loop_with_condition_ineq.ll (original)
+++ polly/trunk/test/Isl/CodeGen/loop_with_condition_ineq.ll Thu Jan  1 17:01:11 2015
@@ -166,12 +166,12 @@ define i32 @main() nounwind {
 
 declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind
 
-; CHECK: for (int c1 = 0; c1 <= 1023; c1 += 1) {
-; CHECK:   if (c1 >= 513) {
-; CHECK:     Stmt_4(c1);
-; CHECK:   } else if (c1 <= 511) {
-; CHECK:     Stmt_4(c1);
+; CHECK: for (int c0 = 0; c0 <= 1023; c0 += 1) {
+; CHECK:   if (c0 >= 513) {
+; CHECK:     Stmt_4(c0);
+; CHECK:   } else if (c0 <= 511) {
+; CHECK:     Stmt_4(c0);
 ; CHECK:   } else
 ; CHECK:     Stmt_5(512);
-; CHECK:   Stmt_6(c1);
+; CHECK:   Stmt_6(c0);
 ; CHECK: }

Modified: polly/trunk/test/Isl/CodeGen/loop_with_condition_nested.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/loop_with_condition_nested.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/loop_with_condition_nested.ll (original)
+++ polly/trunk/test/Isl/CodeGen/loop_with_condition_nested.ll Thu Jan  1 17:01:11 2015
@@ -204,12 +204,12 @@ define i32 @main() nounwind {
 
 declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind
 
-; CHECK: for (int c1 = 0; c1 <= 1023; c1 += 1) {
-; CHECK:   if (c1 <= 20) {
-; CHECK:     Stmt_7(c1);
-; CHECK:   } else if (c1 <= 512)
-; CHECK:     Stmt_6(c1);
-; CHECK:   Stmt_9(c1);
+; CHECK: for (int c0 = 0; c0 <= 1023; c0 += 1) {
+; CHECK:   if (c0 <= 20) {
+; CHECK:     Stmt_7(c0);
+; CHECK:   } else if (c0 <= 512)
+; CHECK:     Stmt_6(c0);
+; CHECK:   Stmt_9(c0);
 ; CHECK: }
 
 ; LOOPS: Printing analysis 'Natural Loop Information' for function 'loop_with_condition':

Modified: polly/trunk/test/Isl/CodeGen/reduction_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/reduction_2.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/reduction_2.ll (original)
+++ polly/trunk/test/Isl/CodeGen/reduction_2.ll Thu Jan  1 17:01:11 2015
@@ -89,5 +89,5 @@ if.end:
 
 declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind
 
-; CHECK: for (int c1 = 0; c1 <= 1018; c1 += 1)
-; CHECK:   Stmt_for_body(c1);
+; CHECK: for (int c0 = 0; c0 <= 1018; c0 += 1)
+; CHECK:   Stmt_for_body(c0);

Modified: polly/trunk/test/Isl/CodeGen/simple_nonaffine_loop.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/simple_nonaffine_loop.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/simple_nonaffine_loop.ll (original)
+++ polly/trunk/test/Isl/CodeGen/simple_nonaffine_loop.ll Thu Jan  1 17:01:11 2015
@@ -55,5 +55,5 @@ declare i32 @printf(i8*, ...)
 
 declare i32 @rand()
 
-; CHECK: for (int c1 = 0; c1 <= 1023; c1 += 1)
-; CHECK:   Stmt_for_body(c1);
+; CHECK: for (int c0 = 0; c0 <= 1023; c0 += 1)
+; CHECK:   Stmt_for_body(c0);

Modified: polly/trunk/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll (original)
+++ polly/trunk/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll Thu Jan  1 17:01:11 2015
@@ -89,5 +89,5 @@ return:
 
 declare i32 @fprintf(%struct._IO_FILE*, i8*, ...)
 
-; CHECK: for (int c1 = 0; c1 <= 2147483646; c1 += 1)
-; CHECK:   Stmt_do_body(c1);
+; CHECK: for (int c0 = 0; c0 <= 2147483646; c0 += 1)
+; CHECK:   Stmt_do_body(c0);

Modified: polly/trunk/test/Isl/CodeGen/single_do_loop_ll_max_iterations.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/single_do_loop_ll_max_iterations.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/single_do_loop_ll_max_iterations.ll (original)
+++ polly/trunk/test/Isl/CodeGen/single_do_loop_ll_max_iterations.ll Thu Jan  1 17:01:11 2015
@@ -65,5 +65,5 @@ return:
   ret i32 %retval.0
 }
 
-; CHECK: for (int c1 = 0; c1 <= 9223372036854775806; c1 += 1)
-; CHECK:   Stmt_do_body(c1);
+; CHECK: for (int c0 = 0; c0 <= 9223372036854775806; c0 += 1)
+; CHECK:   Stmt_do_body(c0);

Modified: polly/trunk/test/Isl/CodeGen/single_do_loop_scev_replace.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/single_do_loop_scev_replace.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/single_do_loop_scev_replace.ll (original)
+++ polly/trunk/test/Isl/CodeGen/single_do_loop_scev_replace.ll Thu Jan  1 17:01:11 2015
@@ -89,7 +89,7 @@ return:
 
 declare i32 @fprintf(%struct._IO_FILE*, i8*, ...)
 
-; CHECK: for (int c1 = 0; c1 <= 19; c1 += 1)
-; CHECK:   Stmt_do_cond(c1);
+; CHECK: for (int c0 = 0; c0 <= 19; c0 += 1)
+; CHECK:   Stmt_do_cond(c0);
 
 

Modified: polly/trunk/test/Isl/CodeGen/single_loop.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/single_loop.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/single_loop.ll (original)
+++ polly/trunk/test/Isl/CodeGen/single_loop.ll Thu Jan  1 17:01:11 2015
@@ -49,8 +49,8 @@ for.inc:
 for.end:                                          ; preds = %for.cond
   br label %for.cond5
 
-for.cond5:                                        ; preds = %for.inc17, %for.end
-  %indvar = phi i64 [ %indvar.next, %for.inc17 ], [ 0, %for.end ] ; <i64> [#uses=3]
+for.cond5:                                        ; preds = %for.inc07, %for.end
+  %indvar = phi i64 [ %indvar.next, %for.inc07 ], [ 0, %for.end ] ; <i64> [#uses=3]
   %arrayidx13 = getelementptr [1024 x i32]* %A, i64 0, i64 %indvar ; <i32*> [#uses=1]
   %i.1 = trunc i64 %indvar to i32                 ; <i32> [#uses=1]
   %cmp7 = icmp slt i32 %i.1, 1024                 ; <i1> [#uses=1]
@@ -65,9 +65,9 @@ if.then:
   br label %return
 
 if.end:                                           ; preds = %for.body9
-  br label %for.inc17
+  br label %for.inc07
 
-for.inc17:                                        ; preds = %if.end
+for.inc07:                                        ; preds = %if.end
   %indvar.next = add i64 %indvar, 1               ; <i64> [#uses=1]
   br label %for.cond5
 
@@ -81,5 +81,5 @@ return:
 
 declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind
 
-; CHECK: for (int c1 = 0; c1 <= 1023; c1 += 1)
-; CHECK:   Stmt_for_body(c1);
+; CHECK: for (int c0 = 0; c0 <= 1023; c0 += 1)
+; CHECK:   Stmt_for_body(c0);

Modified: polly/trunk/test/Isl/CodeGen/single_loop_int_max_iterations.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/single_loop_int_max_iterations.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/single_loop_int_max_iterations.ll (original)
+++ polly/trunk/test/Isl/CodeGen/single_loop_int_max_iterations.ll Thu Jan  1 17:01:11 2015
@@ -68,5 +68,5 @@ return:
   ret i32 %retval.0
 }
 
-; CHECK: for (int c1 = 0; c1 <= 2147483646; c1 += 1)
-; CHECK:   Stmt_for_body(c1);
+; CHECK: for (int c0 = 0; c0 <= 2147483646; c0 += 1)
+; CHECK:   Stmt_for_body(c0);

Modified: polly/trunk/test/Isl/CodeGen/single_loop_ll_max_iterations.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/single_loop_ll_max_iterations.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/single_loop_ll_max_iterations.ll (original)
+++ polly/trunk/test/Isl/CodeGen/single_loop_ll_max_iterations.ll Thu Jan  1 17:01:11 2015
@@ -68,5 +68,5 @@ return:
   ret i32 %retval.0
 }
 
-; CHECK: for (int c1 = 0; c1 <= 9223372036854775806; c1 += 1)
-; CHECK:   Stmt_for_body(c1);
+; CHECK: for (int c0 = 0; c0 <= 9223372036854775806; c0 += 1)
+; CHECK:   Stmt_for_body(c0);

Modified: polly/trunk/test/Isl/CodeGen/single_loop_param.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/single_loop_param.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/single_loop_param.ll (original)
+++ polly/trunk/test/Isl/CodeGen/single_loop_param.ll Thu Jan  1 17:01:11 2015
@@ -66,6 +66,6 @@ bb9:
 
 declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind
 
-; CHECK: for (int c1 = 0; c1 < n; c1 += 1)
-; CHECK:   Stmt_bb2(c1);
+; CHECK: for (int c0 = 0; c0 < n; c0 += 1)
+; CHECK:   Stmt_bb2(c0);
 

Modified: polly/trunk/test/Isl/CodeGen/split_edges.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/split_edges.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/split_edges.ll (original)
+++ polly/trunk/test/Isl/CodeGen/split_edges.ll Thu Jan  1 17:01:11 2015
@@ -11,8 +11,8 @@ bb1:
   br i1 true, label %bb2, label %bb3
 
 bb2:
-  %ind1 = phi i32 [0, %bb1], [ %inc1, %bb2]
-  %inc1 = add i32 %ind1, 1
+  %ind1 = phi i32 [0, %bb1], [ %inc0, %bb2]
+  %inc0 = add i32 %ind1, 1
   %cond1 = icmp eq i32 %ind1, 32
   br i1 %cond1, label %bb4, label %bb2
 

Modified: polly/trunk/test/Isl/CodeGen/split_edges_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/split_edges_2.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/split_edges_2.ll (original)
+++ polly/trunk/test/Isl/CodeGen/split_edges_2.ll Thu Jan  1 17:01:11 2015
@@ -12,8 +12,8 @@ bb1:
   br label %bb2
 
 bb2:
-  %ind1 = phi i32 [0, %bb1], [ %inc1, %bb2]
-  %inc1 = add i32 %ind1, 1
+  %ind1 = phi i32 [0, %bb1], [ %inc0, %bb2]
+  %inc0 = add i32 %ind1, 1
   %cond1 = icmp eq i32 %ind1, 32
   br i1 %cond1, label %bb4, label %bb2
 

Modified: polly/trunk/test/Isl/CodeGen/test-invalid-operands-for-select.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/test-invalid-operands-for-select.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/test-invalid-operands-for-select.ll (original)
+++ polly/trunk/test/Isl/CodeGen/test-invalid-operands-for-select.ll Thu Jan  1 17:01:11 2015
@@ -24,8 +24,8 @@ if.end:
 for.cond45.preheader:                             ; preds = %if.end
   br i1 undef, label %for.body47, label %for.end198
 
-for.body47:                                       ; preds = %for.inc196, %for.cond45.preheader
-  br i1 undef, label %for.body53.lr.ph, label %for.inc196
+for.body47:                                       ; preds = %for.inc096, %for.cond45.preheader
+  br i1 undef, label %for.body53.lr.ph, label %for.inc096
 
 for.body53.lr.ph:                                 ; preds = %for.body47
   br label %for.body53
@@ -65,12 +65,12 @@ for.body53:
   store float %add189, float* %arrayidx191, align 4
   %add193 = add nsw i32 %i.013, 2
   %cmp52 = icmp slt i32 %add193, %ido
-  br i1 %cmp52, label %for.body53, label %for.inc196
+  br i1 %cmp52, label %for.body53, label %for.inc096
 
-for.inc196:                                       ; preds = %for.body53, %for.body47
+for.inc096:                                       ; preds = %for.body53, %for.body47
   br i1 undef, label %for.body47, label %for.end198
 
-for.end198:                                       ; preds = %for.inc196, %for.cond45.preheader
+for.end198:                                       ; preds = %for.inc096, %for.cond45.preheader
   br i1 false, label %for.end256, label %L105
 
 L105:                                             ; preds = %for.end198, %if.end

Modified: polly/trunk/test/Isl/CodeGen/test.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/test.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/test.ll (original)
+++ polly/trunk/test/Isl/CodeGen/test.ll Thu Jan  1 17:01:11 2015
@@ -31,7 +31,7 @@ define i32 @foo(i32 %z) nounwind {
 bb.nph31.split.us:
   br label %bb.nph.us
 
-for.inc16.us:                                     ; preds = %for.body6.us
+for.inc06.us:                                     ; preds = %for.body6.us
   store i32 %mul.us, i32* %arrayidx.us
   %indvar.next = add i64 %indvar, 1               ; <i64> [#uses=2]
   %exitcond32 = icmp eq i64 %indvar.next, 100     ; <i1> [#uses=1]
@@ -43,16 +43,16 @@ for.body6.us:
   %mul.us = mul i32 %arrayidx10.tmp.0.us, %0      ; <i32> [#uses=2]
   %inc.us = add nsw i32 %0, 1                     ; <i32> [#uses=2]
   %exitcond = icmp eq i32 %inc.us, 200            ; <i1> [#uses=1]
-  br i1 %exitcond, label %for.inc16.us, label %for.body6.us
+  br i1 %exitcond, label %for.inc06.us, label %for.body6.us
 
-bb.nph.us:                                        ; preds = %bb.nph31.split.us, %for.inc16.us
-  %indvar = phi i64 [ %indvar.next, %for.inc16.us ], [ 0, %bb.nph31.split.us ] ; <i64> [#uses=3]
+bb.nph.us:                                        ; preds = %bb.nph31.split.us, %for.inc06.us
+  %indvar = phi i64 [ %indvar.next, %for.inc06.us ], [ 0, %bb.nph31.split.us ] ; <i64> [#uses=3]
   %arrayidx.us = getelementptr [100 x i32]* @A, i64 0, i64 %indvar ; <i32*> [#uses=2]
   %i.027.us = trunc i64 %indvar to i32            ; <i32> [#uses=2]
   store i32 %i.027.us, i32* %arrayidx.us
   br label %for.body6.us
 
-for.end19:                                        ; preds = %for.inc16.us
+for.end19:                                        ; preds = %for.inc06.us
   %idxprom21 = sext i32 %z to i64                 ; <i64> [#uses=1]
   %arrayidx22 = getelementptr inbounds [100 x i32]* @A, i64 0, i64 %idxprom21 ; <i32*> [#uses=1]
   %tmp23 = load i32* %arrayidx22                  ; <i32> [#uses=1]

Modified: polly/trunk/test/Isl/CodeGen/two-scops-in-row.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/two-scops-in-row.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/two-scops-in-row.ll (original)
+++ polly/trunk/test/Isl/CodeGen/two-scops-in-row.ll Thu Jan  1 17:01:11 2015
@@ -5,8 +5,8 @@ target triple = "x86_64-unknown-linux-gn
 
 ; CHECK: if (1)
 ; CHECK:     {
-; CHECK:       for (int c1 = 0; c1 <= -Scalar0.val.loadoutside + 99; c1 += 1)
-; CHECK:         Stmt_for_1(c1);
+; CHECK:       for (int c0 = 0; c0 <= -Scalar0.val.loadoutside + 99; c0 += 1)
+; CHECK:         Stmt_for_1(c0);
 ; CHECK:       if (Scalar0.val.loadoutside >= 100)
 ; CHECK:         Stmt_for_1(0);
 ; CHECK:     }

Modified: polly/trunk/test/Isl/single_loop_param_less_equal.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/single_loop_param_less_equal.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/single_loop_param_less_equal.ll (original)
+++ polly/trunk/test/Isl/single_loop_param_less_equal.ll Thu Jan  1 17:01:11 2015
@@ -31,8 +31,8 @@ ret:
   ret void
 }
 
-; CHECK: for (int c1 = 0; c1 <= n; c1 += 1)
-; CHECK:   Stmt_loop_body(c1)
+; CHECK: for (int c0 = 0; c0 <= n; c0 += 1)
+; CHECK:   Stmt_loop_body(c0)
 
 ; CODEGEN: polly.start:
 ; CODEGEN:   br label %polly.loop_if

Modified: polly/trunk/test/Isl/single_loop_param_less_than.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/single_loop_param_less_than.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/Isl/single_loop_param_less_than.ll (original)
+++ polly/trunk/test/Isl/single_loop_param_less_than.ll Thu Jan  1 17:01:11 2015
@@ -29,8 +29,8 @@ ret:
   ret void
 }
 
-; CHECK: for (int c1 = 0; c1 < n; c1 += 1)
-; CHECK:   Stmt_loop_body(c1)
+; CHECK: for (int c0 = 0; c0 < n; c0 += 1)
+; CHECK:   Stmt_loop_body(c0)
 
 ; CODEGEN: polly.start:
 ; CODEGEN:   br label %polly.loop_if

Modified: polly/trunk/test/ScopInfo/loop_affine_bound_0.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/loop_affine_bound_0.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/loop_affine_bound_0.ll (original)
+++ polly/trunk/test/ScopInfo/loop_affine_bound_0.ll Thu Jan  1 17:01:11 2015
@@ -58,7 +58,7 @@ return:
 ; CHECK:          Domain :=
 ; CHECK:              [N, M] -> { Stmt_bb1[i0, i1] : i0 >= 0 and i0 <= 2 + 4N + 7M and i1 >= 0 and i1 <= 1 + 5N and N >= 0 };
 ; CHECK:          Scattering :=
-; CHECK:              [N, M] -> { Stmt_bb1[i0, i1] -> scattering[0, i0, 0, i1, 0] };
+; CHECK:              [N, M] -> { Stmt_bb1[i0, i1] -> scattering[i0, i1] };
 ; CHECK:          MustWriteAccess := [Reduction Type: NONE]
 ; CHECK:              [N, M] -> { Stmt_bb1[i0, i1] -> MemRef_a[i0 + 128i1] };
 ; CHECK:  }

Modified: polly/trunk/test/ScopInfo/loop_affine_bound_1.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/loop_affine_bound_1.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/loop_affine_bound_1.ll (original)
+++ polly/trunk/test/ScopInfo/loop_affine_bound_1.ll Thu Jan  1 17:01:11 2015
@@ -57,7 +57,7 @@ return:
 ; CHECK:         Domain :=
 ; CHECK:             [N, M] -> { Stmt_bb1[i0, i1] : i0 >= 0 and i0 <= 2 + 4N + 7M and i1 >= 0 and i1 <= 1 + 5N - i0 and i0 <= 1 + 5N };
 ; CHECK:         Scattering :=
-; CHECK:             [N, M] -> { Stmt_bb1[i0, i1] -> scattering[0, i0, 0, i1, 0] };
+; CHECK:             [N, M] -> { Stmt_bb1[i0, i1] -> scattering[i0, i1] };
 ; CHECK:         MustWriteAccess := [Reduction Type: NONE]
 ; CHECK:             [N, M] -> { Stmt_bb1[i0, i1] -> MemRef_a[129i0 + 128i1] };
 ; CHECK: }

Modified: polly/trunk/test/ScopInfo/loop_affine_bound_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/loop_affine_bound_2.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/loop_affine_bound_2.ll (original)
+++ polly/trunk/test/ScopInfo/loop_affine_bound_2.ll Thu Jan  1 17:01:11 2015
@@ -68,7 +68,7 @@ return:
 ; CHECK:         Domain :=
 ; CHECK:             [N, M] -> { Stmt_bb1[i0, i1] : i0 >= 0 and i0 <= 2 + 4N + 7M and i1 >= 0 and i1 <= 10 + 5N - 6M - 4i0 and 4i0 <= 10 + 5N - 6M };
 ; CHECK:         Scattering :=
-; CHECK:             [N, M] -> { Stmt_bb1[i0, i1] -> scattering[0, i0, 0, i1, 0] };
+; CHECK:             [N, M] -> { Stmt_bb1[i0, i1] -> scattering[i0, i1] };
 ; CHECK:         MustWriteAccess := [Reduction Type: NONE]
 ; CHECK:             [N, M] -> { Stmt_bb1[i0, i1] -> MemRef_a[-1152 + 768M + 897i0 + 128i1] };
 ; CHECK: }

Modified: polly/trunk/test/ScopInfo/loop_carry.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/loop_carry.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/loop_carry.ll (original)
+++ polly/trunk/test/ScopInfo/loop_carry.ll Thu Jan  1 17:01:11 2015
@@ -53,7 +53,7 @@ bb2:
 ; CHECK:             Domain :=
 ; CHECK:                 [n] -> { Stmt_bb_nph[] : n >= 2 };
 ; CHECK:             Scattering :=
-; CHECK:                 [n] -> { Stmt_bb_nph[] -> scattering[0, 0, 0] };
+; CHECK:                 [n] -> { Stmt_bb_nph[] -> scattering[0, 0] };
 ; CHECK:             ReadAccess :=
 ; CHECK:                 [n] -> { Stmt_bb_nph[] -> MemRef_a[0] };
 ; CHECK:             MustWriteAccess :=
@@ -64,7 +64,7 @@ bb2:
 ; CHECK:             Domain :=
 ; CHECK:                 [n] -> { Stmt_bb[i0] : i0 >= 0 and i0 <= -2 + n and n >= 2 };
 ; CHECK:             Scattering :=
-; CHECK:                 [n] -> { Stmt_bb[i0] -> scattering[1, i0, 0] };
+; CHECK:                 [n] -> { Stmt_bb[i0] -> scattering[1, i0] };
 ; CHECK:             ReadAccess :=
 ; CHECK:                 [n] -> { Stmt_bb[i0] -> MemRef__reg2mem[0] };
 ; CHECK:             ReadAccess :=

Modified: polly/trunk/test/ScopInfo/multidim_2d-diagonal-matrix.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_2d-diagonal-matrix.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_2d-diagonal-matrix.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_2d-diagonal-matrix.ll Thu Jan  1 17:01:11 2015
@@ -19,7 +19,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK: Domain :=
 ; CHECK:   [n] -> { Stmt_for_i[i0] : i0 >= 0 and i0 <= -1 + n };
 ; CHECK: Scattering :=
-; CHECK:   [n] -> { Stmt_for_i[i0] -> scattering[0, i0, 0] };
+; CHECK:   [n] -> { Stmt_for_i[i0] -> scattering[i0] };
 ; CHECK: MustWriteAccess :=
 ; CHECK:   [n] -> { Stmt_for_i[i0] -> MemRef_A[i0, i0] };
 

Modified: polly/trunk/test/ScopInfo/multidim_2d_outer_parametric_offset.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_2d_outer_parametric_offset.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_2d_outer_parametric_offset.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_2d_outer_parametric_offset.ll Thu Jan  1 17:01:11 2015
@@ -19,7 +19,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK:          Domain :=
 ; CHECK:              [m, p] -> { Stmt_for_j[i0, i1] : i0 >= 0 and i0 <= 99 and i1 >= 0 and i1 <= -1 + m };
 ; CHECK:          Scattering :=
-; CHECK:              [m, p] -> { Stmt_for_j[i0, i1] -> scattering[0, i0, 0, i1, 0] };
+; CHECK:              [m, p] -> { Stmt_for_j[i0, i1] -> scattering[i0, i1] };
 ; CHECK:          MustWriteAccess := [Reduction Type: NONE]
 ; CHECK:              [m, p] -> { Stmt_for_j[i0, i1] -> MemRef_A[p + i0, i1] };
 ; CHECK:  }

Modified: polly/trunk/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll Thu Jan  1 17:01:11 2015
@@ -17,7 +17,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK:         Domain :=
 ; CHECK:             [m] -> { Stmt_for_j[i0, i1] : i0 >= 0 and i0 <= 99 and i1 >= 0 and i1 <= 149 };
 ; CHECK:         Scattering :=
-; CHECK:             [m] -> { Stmt_for_j[i0, i1] -> scattering[0, i0, 0, i1, 0] };
+; CHECK:             [m] -> { Stmt_for_j[i0, i1] -> scattering[i0, i1] };
 ; CHECK:         MustWriteAccess := [Reduction Type: NONE]
 ; CHECK:             [m] -> { Stmt_for_j[i0, i1] -> MemRef_A[i0, i1] };
 

Modified: polly/trunk/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll Thu Jan  1 17:01:11 2015
@@ -19,7 +19,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK:           Domain :=
 ; CHECK:               [m, o] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= 99 and i1 >= 0 and i1 <= 149 and i2 >= 0 and i2 <= 199 };
 ; CHECK:           Scattering :=
-; CHECK:               [m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] };
+; CHECK:               [m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[i0, i1, i2] };
 ; CHECK:           MustWriteAccess := [Reduction Type: NONE]
 ; CHECK:               [m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[i0, i1, i2] };
 

Modified: polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll Thu Jan  1 17:01:11 2015
@@ -21,7 +21,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK: Domain
 ; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= -4 + n and i1 >= 0 and i1 <= -5 + m and i2 >= 0 and i2 <= -8 + o };
 ; CHECK: Scattering
-; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] };
+; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[i0, i1, i2] };
 ; CHECK: MustWriteAccess
 ; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, i1, 7 + i2] };
 

Modified: polly/trunk/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll Thu Jan  1 17:01:11 2015
@@ -28,7 +28,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK: Domain
 ; CHECK:   [n, m, o, p, q, r] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + m and i2 >= 0 and i2 <= -1 + o };
 ; CHECK: Scattering
-; CHECK:   [n, m, o, p, q, r] -> { Stmt_for_k[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] };
+; CHECK:   [n, m, o, p, q, r] -> { Stmt_for_k[i0, i1, i2] -> scattering[i0, i1, i2] };
 ; CHECK: MustWriteAccess
 ; CHECK:   [n, m, o, p, q, r] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[p + i0, q + i1, r + i2] };
 

Modified: polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll Thu Jan  1 17:01:11 2015
@@ -18,7 +18,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK: Domain
 ; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= -4 + n and i1 >= 0 and i1 <= -5 + m and i2 >= 0 and i2 <= -8 + o };
 ; CHECK: Scattering
-; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] };
+; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[i0, i1, i2] };
 ; CHECK: MustWriteAccess
 ; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, i1, 7 + i2] };
 

Modified: polly/trunk/test/ScopInfo/multidim_only_ivs_2d.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_only_ivs_2d.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_only_ivs_2d.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_only_ivs_2d.ll Thu Jan  1 17:01:11 2015
@@ -19,7 +19,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK: Domain
 ; CHECK:   [n, m] -> { Stmt_for_j[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + m };
 ; CHECK: Scattering
-; CHECK:   [n, m] -> { Stmt_for_j[i0, i1] -> scattering[0, i0, 0, i1, 0] };
+; CHECK:   [n, m] -> { Stmt_for_j[i0, i1] -> scattering[i0, i1] };
 ; CHECK: MustWriteAccess
 ; CHECK:   [n, m] -> { Stmt_for_j[i0, i1] -> MemRef_A[i0, i1] };
 

Modified: polly/trunk/test/ScopInfo/multidim_only_ivs_3d.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_only_ivs_3d.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_only_ivs_3d.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_only_ivs_3d.ll Thu Jan  1 17:01:11 2015
@@ -20,7 +20,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK: Domain
 ; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + m and i2 >= 0 and i2 <= -1 + o };
 ; CHECK: Scattering
-; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] };
+; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[i0, i1, i2] };
 ; CHECK: WriteAccess
 ; CHECK:   [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[i0, i1, i2] };
 

Modified: polly/trunk/test/ScopInfo/multidim_only_ivs_3d_cast.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_only_ivs_3d_cast.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_only_ivs_3d_cast.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_only_ivs_3d_cast.ll Thu Jan  1 17:01:11 2015
@@ -24,7 +24,7 @@
 ; CHECK: Domain
 ; CHECK:   [n, m, o, p_3, p_4] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + m and i2 >= 0 and i2 <= -1 + o };
 ; CHECK: Scattering
-; CHECK:   [n, m, o, p_3, p_4] -> { Stmt_for_k[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] };
+; CHECK:   [n, m, o, p_3, p_4] -> { Stmt_for_k[i0, i1, i2] -> scattering[i0, i1, i2] };
 ; CHECK: WriteAccess
 ; CHECK:   [n, m, o, p_3, p_4] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[i0, i1, i2] };
 

Modified: polly/trunk/test/ScopInfo/multidim_only_ivs_3d_reverse.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_only_ivs_3d_reverse.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_only_ivs_3d_reverse.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_only_ivs_3d_reverse.ll Thu Jan  1 17:01:11 2015
@@ -25,7 +25,7 @@ target triple = "x86_64-unknown-linux-gn
 ; CHECK: Domain
 ; CHECK:  [n, o, m] -> { Stmt_for_j[i0, i1, i2] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + o and i2 >= 0 and i2 <= -1 + m };
 ; CHECK: Scattering
-; CHECK:   [n, o, m] -> { Stmt_for_j[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] };
+; CHECK:   [n, o, m] -> { Stmt_for_j[i0, i1, i2] -> scattering[i0, i1, i2] };
 ; CHECK: WriteAccess
 ; CHECK:   [n, o, m] -> { Stmt_for_j[i0, i1, i2] -> MemRef_A[i0, i2, i1] };
 

Modified: polly/trunk/test/ScopInfo/non_affine_parametric_loop.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/non_affine_parametric_loop.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/non_affine_parametric_loop.ll (original)
+++ polly/trunk/test/ScopInfo/non_affine_parametric_loop.ll Thu Jan  1 17:01:11 2015
@@ -30,7 +30,7 @@ for.end:
 ; CHECK: Domain
 ; CHECK:   [n] -> { Stmt_for_body[i0] : i0 >= 0 and i0 <= -1 + n };
 ; CHECK: Scattering
-; CHECK:   [n] -> { Stmt_for_body[i0] -> scattering[0, i0, 0] };
+; CHECK:   [n] -> { Stmt_for_body[i0] -> scattering[i0] };
 ; CHECK: ReadAccess
 ; CHECK:   [n] -> { Stmt_for_body[i0] -> MemRef_INDEX[i0] };
 ; CHECK: WriteAccess

Modified: polly/trunk/test/ScopInfo/scalar.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/scalar.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/scalar.ll (original)
+++ polly/trunk/test/ScopInfo/scalar.ll Thu Jan  1 17:01:11 2015
@@ -34,7 +34,7 @@ return:
 ; CHECK:       Domain :=
 ; CHECK:           [N] -> { Stmt_S1[i0] : i0 >= 0 and i0 <= -1 + N };
 ; CHECK:       Scattering :=
-; CHECK:           [N] -> { Stmt_S1[i0] -> scattering[0, i0, 0] };
+; CHECK:           [N] -> { Stmt_S1[i0] -> scattering[i0, 0] };
 ; CHECK:       ReadAccess :=
 ; CHECK:           [N] -> { Stmt_S1[i0] -> MemRef_a[i0] };
 ; CHECK:       MustWriteAccess :=
@@ -43,7 +43,7 @@ return:
 ; CHECK:       Domain :=
 ; CHECK:           [N] -> { Stmt_S2[i0] : i0 >= 0 and i0 <= -1 + N };
 ; CHECK:       Scattering :=
-; CHECK:           [N] -> { Stmt_S2[i0] -> scattering[0, i0, 1] };
+; CHECK:           [N] -> { Stmt_S2[i0] -> scattering[i0, 1] };
 ; CHECK:       ReadAccess :=
 ; CHECK:           [N] -> { Stmt_S2[i0] -> MemRef_val[] };
 ; CHECK:       MustWriteAccess :=

Modified: polly/trunk/test/ScopInfo/simple_loop_1.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/simple_loop_1.ll?rev=225067&r1=225066&r2=225067&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/simple_loop_1.ll (original)
+++ polly/trunk/test/ScopInfo/simple_loop_1.ll Thu Jan  1 17:01:11 2015
@@ -32,6 +32,6 @@ return:
 ; CHECK:        Domain :=
 ; CHECK:            [N] -> { Stmt_bb[i0] : i0 >= 0 and i0 <= -1 + N };
 ; CHECK:        Scattering :=
-; CHECK:            [N] -> { Stmt_bb[i0] -> scattering[0, i0, 0] };
+; CHECK:            [N] -> { Stmt_bb[i0] -> scattering[i0] };
 ; CHECK:        MustWriteAccess := [Reduction Type: NONE]
 ; CHECK:            [N] -> { Stmt_bb[i0] -> MemRef_a[i0] };





More information about the llvm-commits mailing list