diff options
author | Tobias Grosser <tobias@grosser.es> | 2015-04-21 14:37:25 +0300 |
---|---|---|
committer | Tobias Grosser <tobias@grosser.es> | 2015-04-21 14:37:25 +0300 |
commit | 54839311177600cda6fa8f4daedc5e7524bfb638 (patch) | |
tree | 356c4774bf80dbe0d408214b2a1eaff15ad9ae96 /polly/test | |
parent | 8e086cedfa36cd3badb6cfcb1b19811dcdc4c3b3 (diff) |
Rename 'scattering' to 'schedule'
In Polly we used both the term 'scattering' and the term 'schedule' to describe
the execution order of a statement without actually distinguishing between them.
We now uniformly use the term 'schedule' for the execution order. This
corresponds to the terminology of isl.
History: CLooG introduced the term scattering as the generated code can be used
as a sequential execution order (schedule) or as a parallel dimension
enumerating different threads of execution (placement). In Polly and/or isl the
term placement was never used, but we uniformly refer to an execution order as a
schedule and only later introduce parallelism. When doing so we do not talk
about about specific placement dimensions.
llvm-svn: 235380
Diffstat (limited to 'polly/test')
34 files changed, 46 insertions, 46 deletions
diff --git a/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_1.ll b/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_1.ll index 3f05fb1d8a9a..87c5afaf3772 100644 --- a/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_1.ll +++ b/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_1.ll @@ -13,7 +13,7 @@ ; CHECK: Stmt_(bb3 => bb11) ; CHECK: Domain := ; CHECK: { Stmt_(bb3 => bb11)[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_(bb3 => bb11)[i0] -> [i0] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; CHECK: { Stmt_(bb3 => bb11)[i0] -> MemRef_C[i0] }; diff --git a/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_2.ll b/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_2.ll index 57122a983562..40d6d3e19a10 100644 --- a/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_2.ll +++ b/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_2.ll @@ -22,7 +22,7 @@ ; INNERMOST: Stmt_bb16 ; INNERMOST: Domain := ; INNERMOST: [p_0, p_1, p_2, p_3, p_4] -> { Stmt_bb16[i0] : (i0 <= 1023 - p_1 and i0 >= 0 and i0 <= 1024 + p_0) or (i0 >= 0 and i0 >= 1025 - p_1 and i0 <= 1024 + p_0) }; -; INNERMOST: Scattering := +; INNERMOST: Schedule := ; INNERMOST: [p_0, p_1, p_2, p_3, p_4] -> { Stmt_bb16[i0] -> [i0] }; ; INNERMOST: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; INNERMOST: [p_0, p_1, p_2, p_3, p_4] -> { Stmt_bb16[i0] -> MemRef_A[o0] : 4o0 = p_2 }; @@ -47,7 +47,7 @@ ; ALL: Stmt_(bb15 => bb25) ; ALL: Domain := ; ALL: { Stmt_(bb15 => bb25)[i0, i1] : i0 >= 0 and i0 <= 1023 and i1 >= 0 and i1 <= 1023 }; -; ALL: Scattering := +; ALL: Schedule := ; ALL: { Stmt_(bb15 => bb25)[i0, i1] -> [i0, i1] }; ; ALL: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; ALL: { Stmt_(bb15 => bb25)[i0, i1] -> MemRef_A[i0] }; diff --git a/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_3.ll b/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_3.ll index b46ab4f81bb8..d363089b251f 100644 --- a/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_3.ll +++ b/polly/test/ScopInfo/NonAffine/non-affine-loop-condition-dependent-access_3.ll @@ -24,7 +24,7 @@ ; INNERMOST: Stmt_bb16 ; INNERMOST: Domain := ; INNERMOST: [p_0, p_1, p_2] -> { Stmt_bb16[i0] : i0 >= 0 and i0 <= -1 + p_0 }; -; INNERMOST: Scattering := +; INNERMOST: Schedule := ; INNERMOST: [p_0, p_1, p_2] -> { Stmt_bb16[i0] -> [i0] }; ; INNERMOST: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; INNERMOST: [p_0, p_1, p_2] -> { Stmt_bb16[i0] -> MemRef_A[o0] : 4o0 = p_1 }; @@ -49,7 +49,7 @@ ; ALL: Stmt_(bb15 => bb25) ; ALL: Domain := ; ALL: { Stmt_(bb15 => bb25)[i0, i1] : i0 >= 0 and i0 <= 1023 and i1 >= 0 and i1 <= 1023 }; -; ALL: Scattering := +; ALL: Schedule := ; ALL: { Stmt_(bb15 => bb25)[i0, i1] -> [i0, i1] }; ; ALL: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; ALL: { Stmt_(bb15 => bb25)[i0, i1] -> MemRef_A[i0] }; diff --git a/polly/test/ScopInfo/NonAffine/non_affine_conditional_nested.ll b/polly/test/ScopInfo/NonAffine/non_affine_conditional_nested.ll index 1522963b7a43..baddf033f880 100644 --- a/polly/test/ScopInfo/NonAffine/non_affine_conditional_nested.ll +++ b/polly/test/ScopInfo/NonAffine/non_affine_conditional_nested.ll @@ -13,7 +13,7 @@ ; CHECK: Stmt_(bb2 => bb16) ; CHECK: Domain := ; CHECK: { Stmt_(bb2 => bb16)[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_(bb2 => bb16)[i0] -> [i0] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; CHECK: { Stmt_(bb2 => bb16)[i0] -> MemRef_A[i0] }; diff --git a/polly/test/ScopInfo/NonAffine/non_affine_conditional_surrounding_affine_loop.ll b/polly/test/ScopInfo/NonAffine/non_affine_conditional_surrounding_affine_loop.ll index 21f2ceea3e4d..75b2064b9e78 100644 --- a/polly/test/ScopInfo/NonAffine/non_affine_conditional_surrounding_affine_loop.ll +++ b/polly/test/ScopInfo/NonAffine/non_affine_conditional_surrounding_affine_loop.ll @@ -15,7 +15,7 @@ ; INNERMOST: Stmt_bb11 ; INNERMOST: Domain := ; INNERMOST: [N] -> { Stmt_bb11[i0] : i0 >= 0 and N >= 1 and i0 <= -1 + N }; -; INNERMOST: Scattering := +; INNERMOST: Schedule := ; INNERMOST: [N] -> { Stmt_bb11[i0] -> [i0] }; ; INNERMOST: ReadAccess := [Reduction Type: +] [Scalar: 0] ; INNERMOST: [N] -> { Stmt_bb11[i0] -> MemRef_A[i0] }; @@ -36,7 +36,7 @@ ; ALL: Stmt_(bb4 => bb17) ; ALL: Domain := ; ALL: { Stmt_(bb4 => bb17)[i0] : i0 >= 0 and i0 <= 1023 }; -; ALL: Scattering := +; ALL: Schedule := ; ALL: { Stmt_(bb4 => bb17)[i0] -> [i0] }; ; ALL: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; ALL: { Stmt_(bb4 => bb17)[i0] -> MemRef_A[i0] }; diff --git a/polly/test/ScopInfo/NonAffine/non_affine_conditional_surrounding_non_affine_loop.ll b/polly/test/ScopInfo/NonAffine/non_affine_conditional_surrounding_non_affine_loop.ll index ef44ce03d15e..cc57440fdb9b 100644 --- a/polly/test/ScopInfo/NonAffine/non_affine_conditional_surrounding_non_affine_loop.ll +++ b/polly/test/ScopInfo/NonAffine/non_affine_conditional_surrounding_non_affine_loop.ll @@ -15,7 +15,7 @@ ; INNERMOST: Stmt_bb12 ; INNERMOST: Domain := ; INNERMOST: [p_0] -> { Stmt_bb12[i0] : i0 >= 0 and p_0 >= 1 and i0 <= -1 + p_0 }; -; INNERMOST: Scattering := +; INNERMOST: Schedule := ; INNERMOST: [p_0] -> { Stmt_bb12[i0] -> [i0] }; ; INNERMOST: ReadAccess := [Reduction Type: +] [Scalar: 0] ; INNERMOST: [p_0] -> { Stmt_bb12[i0] -> MemRef_A[i0] }; @@ -36,7 +36,7 @@ ; ALL: Stmt_(bb4 => bb18) ; ALL: Domain := ; ALL: { Stmt_(bb4 => bb18)[i0] : i0 >= 0 and i0 <= 1023 }; -; ALL: Scattering := +; ALL: Schedule := ; ALL: { Stmt_(bb4 => bb18)[i0] -> [i0] }; ; ALL: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; ALL: { Stmt_(bb4 => bb18)[i0] -> MemRef_A[i0] }; diff --git a/polly/test/ScopInfo/NonAffine/non_affine_float_compare.ll b/polly/test/ScopInfo/NonAffine/non_affine_float_compare.ll index 7148abfe6d51..f55334cc8b5d 100644 --- a/polly/test/ScopInfo/NonAffine/non_affine_float_compare.ll +++ b/polly/test/ScopInfo/NonAffine/non_affine_float_compare.ll @@ -13,7 +13,7 @@ ; CHECK: Stmt_(bb2 => bb12) ; CHECK: Domain := ; CHECK: { Stmt_(bb2 => bb12)[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_(bb2 => bb12)[i0] -> [i0] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; CHECK: { Stmt_(bb2 => bb12)[i0] -> MemRef_A[i0] }; diff --git a/polly/test/ScopInfo/NonAffine/non_affine_loop_condition.ll b/polly/test/ScopInfo/NonAffine/non_affine_loop_condition.ll index 04d6dee5f2e5..b64b784e59d7 100644 --- a/polly/test/ScopInfo/NonAffine/non_affine_loop_condition.ll +++ b/polly/test/ScopInfo/NonAffine/non_affine_loop_condition.ll @@ -14,7 +14,7 @@ ; CHECK: Stmt_(bb3 => bb10) ; CHECK: Domain := ; CHECK: { Stmt_(bb3 => bb10)[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_(bb3 => bb10)[i0] -> [i0] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; CHECK: { Stmt_(bb3 => bb10)[i0] -> MemRef_C[i0] }; diff --git a/polly/test/ScopInfo/NonAffine/non_affine_loop_used_later.ll b/polly/test/ScopInfo/NonAffine/non_affine_loop_used_later.ll index 506cb9a1ce2c..3acc9172cb72 100644 --- a/polly/test/ScopInfo/NonAffine/non_affine_loop_used_later.ll +++ b/polly/test/ScopInfo/NonAffine/non_affine_loop_used_later.ll @@ -17,7 +17,7 @@ ; CHECK: Stmt_bb2 ; CHECK: Domain := ; CHECK: [N] -> { Stmt_bb2[i0] : i0 >= 0 and N >= 1 and i0 <= N; Stmt_bb2[0] : N <= 0 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: [N] -> { Stmt_bb2[i0] -> [i0, 0] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 1] ; CHECK: [N] -> { Stmt_bb2[i0] -> MemRef_j_0[] }; @@ -26,7 +26,7 @@ ; CHECK: Stmt_(bb4 => bb18) ; CHECK: Domain := ; CHECK: [N] -> { Stmt_(bb4 => bb18)[i0] : i0 >= 0 and N >= 1 and i0 <= -1 + N }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: [N] -> { Stmt_(bb4 => bb18)[i0] -> [i0, 1] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; CHECK: [N] -> { Stmt_(bb4 => bb18)[i0] -> MemRef_A[i0] }; @@ -45,7 +45,7 @@ ; CHECK: Stmt_bb18 ; CHECK: Domain := ; CHECK: [N] -> { Stmt_bb18[i0] : i0 >= 0 and N >= 1 and i0 <= -1 + N }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: [N] -> { Stmt_bb18[i0] -> [i0, 2] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 1] ; CHECK: [N] -> { Stmt_bb18[i0] -> MemRef_j_2[] }; @@ -58,7 +58,7 @@ ; CHECK: Stmt_bb23 ; CHECK: Domain := ; CHECK: [N] -> { Stmt_bb23[i0] : i0 >= 0 and N >= 1 and i0 <= -1 + N }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: [N] -> { Stmt_bb23[i0] -> [i0, 3] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 1] ; CHECK: [N] -> { Stmt_bb23[i0] -> MemRef_j_2[] }; diff --git a/polly/test/ScopInfo/NonAffine/non_affine_parametric_loop.ll b/polly/test/ScopInfo/NonAffine/non_affine_parametric_loop.ll index 81cd03b9cdcd..4ff680a04221 100644 --- a/polly/test/ScopInfo/NonAffine/non_affine_parametric_loop.ll +++ b/polly/test/ScopInfo/NonAffine/non_affine_parametric_loop.ll @@ -29,7 +29,7 @@ for.end: ; CHECK: Domain ; CHECK: [n] -> { Stmt_for_body[i0] : i0 >= 0 and i0 <= -1 + n }; -; CHECK: Scattering +; CHECK: Schedule ; CHECK: [n] -> { Stmt_for_body[i0] -> [i0] }; ; CHECK: ReadAccess ; CHECK: [n] -> { Stmt_for_body[i0] -> MemRef_INDEX[i0] }; diff --git a/polly/test/ScopInfo/loop_affine_bound_0.ll b/polly/test/ScopInfo/loop_affine_bound_0.ll index 44952cb5f760..2af9d14dbe5a 100644 --- a/polly/test/ScopInfo/loop_affine_bound_0.ll +++ b/polly/test/ScopInfo/loop_affine_bound_0.ll @@ -57,7 +57,7 @@ return: ; preds = %bb.nph8, %bb3, %ent ; CHECK: Stmt_bb1 ; 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: Schedule := ; 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] }; diff --git a/polly/test/ScopInfo/loop_affine_bound_1.ll b/polly/test/ScopInfo/loop_affine_bound_1.ll index 636ecf10e6e0..fc0b881fa2a8 100644 --- a/polly/test/ScopInfo/loop_affine_bound_1.ll +++ b/polly/test/ScopInfo/loop_affine_bound_1.ll @@ -56,7 +56,7 @@ return: ; preds = %bb3, %entry ; CHECK: Stmt_bb1 ; 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: Schedule := ; 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] }; diff --git a/polly/test/ScopInfo/loop_affine_bound_2.ll b/polly/test/ScopInfo/loop_affine_bound_2.ll index 88cbc8e409f2..145eb22a7647 100644 --- a/polly/test/ScopInfo/loop_affine_bound_2.ll +++ b/polly/test/ScopInfo/loop_affine_bound_2.ll @@ -67,7 +67,7 @@ return: ; preds = %bb3, %entry ; CHECK: Stmt_bb1 ; 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: Schedule := ; 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] }; diff --git a/polly/test/ScopInfo/loop_carry.ll b/polly/test/ScopInfo/loop_carry.ll index dc33aaa94a23..3f2385e37db9 100644 --- a/polly/test/ScopInfo/loop_carry.ll +++ b/polly/test/ScopInfo/loop_carry.ll @@ -52,7 +52,7 @@ bb2: ; preds = %bb, %entry ; CHECK: Stmt_bb_nph ; CHECK: Domain := ; CHECK: [n] -> { Stmt_bb_nph[] : n >= 2 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: [n] -> { Stmt_bb_nph[] -> [0, 0] }; ; CHECK: ReadAccess := ; CHECK: [n] -> { Stmt_bb_nph[] -> MemRef_a[0] }; @@ -63,7 +63,7 @@ bb2: ; preds = %bb, %entry ; CHECK: Stmt_bb ; CHECK: Domain := ; CHECK: [n] -> { Stmt_bb[i0] : i0 >= 0 and i0 <= -2 + n and n >= 2 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: [n] -> { Stmt_bb[i0] -> [1, i0] }; ; CHECK: ReadAccess := ; CHECK: [n] -> { Stmt_bb[i0] -> MemRef__reg2mem[0] }; diff --git a/polly/test/ScopInfo/multidim_2d-diagonal-matrix.ll b/polly/test/ScopInfo/multidim_2d-diagonal-matrix.ll index 457355859996..7ca18b7dff14 100644 --- a/polly/test/ScopInfo/multidim_2d-diagonal-matrix.ll +++ b/polly/test/ScopInfo/multidim_2d-diagonal-matrix.ll @@ -18,7 +18,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: Schedule := ; 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 11055aa4ede1..8ddbbf44dcf7 100644 --- a/polly/test/ScopInfo/multidim_2d_outer_parametric_offset.ll +++ b/polly/test/ScopInfo/multidim_2d_outer_parametric_offset.ll @@ -18,7 +18,7 @@ target triple = "x86_64-unknown-linux-gnu" ; CHECK: Stmt_for_j ; 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: Schedule := ; 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] }; 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 26b5b31fa3ba..446061fa4e46 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 @@ -16,7 +16,7 @@ target triple = "x86_64-unknown-linux-gnu" ; CHECK: Stmt_for_j ; CHECK: Domain := ; CHECK: [m] -> { Stmt_for_j[i0, i1] : i0 >= 0 and i0 <= 99 and i1 >= 0 and i1 <= 149 }; -; CHECK: Scattering := +; CHECK: Schedule := ; 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 d692136a371d..c4ffd72c9b67 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 @@ -18,7 +18,7 @@ target triple = "x86_64-unknown-linux-gnu" ; CHECK: Stmt_for_k ; CHECK: Domain := ; CHECK: [o, m] -> { 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: Schedule := ; CHECK: [o, m] -> { Stmt_for_k[i0, i1, i2] -> [i0, i1, i2] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [o, m] -> { 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 ca9651700524..c611865be71c 100644 --- a/polly/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll +++ b/polly/test/ScopInfo/multidim_ivs_and_integer_offsets_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 <= -4 + n and i1 >= 0 and i1 <= -5 + m and i2 >= 0 and i2 <= -8 + o }; -; CHECK: Scattering +; CHECK: Schedule ; 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 200904c0c822..e454b4355bda 100644 --- a/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll +++ b/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll @@ -27,7 +27,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: Schedule ; 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[-1 + p + i0, -1 + m + q + i1, o + r + i2] : i1 <= -q and i2 <= -1 - r; Stmt_for_k[i0, i1, i2] -> MemRef_A[p + i0, -1 + q + i1, o + r + i2] : i1 >= 1 - q and i2 <= -1 - r; Stmt_for_k[i0, i1, i2] -> MemRef_A[-1 + p + i0, m + q + i1, r + i2] : i1 <= -1 - q and i2 >= -r; Stmt_for_k[i0, i1, i2] -> MemRef_A[p + i0, q + i1, r + i2] : i1 >= -q and i2 >= -r }; diff --git a/polly/test/ScopInfo/multidim_nested_start_integer.ll b/polly/test/ScopInfo/multidim_nested_start_integer.ll index 42d2cb1d7638..aefecc7ff1e6 100644 --- a/polly/test/ScopInfo/multidim_nested_start_integer.ll +++ b/polly/test/ScopInfo/multidim_nested_start_integer.ll @@ -17,7 +17,7 @@ target triple = "x86_64-unknown-linux-gnu" ; CHECK-NOT: p3 ; 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: Schedule ; 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 fdc0467841b5..1847e3490d80 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_2d.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_2d.ll @@ -18,7 +18,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: Schedule ; 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 d922ed128347..e964d08ea3e6 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_3d.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_3d.ll @@ -19,7 +19,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: Schedule ; 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 a726d703b3da..6157de3f669e 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll @@ -26,7 +26,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: Schedule ; 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 24bbe7206aef..d9be6bfbe16e 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_3d_reverse.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_3d_reverse.ll @@ -24,7 +24,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: Schedule ; 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_region_1.ll b/polly/test/ScopInfo/non_affine_region_1.ll index ce534da22aab..4898f37239dd 100644 --- a/polly/test/ScopInfo/non_affine_region_1.ll +++ b/polly/test/ScopInfo/non_affine_region_1.ll @@ -31,7 +31,7 @@ ; CHECK: Stmt_(bb10 => bb18) ; CHECK-NEXT: Domain := ; CHECK-NEXT: [b] -> { Stmt_(bb10 => bb18)[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK-NEXT: Scattering := +; CHECK-NEXT: Schedule := ; CHECK-NEXT: [b] -> { Stmt_(bb10 => bb18)[i0] -> [i0, 3] }; ; CHECK-NEXT: ReadAccess := [Reduction Type: NONE] [Scalar: 1] ; CHECK-NEXT: [b] -> { Stmt_(bb10 => bb18)[i0] -> MemRef_x_1[] } diff --git a/polly/test/ScopInfo/non_affine_region_2.ll b/polly/test/ScopInfo/non_affine_region_2.ll index 7f200420febd..798c8b1eaeba 100644 --- a/polly/test/ScopInfo/non_affine_region_2.ll +++ b/polly/test/ScopInfo/non_affine_region_2.ll @@ -23,7 +23,7 @@ ; CHECK: Stmt_(bb3 => bb18) ; CHECK: Domain := ; CHECK: { Stmt_(bb3 => bb18)[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_(bb3 => bb18)[i0] -> [i0, 0] }; ; CHECK-NOT: { Stmt_(bb3 => bb18)[i0] -> MemRef_x_0[] }; ; CHECK-NOT: { Stmt_(bb3 => bb18)[i0] -> MemRef_x_1[] }; @@ -42,7 +42,7 @@ ; CHECK: Stmt_bb18 ; CHECK: Domain := ; CHECK: { Stmt_bb18[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_bb18[i0] -> [i0, 1] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 1] ; CHECK: { Stmt_bb18[i0] -> MemRef_x_2[] }; diff --git a/polly/test/ScopInfo/non_affine_region_3.ll b/polly/test/ScopInfo/non_affine_region_3.ll index 8562c4cb7481..5bb3deb9b038 100644 --- a/polly/test/ScopInfo/non_affine_region_3.ll +++ b/polly/test/ScopInfo/non_affine_region_3.ll @@ -23,7 +23,7 @@ ; CHECK: Stmt_(bb3 => bb18) ; CHECK: Domain := ; CHECK: { Stmt_(bb3 => bb18)[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_(bb3 => bb18)[i0] -> [i0, 0] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; CHECK: { Stmt_(bb3 => bb18)[i0] -> MemRef_A[i0] }; @@ -38,7 +38,7 @@ ; CHECK: Stmt_bb18 ; CHECK: Domain := ; CHECK: { Stmt_bb18[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_bb18[i0] -> [i0, 1] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 1] ; CHECK: { Stmt_bb18[i0] -> MemRef_x_2[] }; diff --git a/polly/test/ScopInfo/non_affine_region_4.ll b/polly/test/ScopInfo/non_affine_region_4.ll index b78b4c2cef14..da59ba0c235b 100644 --- a/polly/test/ScopInfo/non_affine_region_4.ll +++ b/polly/test/ScopInfo/non_affine_region_4.ll @@ -16,7 +16,7 @@ ; CHECK: Stmt_(bb2 => bb7) ; CHECK: Domain := ; CHECK: { Stmt_(bb2 => bb7)[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_(bb2 => bb7)[i0] -> [i0, 0] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0] ; CHECK: { Stmt_(bb2 => bb7)[i0] -> MemRef_A[i0] }; @@ -29,7 +29,7 @@ ; CHECK: Stmt_bb7 ; CHECK: Domain := ; CHECK: { Stmt_bb7[i0] : i0 >= 0 and i0 <= 1023 }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: { Stmt_bb7[i0] -> [i0, 1] }; ; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 1] ; CHECK: { Stmt_bb7[i0] -> MemRef_x[] }; diff --git a/polly/test/ScopInfo/pointer-type-expressions.ll b/polly/test/ScopInfo/pointer-type-expressions.ll index 51e8193f3c21..51e143cf0cea 100644 --- a/polly/test/ScopInfo/pointer-type-expressions.ll +++ b/polly/test/ScopInfo/pointer-type-expressions.ll @@ -43,7 +43,7 @@ return: ; CHECK: or ; CHECK: (P >= 1 and i0 >= 0 and i0 <= -1 + N) ; CHECK: }; -; CHECK: Scattering := +; CHECK: Schedule := ; 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/reduction_alternating_base.ll b/polly/test/ScopInfo/reduction_alternating_base.ll index 25f1a36310dc..28057b60cb23 100644 --- a/polly/test/ScopInfo/reduction_alternating_base.ll +++ b/polly/test/ScopInfo/reduction_alternating_base.ll @@ -3,7 +3,7 @@ ; FIXME: We cannot detect this SCoP yet but as soon as we can we should check ; that the reduction is detected! ; -; CHECK-NOT: Scattering +; CHECK-NOT: Schedule ; ; void f(int *A) { ; for (int i = 0; i < 1024; i++) diff --git a/polly/test/ScopInfo/scalar.ll b/polly/test/ScopInfo/scalar.ll index 4954b6100c2e..1c3856fc739f 100644 --- a/polly/test/ScopInfo/scalar.ll +++ b/polly/test/ScopInfo/scalar.ll @@ -33,7 +33,7 @@ return: ; CHECK: Stmt_S1 ; CHECK: Domain := ; CHECK: [N] -> { Stmt_S1[i0] : i0 >= 0 and i0 <= -1 + N }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: [N] -> { Stmt_S1[i0] -> [i0, 0] }; ; CHECK: ReadAccess := ; CHECK: [N] -> { Stmt_S1[i0] -> MemRef_a[i0] }; @@ -42,7 +42,7 @@ return: ; CHECK: Stmt_S2 ; CHECK: Domain := ; CHECK: [N] -> { Stmt_S2[i0] : i0 >= 0 and i0 <= -1 + N }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: [N] -> { Stmt_S2[i0] -> [i0, 1] }; ; CHECK: ReadAccess := ; CHECK: [N] -> { Stmt_S2[i0] -> MemRef_val[] }; diff --git a/polly/test/ScopInfo/simple_loop_1.ll b/polly/test/ScopInfo/simple_loop_1.ll index c4785739d396..1cd7861fe54c 100644 --- a/polly/test/ScopInfo/simple_loop_1.ll +++ b/polly/test/ScopInfo/simple_loop_1.ll @@ -31,7 +31,7 @@ return: ; preds = %bb, %entry ; CHECK: Stmt_bb ; CHECK: Domain := ; CHECK: [N] -> { Stmt_bb[i0] : i0 >= 0 and i0 <= -1 + N }; -; CHECK: Scattering := +; CHECK: Schedule := ; 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 a595fbcf611e..8ca0828881f0 100644 --- a/polly/test/ScopInfo/unsigned-condition.ll +++ b/polly/test/ScopInfo/unsigned-condition.ll @@ -41,7 +41,7 @@ return: ; CHECK: [N, P] -> { Stmt_store[i0] : ; CHECK: i0 >= 0 and i0 <= -1 + N and P >= 42 ; CHECK: }; -; CHECK: Scattering := +; CHECK: Schedule := ; CHECK: [N, P] -> { Stmt_store[i0] -> [i0] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] ; CHECK: [N, P] -> { Stmt_store[i0] -> MemRef_a[i0] }; |