From 9282076ecebac0d1cf6f7f546a3250b5fc3bc004 Mon Sep 17 00:00:00 2001 From: Johannes Doerfert Date: Mon, 2 Feb 2015 13:45:54 +0000 Subject: [PATCH] [NFC] Drop the "scattering" tuple name llvm-svn: 227801 --- polly/lib/Analysis/ScopInfo.cpp | 3 --- .../test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll | 2 +- polly/test/Isl/Ast/rlr___%for.cond---%for.end10.jscop | 4 ++-- polly/test/Isl/Ast/rmalrs2___%for.cond---%for.end10.jscop | 4 ++-- polly/test/Isl/Ast/rmalrs___%for.cond---%for.end10.jscop | 4 ++-- polly/test/Isl/Ast/rmd2___%for.cond---%for.end12.jscop | 2 +- polly/test/Isl/Ast/rmd3___%for.cond---%for.end12.jscop | 2 +- polly/test/Isl/Ast/rmd4___%for.cond---%for.end12.jscop | 2 +- polly/test/Isl/Ast/rmd___%for.cond---%for.end12.jscop | 2 +- polly/test/Isl/Ast/rms___%for.cond---%for.end10.jscop | 4 ++-- polly/test/Isl/Ast/rmsmd2___%for.cond---%for.end6.jscop | 2 +- polly/test/Isl/Ast/rmsmd3___%for.cond---%for.end6.jscop | 2 +- polly/test/Isl/Ast/rmsmd4___%for.cond---%for.end6.jscop | 2 +- polly/test/Isl/Ast/rmsmd5___%for.cond---%for.end6.jscop | 2 +- polly/test/Isl/Ast/rmsmd___%for.cond---%for.end6.jscop | 2 +- .../Isl/CodeGen/MemAccess/bad_alignment___%for.cond---%for.end.jscop | 2 +- .../MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop | 2 +- .../codegen_constant_offset___%for.cond---%for.end.jscop.transformed | 2 +- .../Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop | 2 +- .../MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed | 2 +- .../CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop | 2 +- ...egen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst | 2 +- ...n_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst | 2 +- polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop | 2 +- .../CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed | 2 +- .../test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end14.jscop | 4 ++-- .../MemAccess/simple___%for.cond---%for.end14.jscop.transformed | 4 ++-- .../test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop | 2 +- .../MemAccess/simple___%for.cond4---%for.end14.jscop.transformed | 2 +- .../Isl/CodeGen/MemAccess/simple_stride___%for.cond---%for.end.jscop | 2 +- .../Isl/CodeGen/OpenMP/single_parallel_loop___%for.i---%exit.jscop | 2 +- .../single_do_loop_int_max_iterations___%do.body---%do.end.jscop | 2 +- polly/test/ScopInfo/loop_affine_bound_0.ll | 2 +- polly/test/ScopInfo/loop_affine_bound_1.ll | 2 +- polly/test/ScopInfo/loop_affine_bound_2.ll | 2 +- polly/test/ScopInfo/loop_carry.ll | 4 ++-- polly/test/ScopInfo/multidim_2d-diagonal-matrix.ll | 2 +- polly/test/ScopInfo/multidim_2d_outer_parametric_offset.ll | 2 +- .../test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll | 2 +- .../test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll | 2 +- polly/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll | 2 +- polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll | 2 +- polly/test/ScopInfo/multidim_nested_start_integer.ll | 2 +- polly/test/ScopInfo/multidim_only_ivs_2d.ll | 2 +- polly/test/ScopInfo/multidim_only_ivs_3d.ll | 2 +- polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll | 2 +- polly/test/ScopInfo/multidim_only_ivs_3d_reverse.ll | 2 +- polly/test/ScopInfo/non_affine_parametric_loop.ll | 2 +- polly/test/ScopInfo/pointer-type-expressions.ll | 2 +- polly/test/ScopInfo/scalar.ll | 4 ++-- polly/test/ScopInfo/simple_loop_1.ll | 2 +- polly/test/ScopInfo/unsigned-condition.ll | 2 +- 52 files changed, 59 insertions(+), 62 deletions(-) diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp index 71529e5..d205e90 100644 --- a/polly/lib/Analysis/ScopInfo.cpp +++ b/polly/lib/Analysis/ScopInfo.cpp @@ -696,7 +696,6 @@ void ScopStmt::buildScattering(SmallVectorImpl &Scatter) { unsigned NbScatteringDims = Parent.getMaxLoopDepth() * 2 + 1; isl_space *Space = isl_space_set_alloc(getIslCtx(), 0, NbScatteringDims); - Space = isl_space_set_tuple_name(Space, isl_dim_out, "scattering"); Scattering = isl_map_from_domain_and_range(isl_set_universe(getDomainSpace()), isl_set_universe(Space)); @@ -1512,8 +1511,6 @@ void Scop::dropConstantScheduleDims() { 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)); diff --git a/polly/test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll b/polly/test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll index eb255d6..1c6773a 100644 --- a/polly/test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll +++ b/polly/test/Dependences/reduction_simple_iv_debug_wrapped_dependences.ll @@ -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] -> MemRef_sum[0]] -> scattering[i0] : i0 <= 100 and i0 >= 0; Stmt_for_cond[i0] -> scattering[i0] } +; CHECK: Schedule: { [Stmt_for_cond[i0] -> MemRef_sum[0]] -> [i0] : i0 <= 100 and i0 >= 0; Stmt_for_cond[i0] -> [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 } diff --git a/polly/test/Isl/Ast/rlr___%for.cond---%for.end10.jscop b/polly/test/Isl/Ast/rlr___%for.cond---%for.end10.jscop index fc50d5c..70e0203 100644 --- a/polly/test/Isl/Ast/rlr___%for.cond---%for.end10.jscop +++ b/polly/test/Isl/Ast/rlr___%for.cond---%for.end10.jscop @@ -15,7 +15,7 @@ ], "domain" : "[n] -> { Stmt_S0[i0] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 }", "name" : "Stmt_S0", - "schedule" : "[n] -> { Stmt_S0[i0] -> scattering[0, n - i0, 0] }" + "schedule" : "[n] -> { Stmt_S0[i0] -> [0, n - i0, 0] }" }, { "accesses" : [ @@ -26,7 +26,7 @@ ], "domain" : "[n] -> { Stmt_S1[i0] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 }", "name" : "Stmt_S1", - "schedule" : "[n] -> { Stmt_S1[i0] -> scattering[1, n - i0, 0] }" + "schedule" : "[n] -> { Stmt_S1[i0] -> [1, n - i0, 0] }" } ] } diff --git a/polly/test/Isl/Ast/rmalrs2___%for.cond---%for.end10.jscop b/polly/test/Isl/Ast/rmalrs2___%for.cond---%for.end10.jscop index c84f0a0..4cdd690 100644 --- a/polly/test/Isl/Ast/rmalrs2___%for.cond---%for.end10.jscop +++ b/polly/test/Isl/Ast/rmalrs2___%for.cond---%for.end10.jscop @@ -15,7 +15,7 @@ ], "domain" : "[n] -> { Stmt_S0[i0] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 }", "name" : "Stmt_S0", - "schedule" : "[n] -> { Stmt_S0[i0] -> scattering[0, -i0, 0]: i0 % 2 = 0; Stmt_S0[i0] -> scattering[2, i0, 0]: i0 % 2 = 1 }" + "schedule" : "[n] -> { Stmt_S0[i0] -> [0, -i0, 0]: i0 % 2 = 0; Stmt_S0[i0] -> [2, i0, 0]: i0 % 2 = 1 }" }, { "accesses" : [ @@ -26,7 +26,7 @@ ], "domain" : "[n] -> { Stmt_S1[i0] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 }", "name" : "Stmt_S1", - "schedule" : "[n] -> { Stmt_S1[i0] -> scattering[1, i0, 0] }" + "schedule" : "[n] -> { Stmt_S1[i0] -> [1, i0, 0] }" } ] } diff --git a/polly/test/Isl/Ast/rmalrs___%for.cond---%for.end10.jscop b/polly/test/Isl/Ast/rmalrs___%for.cond---%for.end10.jscop index 9740b57..74d4252 100644 --- a/polly/test/Isl/Ast/rmalrs___%for.cond---%for.end10.jscop +++ b/polly/test/Isl/Ast/rmalrs___%for.cond---%for.end10.jscop @@ -15,7 +15,7 @@ ], "domain" : "[n] -> { Stmt_S0[i0] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 }", "name" : "Stmt_S0", - "schedule" : "[n] -> { Stmt_S0[i0] -> scattering[0, 2 * n - i0, 0]: i0 % 2 = 0; Stmt_S0[i0] -> scattering[2, 2 * n - i0, 0]: i0 % 2 = 1 }" + "schedule" : "[n] -> { Stmt_S0[i0] -> [0, 2 * n - i0, 0]: i0 % 2 = 0; Stmt_S0[i0] -> [2, 2 * n - i0, 0]: i0 % 2 = 1 }" }, { "accesses" : [ @@ -26,7 +26,7 @@ ], "domain" : "[n] -> { Stmt_S1[i0] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 }", "name" : "Stmt_S1", - "schedule" : "[n] -> { Stmt_S1[i0] -> scattering[1, i0, 0] }" + "schedule" : "[n] -> { Stmt_S1[i0] -> [1, i0, 0] }" } ] } diff --git a/polly/test/Isl/Ast/rmd2___%for.cond---%for.end12.jscop b/polly/test/Isl/Ast/rmd2___%for.cond---%for.end12.jscop index bca9793..f1a2856 100644 --- a/polly/test/Isl/Ast/rmd2___%for.cond---%for.end12.jscop +++ b/polly/test/Isl/Ast/rmd2___%for.cond---%for.end12.jscop @@ -15,7 +15,7 @@ ], "domain" : "{ Stmt_for_body6[i0, i1, i2] : i0 >= 0 and i0 <= 2047 and i1 >= 0 and i1 <= 1023 and i2 >= 0 and i2 <= 511 }", "name" : "Stmt_for_body6", - "schedule" : "{ Stmt_for_body6[i0, i1, i2] -> scattering[0, i1, 0, i0, 0, i2, 0] }" + "schedule" : "{ Stmt_for_body6[i0, i1, i2] -> [0, i1, 0, i0, 0, i2, 0] }" } ] } diff --git a/polly/test/Isl/Ast/rmd3___%for.cond---%for.end12.jscop b/polly/test/Isl/Ast/rmd3___%for.cond---%for.end12.jscop index 7cd7570..c2a7899 100644 --- a/polly/test/Isl/Ast/rmd3___%for.cond---%for.end12.jscop +++ b/polly/test/Isl/Ast/rmd3___%for.cond---%for.end12.jscop @@ -15,7 +15,7 @@ ], "domain" : "{ Stmt_for_body6[i0, i1, i2] : i0 >= 0 and i0 <= 2047 and i1 >= 0 and i1 <= 1023 and i2 >= 0 and i2 <= 511 }", "name" : "Stmt_for_body6", - "schedule" : "{ Stmt_for_body6[i0, i1, i2] -> scattering[0, i2, 0, i1, 0, i0, 0] }" + "schedule" : "{ Stmt_for_body6[i0, i1, i2] -> [0, i2, 0, i1, 0, i0, 0] }" } ] } diff --git a/polly/test/Isl/Ast/rmd4___%for.cond---%for.end12.jscop b/polly/test/Isl/Ast/rmd4___%for.cond---%for.end12.jscop index b29c322..456c4c5 100644 --- a/polly/test/Isl/Ast/rmd4___%for.cond---%for.end12.jscop +++ b/polly/test/Isl/Ast/rmd4___%for.cond---%for.end12.jscop @@ -15,7 +15,7 @@ ], "domain" : "{ Stmt_for_body6[i0, i1, i2] : i0 >= 0 and i0 <= 2047 and i1 >= 0 and i1 <= 1023 and i2 >= 0 and i2 <= 511 }", "name" : "Stmt_for_body6", - "schedule" : "{ Stmt_for_body6[i0, i1, i2] -> scattering[0, i2, 0, i0, 0, i1, 0] }" + "schedule" : "{ Stmt_for_body6[i0, i1, i2] -> [0, i2, 0, i0, 0, i1, 0] }" } ] } diff --git a/polly/test/Isl/Ast/rmd___%for.cond---%for.end12.jscop b/polly/test/Isl/Ast/rmd___%for.cond---%for.end12.jscop index be7cdc2..dfb0e2e 100644 --- a/polly/test/Isl/Ast/rmd___%for.cond---%for.end12.jscop +++ b/polly/test/Isl/Ast/rmd___%for.cond---%for.end12.jscop @@ -15,7 +15,7 @@ ], "domain" : "{ Stmt_for_body6[i0, i1, i2] : i0 >= 0 and i0 <= 2047 and i1 >= 0 and i1 <= 1023 and i2 >= 0 and i2 <= 511 }", "name" : "Stmt_for_body6", - "schedule" : "{ Stmt_for_body6[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] }" + "schedule" : "{ Stmt_for_body6[i0, i1, i2] -> [0, i0, 0, i1, 0, i2, 0] }" } ] } diff --git a/polly/test/Isl/Ast/rms___%for.cond---%for.end10.jscop b/polly/test/Isl/Ast/rms___%for.cond---%for.end10.jscop index 15a6930..6388163 100644 --- a/polly/test/Isl/Ast/rms___%for.cond---%for.end10.jscop +++ b/polly/test/Isl/Ast/rms___%for.cond---%for.end10.jscop @@ -15,7 +15,7 @@ ], "domain" : "[n] -> { Stmt_S0[i0] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 }", "name" : "Stmt_S0", - "schedule" : "[n] -> { Stmt_S0[i0] -> scattering[0, i0, 0]: i0 % 2 = 0; Stmt_S0[i0] -> scattering[2, i0, 0]: i0 % 2 = 1 }" + "schedule" : "[n] -> { Stmt_S0[i0] -> [0, i0, 0]: i0 % 2 = 0; Stmt_S0[i0] -> [2, i0, 0]: i0 % 2 = 1 }" }, { "accesses" : [ @@ -26,7 +26,7 @@ ], "domain" : "[n] -> { Stmt_S1[i0] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 }", "name" : "Stmt_S1", - "schedule" : "[n] -> { Stmt_S1[i0] -> scattering[1, i0, 0] }" + "schedule" : "[n] -> { Stmt_S1[i0] -> [1, i0, 0] }" } ] } diff --git a/polly/test/Isl/Ast/rmsmd2___%for.cond---%for.end6.jscop b/polly/test/Isl/Ast/rmsmd2___%for.cond---%for.end6.jscop index 38cb44b..e875ef6 100644 --- a/polly/test/Isl/Ast/rmsmd2___%for.cond---%for.end6.jscop +++ b/polly/test/Isl/Ast/rmsmd2___%for.cond---%for.end6.jscop @@ -15,7 +15,7 @@ ], "domain" : "[n] -> { Stmt_for_body3[i0, i1] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 and i1 >= 0 and i1 <= 1023 }", "name" : "Stmt_for_body3", - "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> scattering[0, i0, 0, i1, 0]: i0 % 2 = 0; Stmt_for_body3[i0, i1] -> scattering[0, i0, 1, i1, 0]: i0 % 2 = 1 }" + "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> [0, i0, 0, i1, 0]: i0 % 2 = 0; Stmt_for_body3[i0, i1] -> [0, i0, 1, i1, 0]: i0 % 2 = 1 }" } ] } diff --git a/polly/test/Isl/Ast/rmsmd3___%for.cond---%for.end6.jscop b/polly/test/Isl/Ast/rmsmd3___%for.cond---%for.end6.jscop index 44d71a3..5f89385 100644 --- a/polly/test/Isl/Ast/rmsmd3___%for.cond---%for.end6.jscop +++ b/polly/test/Isl/Ast/rmsmd3___%for.cond---%for.end6.jscop @@ -15,7 +15,7 @@ ], "domain" : "[n] -> { Stmt_for_body3[i0, i1] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 and i1 >= 0 and i1 <= 1023 }", "name" : "Stmt_for_body3", - "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> scattering[0, i0, 0, i1, 0]: i1 % 2 = 0; Stmt_for_body3[i0, i1] -> scattering[0, i0, 0, i1, 1]: i1 % 2 = 1 }" + "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> [0, i0, 0, i1, 0]: i1 % 2 = 0; Stmt_for_body3[i0, i1] -> [0, i0, 0, i1, 1]: i1 % 2 = 1 }" } ] } diff --git a/polly/test/Isl/Ast/rmsmd4___%for.cond---%for.end6.jscop b/polly/test/Isl/Ast/rmsmd4___%for.cond---%for.end6.jscop index 9bfd4aa..49310ba 100644 --- a/polly/test/Isl/Ast/rmsmd4___%for.cond---%for.end6.jscop +++ b/polly/test/Isl/Ast/rmsmd4___%for.cond---%for.end6.jscop @@ -15,7 +15,7 @@ ], "domain" : "[n] -> { Stmt_for_body3[i0, i1] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 and i1 >= 0 and i1 <= 1023 }", "name" : "Stmt_for_body3", - "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> scattering[0, i0, 0, -i1, 0]: i1 % 2 = 0; Stmt_for_body3[i0, i1] -> scattering[0, i0, 0, i1, 1]: i1 % 2 = 1 }" + "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> [0, i0, 0, -i1, 0]: i1 % 2 = 0; Stmt_for_body3[i0, i1] -> [0, i0, 0, i1, 1]: i1 % 2 = 1 }" } ] } diff --git a/polly/test/Isl/Ast/rmsmd5___%for.cond---%for.end6.jscop b/polly/test/Isl/Ast/rmsmd5___%for.cond---%for.end6.jscop index ee1c3dd..e77750a 100644 --- a/polly/test/Isl/Ast/rmsmd5___%for.cond---%for.end6.jscop +++ b/polly/test/Isl/Ast/rmsmd5___%for.cond---%for.end6.jscop @@ -15,7 +15,7 @@ ], "domain" : "[n] -> { Stmt_for_body3[i0, i1] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 and i1 >= 0 and i1 <= 1023 }", "name" : "Stmt_for_body3", - "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> scattering[0, i1, 0, i0, 0]: i1 % 2 = 0; Stmt_for_body3[i0, i1] -> scattering[0, i1, 1, -i0, 0]: i1 % 2 = 1 }" + "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> [0, i1, 0, i0, 0]: i1 % 2 = 0; Stmt_for_body3[i0, i1] -> [0, i1, 1, -i0, 0]: i1 % 2 = 1 }" } ] } diff --git a/polly/test/Isl/Ast/rmsmd___%for.cond---%for.end6.jscop b/polly/test/Isl/Ast/rmsmd___%for.cond---%for.end6.jscop index 8a8678a..57baa66 100644 --- a/polly/test/Isl/Ast/rmsmd___%for.cond---%for.end6.jscop +++ b/polly/test/Isl/Ast/rmsmd___%for.cond---%for.end6.jscop @@ -15,7 +15,7 @@ ], "domain" : "[n] -> { Stmt_for_body3[i0, i1] : i0 >= 0 and i0 <= -1 + 2n and n >= 1 and i1 >= 0 and i1 <= 1023 }", "name" : "Stmt_for_body3", - "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> scattering[0, i0, 0, i1, 0]: i0 % 2 = 0; Stmt_for_body3[i0, i1] -> scattering[1, i0, 0, i1, 0]: i0 % 2 = 1 }" + "schedule" : "[n] -> { Stmt_for_body3[i0, i1] -> [0, i0, 0, i1, 0]: i0 % 2 = 0; Stmt_for_body3[i0, i1] -> [1, i0, 0, i1, 0]: i0 % 2 = 1 }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/bad_alignment___%for.cond---%for.end.jscop b/polly/test/Isl/CodeGen/MemAccess/bad_alignment___%for.cond---%for.end.jscop index 7f4fb66..d29a49d 100644 --- a/polly/test/Isl/CodeGen/MemAccess/bad_alignment___%for.cond---%for.end.jscop +++ b/polly/test/Isl/CodeGen/MemAccess/bad_alignment___%for.cond---%for.end.jscop @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 511 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop index 034183d..78903fb 100644 --- a/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop +++ b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop @@ -19,7 +19,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed index 424137c..38cd08d 100644 --- a/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed +++ b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed @@ -19,7 +19,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop b/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop index 034183d..78903fb 100644 --- a/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop +++ b/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop @@ -19,7 +19,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed b/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed index 320c3cb..7ca7b67 100644 --- a/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed +++ b/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed @@ -19,7 +19,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop index 180c44f..c34536bd 100644 --- a/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop +++ b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body3[i0, i1] : i0 >= 0 and i0 <= 31 and i1 >= 0 and i1 <= 31 }", "name" : "Stmt_for_body3", - "schedule" : "{ Stmt_for_body3[i0, i1] -> scattering[0, i0, 0, i1, 0] }" + "schedule" : "{ Stmt_for_body3[i0, i1] -> [0, i0, 0, i1, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst index 0894776..1e36572 100644 --- a/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst +++ b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body3[i0, i1] : i0 >= 0 and i0 <= 31 and i1 >= 0 and i1 <= 31 }", "name" : "Stmt_for_body3", - "schedule" : "{ Stmt_for_body3[i0, i1] -> scattering[0, i0, 0, i1, 0] }" + "schedule" : "{ Stmt_for_body3[i0, i1] -> [0, i0, 0, i1, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst index e1fa4ed..1620b50 100644 --- a/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst +++ b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body3[i0, i1] : i0 >= 0 and i0 <= 31 and i1 >= 0 and i1 <= 31 }", "name" : "Stmt_for_body3", - "schedule" : "{ Stmt_for_body3[i0, i1] -> scattering[0, i0, 0, i1, 0] }" + "schedule" : "{ Stmt_for_body3[i0, i1] -> [0, i0, 0, i1, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop index 4742285..3014bb1 100644 --- a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop +++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed index 0a33fe8..e6c89ce 100644 --- a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed +++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end14.jscop b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end14.jscop index 88fafec..1e59614 100644 --- a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end14.jscop +++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end14.jscop @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" }, { "accesses" : [ @@ -22,7 +22,7 @@ ], "domain" : "{ Stmt_for_body7[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body7", - "schedule" : "{ Stmt_for_body7[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body7[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end14.jscop.transformed b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end14.jscop.transformed index b1808f1..7aa970c 100644 --- a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end14.jscop.transformed +++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end14.jscop.transformed @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" }, { "accesses" : [ @@ -22,7 +22,7 @@ ], "domain" : "{ Stmt_for_body7[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body7", - "schedule" : "{ Stmt_for_body7[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body7[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop index 56289bf..5c3293b 100644 --- a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop +++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body7[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body7", - "schedule" : "{ Stmt_for_body7[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body7[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed index 6152943..fcaa561 100644 --- a/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed +++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_for_body7[i0] : i0 >= 0 and i0 <= 11 }", "name" : "Stmt_for_body7", - "schedule" : "{ Stmt_for_body7[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body7[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/MemAccess/simple_stride___%for.cond---%for.end.jscop b/polly/test/Isl/CodeGen/MemAccess/simple_stride___%for.cond---%for.end.jscop index 0fe6461..d78df95 100644 --- a/polly/test/Isl/CodeGen/MemAccess/simple_stride___%for.cond---%for.end.jscop +++ b/polly/test/Isl/CodeGen/MemAccess/simple_stride___%for.cond---%for.end.jscop @@ -15,7 +15,7 @@ ], "domain" : "{ Stmt_for_body[i0] : i0 >= 0 and i0 <= 15 }", "name" : "Stmt_for_body", - "schedule" : "{ Stmt_for_body[i0] -> scattering[0, i0, 0] }" + "schedule" : "{ Stmt_for_body[i0] -> [0, i0, 0] }" } ] } diff --git a/polly/test/Isl/CodeGen/OpenMP/single_parallel_loop___%for.i---%exit.jscop b/polly/test/Isl/CodeGen/OpenMP/single_parallel_loop___%for.i---%exit.jscop index 971f196..7c0742ea 100644 --- a/polly/test/Isl/CodeGen/OpenMP/single_parallel_loop___%for.i---%exit.jscop +++ b/polly/test/Isl/CodeGen/OpenMP/single_parallel_loop___%for.i---%exit.jscop @@ -11,7 +11,7 @@ ], "domain" : "{ Stmt_S[i0] : i0 >= 0 and i0 <= 1023 }", "name" : "Stmt_S", - "schedule" : "{ Stmt_S[i0] -> scattering[floor(i0/4) * 4, i0] }" + "schedule" : "{ Stmt_S[i0] -> [floor(i0/4) * 4, i0] }" } ] } diff --git a/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations___%do.body---%do.end.jscop b/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations___%do.body---%do.end.jscop index fcd78fc..c3ba880 100644 --- a/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations___%do.body---%do.end.jscop +++ b/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations___%do.body---%do.end.jscop @@ -4,7 +4,7 @@ "statements": [{ "name": "Stmt_do_body", "domain": "{ Stmt_do_body[i0] : i0 >= 0 and i0 <= 2147483646 }", - "schedule": "{ Stmt_do_body[i0] -> scattering[0, o1, i0, o3, 0] : 64o3 = o1 and o1 <= i0 and o1 >= -63 + i0 }", + "schedule": "{ Stmt_do_body[i0] -> [0, o1, i0, o3, 0] : 64o3 = o1 and o1 <= i0 and o1 >= -63 + i0 }", "accesses": [{ "kind": "write", "relation": "{ Stmt_do_body[i0] -> MemRef_A[0] }" diff --git a/polly/test/ScopInfo/loop_affine_bound_0.ll b/polly/test/ScopInfo/loop_affine_bound_0.ll index 6f5778b..55eb366 100644 --- a/polly/test/ScopInfo/loop_affine_bound_0.ll +++ b/polly/test/ScopInfo/loop_affine_bound_0.ll @@ -58,7 +58,7 @@ return: ; preds = %bb.nph8, %bb3, %ent ; 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[i0, i1] }; +; CHECK: [N, M] -> { Stmt_bb1[i0, i1] -> [i0, i1] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [N, M] -> { Stmt_bb1[i0, i1] -> MemRef_a[i0 + 128i1] }; ; CHECK: } diff --git a/polly/test/ScopInfo/loop_affine_bound_1.ll b/polly/test/ScopInfo/loop_affine_bound_1.ll index 3c2fe35..1977c07 100644 --- a/polly/test/ScopInfo/loop_affine_bound_1.ll +++ b/polly/test/ScopInfo/loop_affine_bound_1.ll @@ -57,7 +57,7 @@ return: ; preds = %bb3, %entry ; 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[i0, i1] }; +; CHECK: [N, M] -> { Stmt_bb1[i0, i1] -> [i0, i1] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [N, M] -> { Stmt_bb1[i0, i1] -> MemRef_a[129i0 + 128i1] }; ; CHECK: } diff --git a/polly/test/ScopInfo/loop_affine_bound_2.ll b/polly/test/ScopInfo/loop_affine_bound_2.ll index f686c78..1a0e25d 100644 --- a/polly/test/ScopInfo/loop_affine_bound_2.ll +++ b/polly/test/ScopInfo/loop_affine_bound_2.ll @@ -68,7 +68,7 @@ return: ; preds = %bb3, %entry ; 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[i0, i1] }; +; CHECK: [N, M] -> { Stmt_bb1[i0, i1] -> [i0, i1] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [N, M] -> { Stmt_bb1[i0, i1] -> MemRef_a[-1152 + 768M + 897i0 + 128i1] }; ; CHECK: } diff --git a/polly/test/ScopInfo/loop_carry.ll b/polly/test/ScopInfo/loop_carry.ll index d72316c..08e2ca7 100644 --- a/polly/test/ScopInfo/loop_carry.ll +++ b/polly/test/ScopInfo/loop_carry.ll @@ -53,7 +53,7 @@ bb2: ; preds = %bb, %entry ; CHECK: Domain := ; CHECK: [n] -> { Stmt_bb_nph[] : n >= 2 }; ; CHECK: Scattering := -; CHECK: [n] -> { Stmt_bb_nph[] -> scattering[0, 0] }; +; CHECK: [n] -> { Stmt_bb_nph[] -> [0, 0] }; ; CHECK: ReadAccess := ; CHECK: [n] -> { Stmt_bb_nph[] -> MemRef_a[0] }; ; CHECK: MustWriteAccess := @@ -64,7 +64,7 @@ bb2: ; preds = %bb, %entry ; 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] }; +; CHECK: [n] -> { Stmt_bb[i0] -> [1, i0] }; ; CHECK: ReadAccess := ; CHECK: [n] -> { Stmt_bb[i0] -> MemRef__reg2mem[0] }; ; CHECK: ReadAccess := diff --git a/polly/test/ScopInfo/multidim_2d-diagonal-matrix.ll b/polly/test/ScopInfo/multidim_2d-diagonal-matrix.ll index 964724a..32ddc89 100644 --- a/polly/test/ScopInfo/multidim_2d-diagonal-matrix.ll +++ b/polly/test/ScopInfo/multidim_2d-diagonal-matrix.ll @@ -19,7 +19,7 @@ target triple = "x86_64-unknown-linux-gnu" ; CHECK: Domain := ; CHECK: [n] -> { Stmt_for_i[i0] : i0 >= 0 and i0 <= -1 + n }; ; CHECK: Scattering := -; CHECK: [n] -> { Stmt_for_i[i0] -> scattering[i0] }; +; CHECK: [n] -> { Stmt_for_i[i0] -> [i0] }; ; CHECK: MustWriteAccess := ; CHECK: [n] -> { Stmt_for_i[i0] -> MemRef_A[i0, i0] }; diff --git a/polly/test/ScopInfo/multidim_2d_outer_parametric_offset.ll b/polly/test/ScopInfo/multidim_2d_outer_parametric_offset.ll index 176cbfe..340b408 100644 --- a/polly/test/ScopInfo/multidim_2d_outer_parametric_offset.ll +++ b/polly/test/ScopInfo/multidim_2d_outer_parametric_offset.ll @@ -19,7 +19,7 @@ target triple = "x86_64-unknown-linux-gnu" ; 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[i0, i1] }; +; CHECK: [m, p] -> { Stmt_for_j[i0, i1] -> [i0, i1] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [m, p] -> { Stmt_for_j[i0, i1] -> MemRef_A[p + i0, i1] }; ; CHECK: } diff --git a/polly/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll b/polly/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll index f19d649..548d4c1 100644 --- a/polly/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll +++ b/polly/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll @@ -17,7 +17,7 @@ target triple = "x86_64-unknown-linux-gnu" ; 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[i0, i1] }; +; CHECK: [m] -> { Stmt_for_j[i0, i1] -> [i0, i1] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [m] -> { Stmt_for_j[i0, i1] -> MemRef_A[i0, i1] }; diff --git a/polly/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll b/polly/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll index 08a17d7..1cd3fca 100644 --- a/polly/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll +++ b/polly/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll @@ -19,7 +19,7 @@ target triple = "x86_64-unknown-linux-gnu" ; 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[i0, i1, i2] }; +; CHECK: [m, o] -> { Stmt_for_k[i0, i1, i2] -> [i0, i1, i2] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[i0, i1, i2] }; diff --git a/polly/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll b/polly/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll index d275457..92e1c07 100644 --- a/polly/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll +++ b/polly/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll @@ -21,7 +21,7 @@ target triple = "x86_64-unknown-linux-gnu" ; 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[i0, i1, i2] }; +; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> [i0, i1, i2] }; ; CHECK: MustWriteAccess ; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, i1, 7 + i2] }; diff --git a/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll b/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll index 8b17ab0..d1d66f1 100644 --- a/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll +++ b/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll @@ -28,7 +28,7 @@ target triple = "x86_64-unknown-linux-gnu" ; 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[i0, i1, i2] }; +; CHECK: [n, m, o, p, q, r] -> { Stmt_for_k[i0, i1, i2] -> [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] }; diff --git a/polly/test/ScopInfo/multidim_nested_start_integer.ll b/polly/test/ScopInfo/multidim_nested_start_integer.ll index bd78a76..30e0660a 100644 --- a/polly/test/ScopInfo/multidim_nested_start_integer.ll +++ b/polly/test/ScopInfo/multidim_nested_start_integer.ll @@ -18,7 +18,7 @@ target triple = "x86_64-unknown-linux-gnu" ; 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[i0, i1, i2] }; +; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> [i0, i1, i2] }; ; CHECK: MustWriteAccess ; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, i1, 7 + i2] }; diff --git a/polly/test/ScopInfo/multidim_only_ivs_2d.ll b/polly/test/ScopInfo/multidim_only_ivs_2d.ll index 1c8b363..1556e22 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_2d.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_2d.ll @@ -19,7 +19,7 @@ target triple = "x86_64-unknown-linux-gnu" ; 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[i0, i1] }; +; CHECK: [n, m] -> { Stmt_for_j[i0, i1] -> [i0, i1] }; ; CHECK: MustWriteAccess ; CHECK: [n, m] -> { Stmt_for_j[i0, i1] -> MemRef_A[i0, i1] }; diff --git a/polly/test/ScopInfo/multidim_only_ivs_3d.ll b/polly/test/ScopInfo/multidim_only_ivs_3d.ll index 6d682a7..8641e86 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_3d.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_3d.ll @@ -20,7 +20,7 @@ target triple = "x86_64-unknown-linux-gnu" ; 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[i0, i1, i2] }; +; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> [i0, i1, i2] }; ; CHECK: WriteAccess ; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[i0, i1, i2] }; diff --git a/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll b/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll index 2dd2f1b..e7fd154 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll @@ -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[i0, i1, i2] }; +; CHECK: [n, m, o, p_3, p_4] -> { Stmt_for_k[i0, i1, i2] -> [i0, i1, i2] }; ; CHECK: WriteAccess ; CHECK: [n, m, o, p_3, p_4] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[i0, i1, i2] }; diff --git a/polly/test/ScopInfo/multidim_only_ivs_3d_reverse.ll b/polly/test/ScopInfo/multidim_only_ivs_3d_reverse.ll index babe759..199a2e2 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_3d_reverse.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_3d_reverse.ll @@ -25,7 +25,7 @@ target triple = "x86_64-unknown-linux-gnu" ; 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[i0, i1, i2] }; +; CHECK: [n, o, m] -> { Stmt_for_j[i0, i1, i2] -> [i0, i1, i2] }; ; CHECK: WriteAccess ; CHECK: [n, o, m] -> { Stmt_for_j[i0, i1, i2] -> MemRef_A[i0, i2, i1] }; diff --git a/polly/test/ScopInfo/non_affine_parametric_loop.ll b/polly/test/ScopInfo/non_affine_parametric_loop.ll index d78f18c..e51ba0f 100644 --- a/polly/test/ScopInfo/non_affine_parametric_loop.ll +++ b/polly/test/ScopInfo/non_affine_parametric_loop.ll @@ -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[i0] }; +; CHECK: [n] -> { Stmt_for_body[i0] -> [i0] }; ; CHECK: ReadAccess ; CHECK: [n] -> { Stmt_for_body[i0] -> MemRef_INDEX[i0] }; ; CHECK: WriteAccess diff --git a/polly/test/ScopInfo/pointer-type-expressions.ll b/polly/test/ScopInfo/pointer-type-expressions.ll index 5392b94..440046a 100644 --- a/polly/test/ScopInfo/pointer-type-expressions.ll +++ b/polly/test/ScopInfo/pointer-type-expressions.ll @@ -44,6 +44,6 @@ return: ; CHECK: (P >= 1 and i0 >= 0 and i0 <= -1 + N) ; CHECK: }; ; CHECK: Scattering := -; CHECK: [N, P] -> { Stmt_store[i0] -> scattering[i0] }; +; CHECK: [N, P] -> { Stmt_store[i0] -> [i0] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [N, P] -> { Stmt_store[i0] -> MemRef_a[i0] }; diff --git a/polly/test/ScopInfo/scalar.ll b/polly/test/ScopInfo/scalar.ll index 5541b4c..9a18d67 100644 --- a/polly/test/ScopInfo/scalar.ll +++ b/polly/test/ScopInfo/scalar.ll @@ -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[i0, 0] }; +; CHECK: [N] -> { Stmt_S1[i0] -> [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[i0, 1] }; +; CHECK: [N] -> { Stmt_S2[i0] -> [i0, 1] }; ; CHECK: ReadAccess := ; CHECK: [N] -> { Stmt_S2[i0] -> MemRef_val[] }; ; CHECK: MustWriteAccess := diff --git a/polly/test/ScopInfo/simple_loop_1.ll b/polly/test/ScopInfo/simple_loop_1.ll index 10d248b..90de89d 100644 --- a/polly/test/ScopInfo/simple_loop_1.ll +++ b/polly/test/ScopInfo/simple_loop_1.ll @@ -32,6 +32,6 @@ return: ; preds = %bb, %entry ; CHECK: Domain := ; CHECK: [N] -> { Stmt_bb[i0] : i0 >= 0 and i0 <= -1 + N }; ; CHECK: Scattering := -; CHECK: [N] -> { Stmt_bb[i0] -> scattering[i0] }; +; CHECK: [N] -> { Stmt_bb[i0] -> [i0] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [N] -> { Stmt_bb[i0] -> MemRef_a[i0] }; diff --git a/polly/test/ScopInfo/unsigned-condition.ll b/polly/test/ScopInfo/unsigned-condition.ll index 407ede9..9cfd458 100644 --- a/polly/test/ScopInfo/unsigned-condition.ll +++ b/polly/test/ScopInfo/unsigned-condition.ll @@ -42,6 +42,6 @@ return: ; CHECK: i0 >= 0 and i0 <= -1 + N and P >= 42 ; CHECK: }; ; CHECK: Scattering := -; CHECK: [N, P] -> { Stmt_store[i0] -> scattering[i0] }; +; CHECK: [N, P] -> { Stmt_store[i0] -> [i0] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [N, P] -> { Stmt_store[i0] -> MemRef_a[i0] }; -- 2.7.4