From 944514c95479acbd8eca0d83bbe3867a94a7d886 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Fri, 1 May 2020 11:47:46 +0200 Subject: [PATCH] isl_codegen: skip explicit printing of outermost block by default Since this tool is only meant for demonstration and testing purposes, the extra braces are just redundant and visually distracting. Signed-off-by: Sven Verdoolaege --- codegen.c | 1 + test_inputs/codegen/cloog/4-param.c | 24 +- test_inputs/codegen/cloog/block.c | 10 +- test_inputs/codegen/cloog/block3.c | 10 +- test_inputs/codegen/cloog/byu98-1-2-3.c | 34 +- test_inputs/codegen/cloog/cholesky2.c | 32 +- test_inputs/codegen/cloog/constant.c | 32 +- test_inputs/codegen/cloog/dealII.c | 34 +- test_inputs/codegen/cloog/dot.c | 10 +- test_inputs/codegen/cloog/dot2.c | 20 +- test_inputs/codegen/cloog/durbin_e_s.c | 44 +- test_inputs/codegen/cloog/ex1.c | 24 +- test_inputs/codegen/cloog/faber.c | 296 +++++----- test_inputs/codegen/cloog/forwardsub-1-1-2.c | 14 +- test_inputs/codegen/cloog/forwardsub-2-1-2-3.c | 16 +- test_inputs/codegen/cloog/forwardsub-3-1-2.c | 30 +- test_inputs/codegen/cloog/gesced.c | 30 +- test_inputs/codegen/cloog/gesced2.c | 38 +- test_inputs/codegen/cloog/gesced3.c | 16 +- test_inputs/codegen/cloog/guide.c | 10 +- test_inputs/codegen/cloog/infinite2.c | 14 +- test_inputs/codegen/cloog/levenshtein-1-2-3.c | 62 +- test_inputs/codegen/cloog/logo.c | 32 +- test_inputs/codegen/cloog/logopar.c | 32 +- test_inputs/codegen/cloog/merge.c | 12 +- test_inputs/codegen/cloog/multi-stride.c | 2 - test_inputs/codegen/cloog/nul_lcpc.c | 20 +- test_inputs/codegen/cloog/orc.c | 26 +- test_inputs/codegen/cloog/reservoir-fusion1.c | 14 +- test_inputs/codegen/cloog/reservoir-lim-lam2.c | 18 +- test_inputs/codegen/cloog/reservoir-lim-lam5.c | 20 +- test_inputs/codegen/cloog/reservoir-lim-lam6.c | 14 +- test_inputs/codegen/cloog/reservoir-mg-interp.c | 168 +++--- test_inputs/codegen/cloog/reservoir-mg-interp2.c | 34 +- test_inputs/codegen/cloog/reservoir-pingali2.c | 14 +- test_inputs/codegen/cloog/reservoir-pingali3.c | 16 +- test_inputs/codegen/cloog/reservoir-pingali4.c | 14 +- test_inputs/codegen/cloog/singleton.c | 6 +- test_inputs/codegen/cloog/stride.c | 12 +- test_inputs/codegen/cloog/stride2.c | 14 +- test_inputs/codegen/cloog/test.c | 28 +- test_inputs/codegen/cloog/thomasset.c | 16 +- test_inputs/codegen/cloog/uday_scalars.c | 10 +- test_inputs/codegen/cloog/unroll.c | 24 +- test_inputs/codegen/cloog/usvd_e_t.c | 694 +++++++++++------------ test_inputs/codegen/cloog/vasilache.c | 46 +- test_inputs/codegen/cloog/vivien.c | 174 +++--- test_inputs/codegen/cloog/vivien2.c | 158 +++--- test_inputs/codegen/cloog/walters.c | 30 +- test_inputs/codegen/cloog/walters2.c | 20 +- test_inputs/codegen/cloog/walters3.c | 10 +- test_inputs/codegen/cloog/yosr.c | 18 +- test_inputs/codegen/cloog/yosr2.c | 22 +- test_inputs/codegen/cloog/youcefn.c | 16 +- test_inputs/codegen/component0.c | 8 +- test_inputs/codegen/component1.c | 8 +- test_inputs/codegen/component3.c | 8 +- test_inputs/codegen/component4.c | 12 +- test_inputs/codegen/component6.c | 8 +- test_inputs/codegen/component7.c | 10 +- test_inputs/codegen/group.c | 10 +- test_inputs/codegen/isolate1.c | 14 +- test_inputs/codegen/isolate3.c | 32 +- test_inputs/codegen/isolate4.c | 24 +- test_inputs/codegen/isolate5.c | 56 +- test_inputs/codegen/isolate6.c | 50 +- test_inputs/codegen/isolate7.c | 56 +- test_inputs/codegen/omega/basics-0.c | 14 +- test_inputs/codegen/omega/chosol-0.c | 14 +- test_inputs/codegen/omega/chosol-1.c | 14 +- test_inputs/codegen/omega/code_gen-2.c | 32 +- test_inputs/codegen/omega/collard-0.c | 28 +- test_inputs/codegen/omega/fc1-1.c | 32 +- test_inputs/codegen/omega/fc1-2.c | 32 +- test_inputs/codegen/omega/fc2-1.c | 32 +- test_inputs/codegen/omega/lift1-5.c | 30 +- test_inputs/codegen/omega/lift2-5.c | 42 +- test_inputs/codegen/omega/m12-1.c | 48 +- test_inputs/codegen/omega/m2-1.c | 18 +- test_inputs/codegen/omega/p6-0.c | 14 +- test_inputs/codegen/omega/stride7-1.c | 26 +- test_inputs/codegen/omega/ts1d-check-sblock-0.c | 28 +- test_inputs/codegen/omega/ts1d-check0-0.c | 24 +- test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c | 70 ++- test_inputs/codegen/omega/ts1d-orig0-0.c | 16 +- test_inputs/codegen/omega/wak1-0.c | 52 +- test_inputs/codegen/omega/wak1-1.c | 108 ++-- test_inputs/codegen/omega/wak3-1.c | 40 +- test_inputs/codegen/pldi2012/figure8_b.c | 12 +- test_inputs/codegen/roman.c | 62 +- test_inputs/codegen/separate.c | 12 +- test_inputs/codegen/separation_class.c | 32 +- test_inputs/codegen/separation_class2.c | 28 +- test_inputs/codegen/stride7.c | 14 +- test_inputs/codegen/unroll.c | 8 +- test_inputs/codegen/unroll11.c | 14 +- test_inputs/codegen/unroll2.c | 20 +- test_inputs/codegen/unroll4.c | 30 +- test_inputs/codegen/unroll6.c | 14 +- test_inputs/codegen/unroll7.c | 18 +- 100 files changed, 1806 insertions(+), 2003 deletions(-) rewrite test_inputs/codegen/cloog/byu98-1-2-3.c (98%) rewrite test_inputs/codegen/cloog/cholesky2.c (98%) rewrite test_inputs/codegen/cloog/dealII.c (99%) rewrite test_inputs/codegen/cloog/durbin_e_s.c (99%) rewrite test_inputs/codegen/cloog/faber.c (98%) rewrite test_inputs/codegen/cloog/gesced.c (99%) rewrite test_inputs/codegen/cloog/gesced2.c (98%) rewrite test_inputs/codegen/cloog/levenshtein-1-2-3.c (98%) rewrite test_inputs/codegen/cloog/logo.c (98%) rewrite test_inputs/codegen/cloog/logopar.c (89%) rewrite test_inputs/codegen/cloog/reservoir-mg-interp.c (89%) rewrite test_inputs/codegen/cloog/reservoir-mg-interp2.c (100%) rewrite test_inputs/codegen/cloog/usvd_e_t.c (97%) rewrite test_inputs/codegen/cloog/vasilache.c (97%) rewrite test_inputs/codegen/cloog/vivien.c (83%) rewrite test_inputs/codegen/cloog/vivien2.c (95%) rewrite test_inputs/codegen/cloog/walters.c (98%) rewrite test_inputs/codegen/isolate5.c (97%) rewrite test_inputs/codegen/isolate6.c (99%) rewrite test_inputs/codegen/isolate7.c (81%) rewrite test_inputs/codegen/omega/code_gen-2.c (98%) rewrite test_inputs/codegen/omega/fc1-1.c (99%) rewrite test_inputs/codegen/omega/fc1-2.c (99%) rewrite test_inputs/codegen/omega/fc2-1.c (99%) rewrite test_inputs/codegen/omega/lift1-5.c (100%) rewrite test_inputs/codegen/omega/lift2-5.c (100%) rewrite test_inputs/codegen/omega/m12-1.c (97%) rewrite test_inputs/codegen/omega/ts1d-check-sblock-0.c (98%) rewrite test_inputs/codegen/omega/ts1d-check0-0.c (99%) rewrite test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c (99%) rewrite test_inputs/codegen/omega/wak1-0.c (93%) rewrite test_inputs/codegen/omega/wak1-1.c (99%) rewrite test_inputs/codegen/omega/wak3-1.c (99%) rewrite test_inputs/codegen/roman.c (97%) rewrite test_inputs/codegen/separation_class.c (99%) rewrite test_inputs/codegen/separation_class2.c (92%) rewrite test_inputs/codegen/unroll4.c (100%) diff --git a/codegen.c b/codegen.c index 38dab49e..6b001de7 100644 --- a/codegen.c +++ b/codegen.c @@ -214,6 +214,7 @@ int main(int argc, char **argv) assert(options); ctx = isl_ctx_alloc_with_options(&options_args, options); isl_options_set_ast_build_detect_min_max(ctx, 1); + isl_options_set_ast_print_outermost_block(ctx, 0); argc = cg_options_parse(options, argc, argv, ISL_ARG_ALL); s = isl_stream_new_file(ctx, stdin); diff --git a/test_inputs/codegen/cloog/4-param.c b/test_inputs/codegen/cloog/4-param.c index bd38c704..9a5135bb 100644 --- a/test_inputs/codegen/cloog/4-param.c +++ b/test_inputs/codegen/cloog/4-param.c @@ -1,14 +1,12 @@ -{ - for (int c0 = p; c0 <= min(m - 1, q); c0 += 1) - S2(c0); - for (int c0 = m; c0 <= min(n, p - 1); c0 += 1) - S1(c0); - for (int c0 = max(m, p); c0 <= min(n, q); c0 += 1) { - S1(c0); - S2(c0); - } - for (int c0 = max(max(m, n + 1), p); c0 <= q; c0 += 1) - S2(c0); - for (int c0 = max(max(m, p), q + 1); c0 <= n; c0 += 1) - S1(c0); +for (int c0 = p; c0 <= min(m - 1, q); c0 += 1) + S2(c0); +for (int c0 = m; c0 <= min(n, p - 1); c0 += 1) + S1(c0); +for (int c0 = max(m, p); c0 <= min(n, q); c0 += 1) { + S1(c0); + S2(c0); } +for (int c0 = max(max(m, n + 1), p); c0 <= q; c0 += 1) + S2(c0); +for (int c0 = max(max(m, p), q + 1); c0 <= n; c0 += 1) + S1(c0); diff --git a/test_inputs/codegen/cloog/block.c b/test_inputs/codegen/cloog/block.c index e24ef30a..9aadfdfb 100644 --- a/test_inputs/codegen/cloog/block.c +++ b/test_inputs/codegen/cloog/block.c @@ -1,6 +1,4 @@ -{ - S1(); - S3(0); - S2(); - S3(1); -} +S1(); +S3(0); +S2(); +S3(1); diff --git a/test_inputs/codegen/cloog/block3.c b/test_inputs/codegen/cloog/block3.c index ff4d5539..98ccf57e 100644 --- a/test_inputs/codegen/cloog/block3.c +++ b/test_inputs/codegen/cloog/block3.c @@ -1,6 +1,4 @@ -{ - S1(); - for (int c0 = 0; c0 <= 1; c0 += 1) - S3(c0); - S2(); -} +S1(); +for (int c0 = 0; c0 <= 1; c0 += 1) + S3(c0); +S2(); diff --git a/test_inputs/codegen/cloog/byu98-1-2-3.c b/test_inputs/codegen/cloog/byu98-1-2-3.c dissimilarity index 98% index fad89a9e..c94f848f 100644 --- a/test_inputs/codegen/cloog/byu98-1-2-3.c +++ b/test_inputs/codegen/cloog/byu98-1-2-3.c @@ -1,18 +1,16 @@ -{ - for (int c0 = 2; c0 <= 3; c0 += 1) - for (int c1 = -c0 + 6; c1 <= 6; c1 += 1) - S1(c0, c1); - for (int c0 = 4; c0 <= 8; c0 += 1) { - if (c0 == 4) - for (int c1 = 3; c1 <= 4; c1 += 1) - S1(4, c1); - if (c0 <= 5) { - S1(c0, -c0 + 9); - S2(c0, -c0 + 9); - } else { - S2(c0, -c0 + 9); - } - for (int c1 = max(c0 - 1, -c0 + 10); c1 <= 6; c1 += 1) - S1(c0, c1); - } -} +for (int c0 = 2; c0 <= 3; c0 += 1) + for (int c1 = -c0 + 6; c1 <= 6; c1 += 1) + S1(c0, c1); +for (int c0 = 4; c0 <= 8; c0 += 1) { + if (c0 == 4) + for (int c1 = 3; c1 <= 4; c1 += 1) + S1(4, c1); + if (c0 <= 5) { + S1(c0, -c0 + 9); + S2(c0, -c0 + 9); + } else { + S2(c0, -c0 + 9); + } + for (int c1 = max(c0 - 1, -c0 + 10); c1 <= 6; c1 += 1) + S1(c0, c1); +} diff --git a/test_inputs/codegen/cloog/cholesky2.c b/test_inputs/codegen/cloog/cholesky2.c dissimilarity index 98% index 7834ff49..2b0cb6e5 100644 --- a/test_inputs/codegen/cloog/cholesky2.c +++ b/test_inputs/codegen/cloog/cholesky2.c @@ -1,17 +1,15 @@ -{ - for (int c1 = 1; c1 <= M; c1 += 1) { - S1(c1); - for (int c2 = c1 + 1; c2 <= M; c2 += 1) - S4(c1, c2); - } - for (int c0 = 1; c0 < 3 * M - 1; c0 += 3) { - S3((c0 + 2) / 3); - for (int c1 = (c0 + 5) / 3; c1 <= M; c1 += 1) { - S6((c0 + 2) / 3, c1); - for (int c4 = (c0 + 5) / 3; c4 < c1; c4 += 1) - S5(c4, c1, (c0 + 2) / 3); - } - for (int c1 = (c0 + 5) / 3; c1 <= M; c1 += 1) - S2(c1, (c0 + 2) / 3); - } -} +for (int c1 = 1; c1 <= M; c1 += 1) { + S1(c1); + for (int c2 = c1 + 1; c2 <= M; c2 += 1) + S4(c1, c2); +} +for (int c0 = 1; c0 < 3 * M - 1; c0 += 3) { + S3((c0 + 2) / 3); + for (int c1 = (c0 + 5) / 3; c1 <= M; c1 += 1) { + S6((c0 + 2) / 3, c1); + for (int c4 = (c0 + 5) / 3; c4 < c1; c4 += 1) + S5(c4, c1, (c0 + 2) / 3); + } + for (int c1 = (c0 + 5) / 3; c1 <= M; c1 += 1) + S2(c1, (c0 + 2) / 3); +} diff --git a/test_inputs/codegen/cloog/constant.c b/test_inputs/codegen/cloog/constant.c index f39a3a2b..a32c7e79 100644 --- a/test_inputs/codegen/cloog/constant.c +++ b/test_inputs/codegen/cloog/constant.c @@ -1,18 +1,16 @@ -{ - for (int c1 = 0; c1 <= min(1023, M + 1024); c1 += 1) { - S1(c1); - S3(c1); - } - for (int c1 = max(0, M + 1025); c1 <= 1023; c1 += 1) { - S2(c1); - S3(c1); - } - for (int c0 = 0; c0 <= min(1023, M + 1024); c0 += 1) { - S4(c0); - S6(c0); - } - for (int c0 = max(0, M + 1025); c0 <= 1023; c0 += 1) { - S5(c0); - S6(c0); - } +for (int c1 = 0; c1 <= min(1023, M + 1024); c1 += 1) { + S1(c1); + S3(c1); +} +for (int c1 = max(0, M + 1025); c1 <= 1023; c1 += 1) { + S2(c1); + S3(c1); +} +for (int c0 = 0; c0 <= min(1023, M + 1024); c0 += 1) { + S4(c0); + S6(c0); +} +for (int c0 = max(0, M + 1025); c0 <= 1023; c0 += 1) { + S5(c0); + S6(c0); } diff --git a/test_inputs/codegen/cloog/dealII.c b/test_inputs/codegen/cloog/dealII.c dissimilarity index 99% index 99ac53ee..1283f67f 100644 --- a/test_inputs/codegen/cloog/dealII.c +++ b/test_inputs/codegen/cloog/dealII.c @@ -1,18 +1,16 @@ -{ - for (int c0 = 0; c0 <= min(min(T_2 - 1, T_67 - 1), T_66); c0 += 1) { - S1(c0); - S2(c0); - } - for (int c0 = max(0, T_66 + 1); c0 < min(T_2, T_67); c0 += 1) - S1(c0); - for (int c0 = T_67; c0 <= min(T_2 - 1, T_66); c0 += 1) { - S1(c0); - S2(c0); - } - for (int c0 = max(T_67, T_66 + 1); c0 < T_2; c0 += 1) - S1(c0); - for (int c0 = T_2; c0 <= min(T_67 - 1, T_66); c0 += 1) - S2(c0); - if (T_2 == 0 && T_67 == 0) - S1(0); -} +for (int c0 = 0; c0 <= min(min(T_2 - 1, T_67 - 1), T_66); c0 += 1) { + S1(c0); + S2(c0); +} +for (int c0 = max(0, T_66 + 1); c0 < min(T_2, T_67); c0 += 1) + S1(c0); +for (int c0 = T_67; c0 <= min(T_2 - 1, T_66); c0 += 1) { + S1(c0); + S2(c0); +} +for (int c0 = max(T_67, T_66 + 1); c0 < T_2; c0 += 1) + S1(c0); +for (int c0 = T_2; c0 <= min(T_67 - 1, T_66); c0 += 1) + S2(c0); +if (T_2 == 0 && T_67 == 0) + S1(0); diff --git a/test_inputs/codegen/cloog/dot.c b/test_inputs/codegen/cloog/dot.c index b08de331..f9c115ff 100644 --- a/test_inputs/codegen/cloog/dot.c +++ b/test_inputs/codegen/cloog/dot.c @@ -1,7 +1,5 @@ -{ +for (int c1 = 1; c1 <= M; c1 += 1) + S1(0, c1); +for (int c0 = 1; c0 <= N; c0 += 1) for (int c1 = 1; c1 <= M; c1 += 1) - S1(0, c1); - for (int c0 = 1; c0 <= N; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S2(c0, c1); -} + S2(c0, c1); diff --git a/test_inputs/codegen/cloog/dot2.c b/test_inputs/codegen/cloog/dot2.c index 1990d269..18f4ec85 100644 --- a/test_inputs/codegen/cloog/dot2.c +++ b/test_inputs/codegen/cloog/dot2.c @@ -1,12 +1,10 @@ -{ - for (int c0 = 1; c0 <= min(M, N); c0 += 1) { - S1(c0); - for (int c1 = 1; c1 <= M; c1 += 1) - S2(c0, c1); - } - for (int c0 = M + 1; c0 <= N; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S2(c0, c1); - for (int c0 = N + 1; c0 <= M; c0 += 1) - S1(c0); +for (int c0 = 1; c0 <= min(M, N); c0 += 1) { + S1(c0); + for (int c1 = 1; c1 <= M; c1 += 1) + S2(c0, c1); } +for (int c0 = M + 1; c0 <= N; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S2(c0, c1); +for (int c0 = N + 1; c0 <= M; c0 += 1) + S1(c0); diff --git a/test_inputs/codegen/cloog/durbin_e_s.c b/test_inputs/codegen/cloog/durbin_e_s.c dissimilarity index 99% index 25590998..626015d3 100644 --- a/test_inputs/codegen/cloog/durbin_e_s.c +++ b/test_inputs/codegen/cloog/durbin_e_s.c @@ -1,23 +1,21 @@ -{ - S4(1, 0, 0); - S7(1, 0, 0); - S8(1, 0, 3); - for (int c0 = 2; c0 <= 9; c0 += 1) { - S2(c0, -7, 0); - for (int c1 = -7; c1 < c0 - 8; c1 += 1) - S3(c0, c1, 1); - S6(c0, c0 - 9, 2); - S8(c0, 0, 3); - for (int c1 = 1; c1 < c0; c1 += 1) - S5(c0, c1, 3); - } - S2(10, -7, 0); - for (int c1 = -7; c1 <= 1; c1 += 1) - S3(10, c1, 1); - S6(10, 1, 2); - for (int c1 = 1; c1 <= 9; c1 += 1) { - S5(10, c1, 3); - S1(10, c1, 4); - } - S1(10, 10, 4); -} +S4(1, 0, 0); +S7(1, 0, 0); +S8(1, 0, 3); +for (int c0 = 2; c0 <= 9; c0 += 1) { + S2(c0, -7, 0); + for (int c1 = -7; c1 < c0 - 8; c1 += 1) + S3(c0, c1, 1); + S6(c0, c0 - 9, 2); + S8(c0, 0, 3); + for (int c1 = 1; c1 < c0; c1 += 1) + S5(c0, c1, 3); +} +S2(10, -7, 0); +for (int c1 = -7; c1 <= 1; c1 += 1) + S3(10, c1, 1); +S6(10, 1, 2); +for (int c1 = 1; c1 <= 9; c1 += 1) { + S5(10, c1, 3); + S1(10, c1, 4); +} +S1(10, 10, 4); diff --git a/test_inputs/codegen/cloog/ex1.c b/test_inputs/codegen/cloog/ex1.c index 2627f23d..9f7aeae9 100644 --- a/test_inputs/codegen/cloog/ex1.c +++ b/test_inputs/codegen/cloog/ex1.c @@ -1,15 +1,13 @@ -{ - for (int c0 = 0; c0 <= 14; c0 += 1) - for (int c1 = 0; c1 < n - 14; c1 += 1) - S1(c0, c1); - for (int c0 = 15; c0 <= n; c0 += 1) { - for (int c1 = 0; c1 <= 9; c1 += 1) - S1(c0, c1); - for (int c1 = 10; c1 < n - 14; c1 += 1) { - S1(c0, c1); - S2(c0, c1); - } - for (int c1 = n - 14; c1 <= n; c1 += 1) - S2(c0, c1); +for (int c0 = 0; c0 <= 14; c0 += 1) + for (int c1 = 0; c1 < n - 14; c1 += 1) + S1(c0, c1); +for (int c0 = 15; c0 <= n; c0 += 1) { + for (int c1 = 0; c1 <= 9; c1 += 1) + S1(c0, c1); + for (int c1 = 10; c1 < n - 14; c1 += 1) { + S1(c0, c1); + S2(c0, c1); } + for (int c1 = n - 14; c1 <= n; c1 += 1) + S2(c0, c1); } diff --git a/test_inputs/codegen/cloog/faber.c b/test_inputs/codegen/cloog/faber.c dissimilarity index 98% index ac3017c3..958e48ca 100644 --- a/test_inputs/codegen/cloog/faber.c +++ b/test_inputs/codegen/cloog/faber.c @@ -1,149 +1,147 @@ -{ - for (int c0 = 0; c0 <= 36; c0 += 1) { - for (int c1 = -6; c1 < c0 / 14 - 5; c1 += 1) { - for (int c2 = -((-2 * c1 + 3) / 5) + 9; c2 <= c1 + 12; c2 += 1) - S6(c0, c1, c2); - for (int c2 = c1 + 24; c2 <= -2 * c1 + 24; c2 += 1) - S2(c0, c1, c2); - for (int c2 = -2 * c1 + 30; c2 <= c1 + 48; c2 += 1) - S1(c0, c1, c2); - } - for (int c1 = c0 / 14 - 5; c1 < 0; c1 += 1) { - if (c1 >= -3 && 2 * c0 >= 7 * c1 + 42) - S7(c0, c1, 6); - for (int c2 = max(c1 - (6 * c0 + 77) / 77 + 13, -((-2 * c1 + 3) / 5) + 9); c2 <= c1 + 12; c2 += 1) - S6(c0, c1, c2); - for (int c2 = c1 - (3 * c0 + 14) / 14 + 49; c2 <= c1 + 48; c2 += 1) - S1(c0, c1, c2); - } - S3(c0, 0, 0); - S10(c0, 0, 0); - for (int c2 = 1; c2 <= 5; c2 += 1) - S3(c0, 0, c2); - for (int c2 = 6; c2 <= 2 * c0 / 21 + 4; c2 += 1) { - S3(c0, 0, c2); - S7(c0, 0, c2); - } - for (int c2 = max(6, 2 * c0 / 21 + 5); c2 <= -((6 * c0 + 77) / 77) + 12; c2 += 1) - S3(c0, 0, c2); - for (int c2 = -((6 * c0 + 77) / 77) + 13; c2 <= 12; c2 += 1) { - S3(c0, 0, c2); - S6(c0, 0, c2); - } - for (int c2 = 13; c2 <= 24; c2 += 1) - S3(c0, 0, c2); - for (int c2 = -((3 * c0 + 14) / 14) + 49; c2 <= 48; c2 += 1) - S1(c0, 0, c2); - for (int c1 = 1; c1 <= 18; c1 += 1) { - for (int c2 = -8 * c1; c2 <= min(6, -8 * c1 + 24); c2 += 1) - S3(c0, c1, c2); - if (c1 == 2) { - S3(c0, 2, 7); - } else if (c0 <= 34 && c1 == 1) { - S3(c0, 1, 7); - } else if (c0 >= 35 && c1 == 1) { - S3(c0, 1, 7); - S7(c0, 1, 7); - } - for (int c2 = 8; c2 <= min(-8 * c1 + 24, c1 - (6 * c0 + 77) / 77 + 12); c2 += 1) - S3(c0, c1, c2); - for (int c2 = max(-8 * c1 + 25, c1 - (6 * c0 + 77) / 77 + 13); c2 <= c1 + 12; c2 += 1) - S6(c0, c1, c2); - if (c1 == 1) { - for (int c2 = -((6 * c0 + 77) / 77) + 14; c2 <= 13; c2 += 1) { - S3(c0, 1, c2); - S6(c0, 1, c2); - } - for (int c2 = 14; c2 <= 16; c2 += 1) - S3(c0, 1, c2); - } - for (int c2 = c1 - (3 * c0 + 14) / 14 + 49; c2 <= c1 + 48; c2 += 1) - S1(c0, c1, c2); - } - for (int c1 = 19; c1 <= 24; c1 += 1) { - for (int c2 = -8 * c1; c2 <= -8 * c1 + 24; c2 += 1) - S3(c0, c1, c2); - for (int c2 = c1 - (6 * c0 + 77) / 77 + 13; c2 <= 30; c2 += 1) - S6(c0, c1, c2); - } - } - for (int c0 = 37; c0 <= 218; c0 += 1) { - for (int c1 = (c0 + 5) / 14 - 8; c1 < min(0, c0 / 14 - 5); c1 += 1) { - if (c0 <= 46 && c1 == -3) - S7(c0, -3, 6); - if (77 * c1 + 77 * ((-2 * c1 - 2) / 5) + 524 >= 6 * c0) - S6(c0, c1, -((-2 * c1 + 3) / 5) + 9); - for (int c2 = c1 + 24; c2 <= -2 * c1 + 24; c2 += 1) - S2(c0, c1, c2); - for (int c2 = -2 * c1 + 30; c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) - S1(c0, c1, c2); - } - for (int c1 = c0 / 14 - 5; c1 < 0; c1 += 1) { - if (7 * c1 + 114 >= 2 * c0) - S7(c0, c1, 6); - for (int c2 = max(8, c1 - (6 * c0 + 77) / 77 + 13); c2 <= c1 - (6 * c0 + 91) / 77 + 15; c2 += 1) - S6(c0, c1, c2); - for (int c2 = c1 - (3 * c0 + 14) / 14 + 49; c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) - S1(c0, c1, c2); - } - if (c0 <= 148) - for (int c1 = max(0, (c0 + 5) / 14 - 8); c1 < c0 / 14 - 5; c1 += 1) { - if (c1 == 0) - S2(c0, 0, 24); - for (int c2 = max(c1 + 24, -2 * c1 + 30); c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) - S1(c0, c1, c2); - } - if (c0 >= 70 && c0 % 14 >= 9) - for (int c2 = max((c0 + 5) / 14 + 18, -((3 * c0 + 14) / 14) + c0 / 14 + 44); c2 <= -((3 * c0 + 17) / 14) + c0 / 14 + 51; c2 += 1) - S1(c0, c0 / 14 - 5, c2); - for (int c1 = max(0, (c0 + 5) / 14 - 5); c1 < c0 / 14 - 2; c1 += 1) { - for (int c2 = max(c1, -2 * c1 + 6); c2 <= min(c1 + 5, -2 * c1 + 24); c2 += 1) - S9(c0, c1, c2); - for (int c2 = c1 + 6; c2 <= min((2 * c1 + 1) / 5 + 7, (2 * c0 - 7 * c1 - 10) / 21 + 1); c2 += 1) - S9(c0, c1, c2); - for (int c2 = max(c1 + 6, (2 * c0 - 7 * c1 - 10) / 21 + 2); c2 <= (2 * c1 + 1) / 5 + 7; c2 += 1) { - S7(c0, c1, c2); - S9(c0, c1, c2); - } - if (c1 <= 3) - S9(c0, c1, (2 * c1 + 1) / 5 + 8); - for (int c2 = (2 * c1 + 1) / 5 + 9; c2 <= c1 - (6 * c0 + 91) / 77 + 15; c2 += 1) { - S6(c0, c1, c2); - S9(c0, c1, c2); - } - for (int c2 = max(max(c1 + 6, c1 - (6 * c0 + 91) / 77 + 16), (2 * c1 + 1) / 5 + 9); c2 <= -2 * c1 + 24; c2 += 1) - S9(c0, c1, c2); - for (int c2 = max(c1, -2 * c1 + 30); c2 <= min(c1 + 24, c1 - (3 * c0 + 17) / 14 + 47); c2 += 1) - S8(c0, c1, c2); - for (int c2 = max(c1 + 24, c1 - (3 * c0 + 14) / 14 + 49); c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) - S1(c0, c1, c2); - } - for (int c1 = c0 / 14 - 2; c1 <= 18; c1 += 1) { - for (int c2 = max(6, (c0 + 5) / 14 + 1); c2 <= min(min(c1, c0 / 14 + 3), -c1 + c1 / 2 + 18); c2 += 1) - S5(c0, c1, c2); - for (int c2 = max(c1 + (3 * c0 + 3) / 14 - 40, -c1 + (c1 + 1) / 2 + 21); c2 <= min(c1, c1 + 3 * c0 / 14 - 33); c2 += 1) - S4(c0, c1, c2); - for (int c2 = c1 + 6; c2 <= min((2 * c1 + 1) / 5 + 7, (2 * c0 - 7 * c1 + 63) / 21 + 1); c2 += 1) - S7(c0, c1, c2); - for (int c2 = max(max(c1 + 6, c1 - (6 * c0 + 77) / 77 + 13), (2 * c1 + 1) / 5 + 9); c2 <= c1 - (6 * c0 + 91) / 77 + 15; c2 += 1) - S6(c0, c1, c2); - for (int c2 = max(c1, c1 - (3 * c0 + 14) / 14 + 40); c2 <= min(c1 + 24, c1 - (3 * c0 + 17) / 14 + 47); c2 += 1) - S8(c0, c1, c2); - for (int c2 = max(c1 + 24, c1 - (3 * c0 + 14) / 14 + 49); c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) - S1(c0, c1, c2); - } - for (int c1 = 19; c1 <= 24; c1 += 1) { - for (int c2 = max(c1 - 12, (c0 + 5) / 14 + 1); c2 <= min(c0 / 14 + 3, -c1 + c1 / 2 + 18); c2 += 1) - S5(c0, c1, c2); - for (int c2 = max(max(c1 - 12, c1 + (3 * c0 + 3) / 14 - 40), -c1 + (c1 + 1) / 2 + 21); c2 <= min(c1, c1 + 3 * c0 / 14 - 33); c2 += 1) - S4(c0, c1, c2); - for (int c2 = max(c1 + 6, c1 - (6 * c0 + 77) / 77 + 13); c2 <= min(30, c1 - (6 * c0 + 91) / 77 + 15); c2 += 1) - S6(c0, c1, c2); - for (int c2 = max(c1, c1 - (3 * c0 + 14) / 14 + 40); c2 <= min(c1 + 24, c1 - (3 * c0 + 17) / 14 + 47); c2 += 1) - S8(c0, c1, c2); - } - for (int c1 = 25; c1 <= min(42, -((3 * c0 + 17) / 14) + 71); c1 += 1) - for (int c2 = max(c1 - 12, c1 + (3 * c0 + 3) / 14 - 40); c2 <= min(min(30, c1), c1 + 3 * c0 / 14 - 33); c2 += 1) - S4(c0, c1, c2); - } -} +for (int c0 = 0; c0 <= 36; c0 += 1) { + for (int c1 = -6; c1 < c0 / 14 - 5; c1 += 1) { + for (int c2 = -((-2 * c1 + 3) / 5) + 9; c2 <= c1 + 12; c2 += 1) + S6(c0, c1, c2); + for (int c2 = c1 + 24; c2 <= -2 * c1 + 24; c2 += 1) + S2(c0, c1, c2); + for (int c2 = -2 * c1 + 30; c2 <= c1 + 48; c2 += 1) + S1(c0, c1, c2); + } + for (int c1 = c0 / 14 - 5; c1 < 0; c1 += 1) { + if (c1 >= -3 && 2 * c0 >= 7 * c1 + 42) + S7(c0, c1, 6); + for (int c2 = max(c1 - (6 * c0 + 77) / 77 + 13, -((-2 * c1 + 3) / 5) + 9); c2 <= c1 + 12; c2 += 1) + S6(c0, c1, c2); + for (int c2 = c1 - (3 * c0 + 14) / 14 + 49; c2 <= c1 + 48; c2 += 1) + S1(c0, c1, c2); + } + S3(c0, 0, 0); + S10(c0, 0, 0); + for (int c2 = 1; c2 <= 5; c2 += 1) + S3(c0, 0, c2); + for (int c2 = 6; c2 <= 2 * c0 / 21 + 4; c2 += 1) { + S3(c0, 0, c2); + S7(c0, 0, c2); + } + for (int c2 = max(6, 2 * c0 / 21 + 5); c2 <= -((6 * c0 + 77) / 77) + 12; c2 += 1) + S3(c0, 0, c2); + for (int c2 = -((6 * c0 + 77) / 77) + 13; c2 <= 12; c2 += 1) { + S3(c0, 0, c2); + S6(c0, 0, c2); + } + for (int c2 = 13; c2 <= 24; c2 += 1) + S3(c0, 0, c2); + for (int c2 = -((3 * c0 + 14) / 14) + 49; c2 <= 48; c2 += 1) + S1(c0, 0, c2); + for (int c1 = 1; c1 <= 18; c1 += 1) { + for (int c2 = -8 * c1; c2 <= min(6, -8 * c1 + 24); c2 += 1) + S3(c0, c1, c2); + if (c1 == 2) { + S3(c0, 2, 7); + } else if (c0 <= 34 && c1 == 1) { + S3(c0, 1, 7); + } else if (c0 >= 35 && c1 == 1) { + S3(c0, 1, 7); + S7(c0, 1, 7); + } + for (int c2 = 8; c2 <= min(-8 * c1 + 24, c1 - (6 * c0 + 77) / 77 + 12); c2 += 1) + S3(c0, c1, c2); + for (int c2 = max(-8 * c1 + 25, c1 - (6 * c0 + 77) / 77 + 13); c2 <= c1 + 12; c2 += 1) + S6(c0, c1, c2); + if (c1 == 1) { + for (int c2 = -((6 * c0 + 77) / 77) + 14; c2 <= 13; c2 += 1) { + S3(c0, 1, c2); + S6(c0, 1, c2); + } + for (int c2 = 14; c2 <= 16; c2 += 1) + S3(c0, 1, c2); + } + for (int c2 = c1 - (3 * c0 + 14) / 14 + 49; c2 <= c1 + 48; c2 += 1) + S1(c0, c1, c2); + } + for (int c1 = 19; c1 <= 24; c1 += 1) { + for (int c2 = -8 * c1; c2 <= -8 * c1 + 24; c2 += 1) + S3(c0, c1, c2); + for (int c2 = c1 - (6 * c0 + 77) / 77 + 13; c2 <= 30; c2 += 1) + S6(c0, c1, c2); + } +} +for (int c0 = 37; c0 <= 218; c0 += 1) { + for (int c1 = (c0 + 5) / 14 - 8; c1 < min(0, c0 / 14 - 5); c1 += 1) { + if (c0 <= 46 && c1 == -3) + S7(c0, -3, 6); + if (77 * c1 + 77 * ((-2 * c1 - 2) / 5) + 524 >= 6 * c0) + S6(c0, c1, -((-2 * c1 + 3) / 5) + 9); + for (int c2 = c1 + 24; c2 <= -2 * c1 + 24; c2 += 1) + S2(c0, c1, c2); + for (int c2 = -2 * c1 + 30; c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) + S1(c0, c1, c2); + } + for (int c1 = c0 / 14 - 5; c1 < 0; c1 += 1) { + if (7 * c1 + 114 >= 2 * c0) + S7(c0, c1, 6); + for (int c2 = max(8, c1 - (6 * c0 + 77) / 77 + 13); c2 <= c1 - (6 * c0 + 91) / 77 + 15; c2 += 1) + S6(c0, c1, c2); + for (int c2 = c1 - (3 * c0 + 14) / 14 + 49; c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) + S1(c0, c1, c2); + } + if (c0 <= 148) + for (int c1 = max(0, (c0 + 5) / 14 - 8); c1 < c0 / 14 - 5; c1 += 1) { + if (c1 == 0) + S2(c0, 0, 24); + for (int c2 = max(c1 + 24, -2 * c1 + 30); c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) + S1(c0, c1, c2); + } + if (c0 >= 70 && c0 % 14 >= 9) + for (int c2 = max((c0 + 5) / 14 + 18, -((3 * c0 + 14) / 14) + c0 / 14 + 44); c2 <= -((3 * c0 + 17) / 14) + c0 / 14 + 51; c2 += 1) + S1(c0, c0 / 14 - 5, c2); + for (int c1 = max(0, (c0 + 5) / 14 - 5); c1 < c0 / 14 - 2; c1 += 1) { + for (int c2 = max(c1, -2 * c1 + 6); c2 <= min(c1 + 5, -2 * c1 + 24); c2 += 1) + S9(c0, c1, c2); + for (int c2 = c1 + 6; c2 <= min((2 * c1 + 1) / 5 + 7, (2 * c0 - 7 * c1 - 10) / 21 + 1); c2 += 1) + S9(c0, c1, c2); + for (int c2 = max(c1 + 6, (2 * c0 - 7 * c1 - 10) / 21 + 2); c2 <= (2 * c1 + 1) / 5 + 7; c2 += 1) { + S7(c0, c1, c2); + S9(c0, c1, c2); + } + if (c1 <= 3) + S9(c0, c1, (2 * c1 + 1) / 5 + 8); + for (int c2 = (2 * c1 + 1) / 5 + 9; c2 <= c1 - (6 * c0 + 91) / 77 + 15; c2 += 1) { + S6(c0, c1, c2); + S9(c0, c1, c2); + } + for (int c2 = max(max(c1 + 6, c1 - (6 * c0 + 91) / 77 + 16), (2 * c1 + 1) / 5 + 9); c2 <= -2 * c1 + 24; c2 += 1) + S9(c0, c1, c2); + for (int c2 = max(c1, -2 * c1 + 30); c2 <= min(c1 + 24, c1 - (3 * c0 + 17) / 14 + 47); c2 += 1) + S8(c0, c1, c2); + for (int c2 = max(c1 + 24, c1 - (3 * c0 + 14) / 14 + 49); c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) + S1(c0, c1, c2); + } + for (int c1 = c0 / 14 - 2; c1 <= 18; c1 += 1) { + for (int c2 = max(6, (c0 + 5) / 14 + 1); c2 <= min(min(c1, c0 / 14 + 3), -c1 + c1 / 2 + 18); c2 += 1) + S5(c0, c1, c2); + for (int c2 = max(c1 + (3 * c0 + 3) / 14 - 40, -c1 + (c1 + 1) / 2 + 21); c2 <= min(c1, c1 + 3 * c0 / 14 - 33); c2 += 1) + S4(c0, c1, c2); + for (int c2 = c1 + 6; c2 <= min((2 * c1 + 1) / 5 + 7, (2 * c0 - 7 * c1 + 63) / 21 + 1); c2 += 1) + S7(c0, c1, c2); + for (int c2 = max(max(c1 + 6, c1 - (6 * c0 + 77) / 77 + 13), (2 * c1 + 1) / 5 + 9); c2 <= c1 - (6 * c0 + 91) / 77 + 15; c2 += 1) + S6(c0, c1, c2); + for (int c2 = max(c1, c1 - (3 * c0 + 14) / 14 + 40); c2 <= min(c1 + 24, c1 - (3 * c0 + 17) / 14 + 47); c2 += 1) + S8(c0, c1, c2); + for (int c2 = max(c1 + 24, c1 - (3 * c0 + 14) / 14 + 49); c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1) + S1(c0, c1, c2); + } + for (int c1 = 19; c1 <= 24; c1 += 1) { + for (int c2 = max(c1 - 12, (c0 + 5) / 14 + 1); c2 <= min(c0 / 14 + 3, -c1 + c1 / 2 + 18); c2 += 1) + S5(c0, c1, c2); + for (int c2 = max(max(c1 - 12, c1 + (3 * c0 + 3) / 14 - 40), -c1 + (c1 + 1) / 2 + 21); c2 <= min(c1, c1 + 3 * c0 / 14 - 33); c2 += 1) + S4(c0, c1, c2); + for (int c2 = max(c1 + 6, c1 - (6 * c0 + 77) / 77 + 13); c2 <= min(30, c1 - (6 * c0 + 91) / 77 + 15); c2 += 1) + S6(c0, c1, c2); + for (int c2 = max(c1, c1 - (3 * c0 + 14) / 14 + 40); c2 <= min(c1 + 24, c1 - (3 * c0 + 17) / 14 + 47); c2 += 1) + S8(c0, c1, c2); + } + for (int c1 = 25; c1 <= min(42, -((3 * c0 + 17) / 14) + 71); c1 += 1) + for (int c2 = max(c1 - 12, c1 + (3 * c0 + 3) / 14 - 40); c2 <= min(min(30, c1), c1 + 3 * c0 / 14 - 33); c2 += 1) + S4(c0, c1, c2); +} diff --git a/test_inputs/codegen/cloog/forwardsub-1-1-2.c b/test_inputs/codegen/cloog/forwardsub-1-1-2.c index 45fe75ef..f3fa9f8a 100644 --- a/test_inputs/codegen/cloog/forwardsub-1-1-2.c +++ b/test_inputs/codegen/cloog/forwardsub-1-1-2.c @@ -1,9 +1,7 @@ -{ - S3(1, 1); - for (int c0 = 2; c0 <= M; c0 += 1) { - S1(c0, 1); - for (int c1 = 2; c1 < c0; c1 += 1) - S2(c0, c1); - S4(c0, c0); - } +S3(1, 1); +for (int c0 = 2; c0 <= M; c0 += 1) { + S1(c0, 1); + for (int c1 = 2; c1 < c0; c1 += 1) + S2(c0, c1); + S4(c0, c0); } diff --git a/test_inputs/codegen/cloog/forwardsub-2-1-2-3.c b/test_inputs/codegen/cloog/forwardsub-2-1-2-3.c index cfc3e7d7..d6ee40e5 100644 --- a/test_inputs/codegen/cloog/forwardsub-2-1-2-3.c +++ b/test_inputs/codegen/cloog/forwardsub-2-1-2-3.c @@ -1,10 +1,8 @@ -{ - S3(1, 0); - for (int c2 = 2; c2 <= M; c2 += 1) - S1(1, 1, c2); - for (int c0 = 2; c0 <= M; c0 += 1) { - S4(c0, 0); - for (int c2 = c0 + 1; c2 <= M; c2 += 1) - S2(c0, 1, c2); - } +S3(1, 0); +for (int c2 = 2; c2 <= M; c2 += 1) + S1(1, 1, c2); +for (int c0 = 2; c0 <= M; c0 += 1) { + S4(c0, 0); + for (int c2 = c0 + 1; c2 <= M; c2 += 1) + S2(c0, 1, c2); } diff --git a/test_inputs/codegen/cloog/forwardsub-3-1-2.c b/test_inputs/codegen/cloog/forwardsub-3-1-2.c index 9300d189..898f6de4 100644 --- a/test_inputs/codegen/cloog/forwardsub-3-1-2.c +++ b/test_inputs/codegen/cloog/forwardsub-3-1-2.c @@ -1,17 +1,15 @@ -{ - S3(2, 1); - S1(3, 1); - for (int c0 = 4; c0 <= M + 1; c0 += 1) { - S1(c0, 1); - for (int c1 = 2; c1 < (c0 + 1) / 2; c1 += 1) - S2(c0, c1); - if (c0 % 2 == 0) - S4(c0, c0 / 2); - } - for (int c0 = M + 2; c0 <= 2 * M; c0 += 1) { - for (int c1 = -M + c0; c1 < (c0 + 1) / 2; c1 += 1) - S2(c0, c1); - if (c0 % 2 == 0) - S4(c0, c0 / 2); - } +S3(2, 1); +S1(3, 1); +for (int c0 = 4; c0 <= M + 1; c0 += 1) { + S1(c0, 1); + for (int c1 = 2; c1 < (c0 + 1) / 2; c1 += 1) + S2(c0, c1); + if (c0 % 2 == 0) + S4(c0, c0 / 2); +} +for (int c0 = M + 2; c0 <= 2 * M; c0 += 1) { + for (int c1 = -M + c0; c1 < (c0 + 1) / 2; c1 += 1) + S2(c0, c1); + if (c0 % 2 == 0) + S4(c0, c0 / 2); } diff --git a/test_inputs/codegen/cloog/gesced.c b/test_inputs/codegen/cloog/gesced.c dissimilarity index 99% index 40cdad98..06f94f63 100644 --- a/test_inputs/codegen/cloog/gesced.c +++ b/test_inputs/codegen/cloog/gesced.c @@ -1,16 +1,14 @@ -{ - for (int c0 = 1; c0 <= N; c0 += 1) - S1(c0); - for (int c0 = N + 1; c0 <= 2 * N; c0 += 1) - for (int c1 = 1; c1 <= N; c1 += 1) - S2(c1, -N + c0); - for (int c0 = 2 * N + 1; c0 <= M + N; c0 += 1) { - for (int c1 = 1; c1 <= N; c1 += 1) - S2(c1, -N + c0); - for (int c1 = 1; c1 <= N; c1 += 1) - S3(c1, -2 * N + c0); - } - for (int c0 = M + N + 1; c0 <= M + 2 * N; c0 += 1) - for (int c1 = 1; c1 <= N; c1 += 1) - S3(c1, -2 * N + c0); -} +for (int c0 = 1; c0 <= N; c0 += 1) + S1(c0); +for (int c0 = N + 1; c0 <= 2 * N; c0 += 1) + for (int c1 = 1; c1 <= N; c1 += 1) + S2(c1, -N + c0); +for (int c0 = 2 * N + 1; c0 <= M + N; c0 += 1) { + for (int c1 = 1; c1 <= N; c1 += 1) + S2(c1, -N + c0); + for (int c1 = 1; c1 <= N; c1 += 1) + S3(c1, -2 * N + c0); +} +for (int c0 = M + N + 1; c0 <= M + 2 * N; c0 += 1) + for (int c1 = 1; c1 <= N; c1 += 1) + S3(c1, -2 * N + c0); diff --git a/test_inputs/codegen/cloog/gesced2.c b/test_inputs/codegen/cloog/gesced2.c dissimilarity index 98% index eeba38e3..fea43075 100644 --- a/test_inputs/codegen/cloog/gesced2.c +++ b/test_inputs/codegen/cloog/gesced2.c @@ -1,20 +1,18 @@ -{ - for (int c0 = 1; c0 <= 4; c0 += 1) - for (int c1 = 5; c1 < M - 9; c1 += 1) - S1(c0, c1); - for (int c0 = 5; c0 < M - 9; c0 += 1) { - for (int c1 = -c0 + 1; c1 <= 4; c1 += 1) - S2(c0 + c1, c0); - for (int c1 = 5; c1 <= min(M - 10, M - c0); c1 += 1) { - S2(c0 + c1, c0); - S1(c0, c1); - } - for (int c1 = M - c0 + 1; c1 < M - 9; c1 += 1) - S1(c0, c1); - for (int c1 = M - 9; c1 <= M - c0; c1 += 1) - S2(c0 + c1, c0); - } - for (int c0 = M - 9; c0 <= M; c0 += 1) - for (int c1 = 5; c1 < M - 9; c1 += 1) - S1(c0, c1); -} +for (int c0 = 1; c0 <= 4; c0 += 1) + for (int c1 = 5; c1 < M - 9; c1 += 1) + S1(c0, c1); +for (int c0 = 5; c0 < M - 9; c0 += 1) { + for (int c1 = -c0 + 1; c1 <= 4; c1 += 1) + S2(c0 + c1, c0); + for (int c1 = 5; c1 <= min(M - 10, M - c0); c1 += 1) { + S2(c0 + c1, c0); + S1(c0, c1); + } + for (int c1 = M - c0 + 1; c1 < M - 9; c1 += 1) + S1(c0, c1); + for (int c1 = M - 9; c1 <= M - c0; c1 += 1) + S2(c0 + c1, c0); +} +for (int c0 = M - 9; c0 <= M; c0 += 1) + for (int c1 = 5; c1 < M - 9; c1 += 1) + S1(c0, c1); diff --git a/test_inputs/codegen/cloog/gesced3.c b/test_inputs/codegen/cloog/gesced3.c index c163ed07..2419305d 100644 --- a/test_inputs/codegen/cloog/gesced3.c +++ b/test_inputs/codegen/cloog/gesced3.c @@ -1,10 +1,8 @@ -{ - for (int c0 = M + 1; c0 <= 2 * M; c0 += 1) - S1(-M + c0); - for (int c0 = 2 * M + 1; c0 <= M + N; c0 += 1) { - S2(-2 * M + c0); - S1(-M + c0); - } - for (int c0 = M + N + 1; c0 <= 2 * M + N; c0 += 1) - S2(-2 * M + c0); +for (int c0 = M + 1; c0 <= 2 * M; c0 += 1) + S1(-M + c0); +for (int c0 = 2 * M + 1; c0 <= M + N; c0 += 1) { + S2(-2 * M + c0); + S1(-M + c0); } +for (int c0 = M + N + 1; c0 <= 2 * M + N; c0 += 1) + S2(-2 * M + c0); diff --git a/test_inputs/codegen/cloog/guide.c b/test_inputs/codegen/cloog/guide.c index bc48f1ef..688c7d6b 100644 --- a/test_inputs/codegen/cloog/guide.c +++ b/test_inputs/codegen/cloog/guide.c @@ -1,6 +1,4 @@ -{ - for (int c0 = 1; c0 <= N; c0 += 1) - S1(c0); - for (int c0 = N + 1; c0 <= 2 * N; c0 += 1) - S2(c0); -} +for (int c0 = 1; c0 <= N; c0 += 1) + S1(c0); +for (int c0 = N + 1; c0 <= 2 * N; c0 += 1) + S2(c0); diff --git a/test_inputs/codegen/cloog/infinite2.c b/test_inputs/codegen/cloog/infinite2.c index bbb6d6e7..8850909a 100644 --- a/test_inputs/codegen/cloog/infinite2.c +++ b/test_inputs/codegen/cloog/infinite2.c @@ -1,9 +1,7 @@ -{ - for (int c0 = 1; c0 <= N; c0 += 1) { - S1(c0); - for (int c1 = 1; c1 <= M; c1 += 1) - S2(c0, c1); - } - for (int c0 = N + 1; 1; c0 += 1) - S1(c0); +for (int c0 = 1; c0 <= N; c0 += 1) { + S1(c0); + for (int c1 = 1; c1 <= M; c1 += 1) + S2(c0, c1); } +for (int c0 = N + 1; 1; c0 += 1) + S1(c0); diff --git a/test_inputs/codegen/cloog/levenshtein-1-2-3.c b/test_inputs/codegen/cloog/levenshtein-1-2-3.c dissimilarity index 98% index 70d1ea5c..0b645877 100644 --- a/test_inputs/codegen/cloog/levenshtein-1-2-3.c +++ b/test_inputs/codegen/cloog/levenshtein-1-2-3.c @@ -1,32 +1,30 @@ -{ - S1(0, 0); - for (int c0 = 1; c0 <= N; c0 += 1) { - S2(c0, 0); - for (int c1 = 1; c1 < c0; c1 += 1) - S6(c0, c1); - S3(c0, c0); - } - S7(N + 1, 0); - for (int c1 = 1; c1 <= N; c1 += 1) { - S6(N + 1, c1); - S8(N + 1, c1); - } - for (int c0 = N + 2; c0 < 2 * M - N - 1; c0 += 1) { - S7(c0, -N + (N + c0 + 1) / 2 - 1); - if ((N + c0) % 2 == 0) { - S5(c0, (-N + c0) / 2); - S8(c0, (-N + c0) / 2); - } - for (int c1 = -N + (N + c0) / 2 + 1; c1 < (N + c0 + 1) / 2; c1 += 1) { - S6(c0, c1); - S8(c0, c1); - } - if ((N + c0) % 2 == 0) { - S4(c0, (N + c0) / 2); - S8(c0, (N + c0) / 2); - } - } - for (int c0 = 2 * M - N - 1; c0 < 2 * M - 1; c0 += 1) - for (int c1 = -M + c0 + 1; c1 < M; c1 += 1) - S6(c0, c1); -} +S1(0, 0); +for (int c0 = 1; c0 <= N; c0 += 1) { + S2(c0, 0); + for (int c1 = 1; c1 < c0; c1 += 1) + S6(c0, c1); + S3(c0, c0); +} +S7(N + 1, 0); +for (int c1 = 1; c1 <= N; c1 += 1) { + S6(N + 1, c1); + S8(N + 1, c1); +} +for (int c0 = N + 2; c0 < 2 * M - N - 1; c0 += 1) { + S7(c0, -N + (N + c0 + 1) / 2 - 1); + if ((N + c0) % 2 == 0) { + S5(c0, (-N + c0) / 2); + S8(c0, (-N + c0) / 2); + } + for (int c1 = -N + (N + c0) / 2 + 1; c1 < (N + c0 + 1) / 2; c1 += 1) { + S6(c0, c1); + S8(c0, c1); + } + if ((N + c0) % 2 == 0) { + S4(c0, (N + c0) / 2); + S8(c0, (N + c0) / 2); + } +} +for (int c0 = 2 * M - N - 1; c0 < 2 * M - 1; c0 += 1) + for (int c1 = -M + c0 + 1; c1 < M; c1 += 1) + S6(c0, c1); diff --git a/test_inputs/codegen/cloog/logo.c b/test_inputs/codegen/cloog/logo.c dissimilarity index 98% index abe35b59..84e4a523 100644 --- a/test_inputs/codegen/cloog/logo.c +++ b/test_inputs/codegen/cloog/logo.c @@ -1,17 +1,15 @@ -{ - for (int c1 = 0; c1 <= 7; c1 += 1) - S1(1, c1); - for (int c0 = 2; c0 <= 6; c0 += 1) { - for (int c1 = 0; c1 < c0 - 1; c1 += 1) - S2(c0, c1); - for (int c1 = c0 - 1; c1 <= 4; c1 += 1) { - S1(c0, c1); - S2(c0, c1); - } - for (int c1 = 5; c1 <= 7; c1 += 1) - S1(c0, c1); - } - for (int c0 = 7; c0 <= 8; c0 += 1) - for (int c1 = c0 - 1; c1 <= 7; c1 += 1) - S1(c0, c1); -} +for (int c1 = 0; c1 <= 7; c1 += 1) + S1(1, c1); +for (int c0 = 2; c0 <= 6; c0 += 1) { + for (int c1 = 0; c1 < c0 - 1; c1 += 1) + S2(c0, c1); + for (int c1 = c0 - 1; c1 <= 4; c1 += 1) { + S1(c0, c1); + S2(c0, c1); + } + for (int c1 = 5; c1 <= 7; c1 += 1) + S1(c0, c1); +} +for (int c0 = 7; c0 <= 8; c0 += 1) + for (int c1 = c0 - 1; c1 <= 7; c1 += 1) + S1(c0, c1); diff --git a/test_inputs/codegen/cloog/logopar.c b/test_inputs/codegen/cloog/logopar.c dissimilarity index 89% index 70f98e8c..8a3160bb 100644 --- a/test_inputs/codegen/cloog/logopar.c +++ b/test_inputs/codegen/cloog/logopar.c @@ -1,17 +1,15 @@ -{ - for (int c1 = 0; c1 <= m; c1 += 1) - S1(1, c1); - for (int c0 = 2; c0 <= n; c0 += 1) { - for (int c1 = 0; c1 < c0 - 1; c1 += 1) - S2(c0, c1); - for (int c1 = c0 - 1; c1 <= n; c1 += 1) { - S1(c0, c1); - S2(c0, c1); - } - for (int c1 = n + 1; c1 <= m; c1 += 1) - S1(c0, c1); - } - for (int c0 = n + 1; c0 <= m + 1; c0 += 1) - for (int c1 = c0 - 1; c1 <= m; c1 += 1) - S1(c0, c1); -} +for (int c1 = 0; c1 <= m; c1 += 1) + S1(1, c1); +for (int c0 = 2; c0 <= n; c0 += 1) { + for (int c1 = 0; c1 < c0 - 1; c1 += 1) + S2(c0, c1); + for (int c1 = c0 - 1; c1 <= n; c1 += 1) { + S1(c0, c1); + S2(c0, c1); + } + for (int c1 = n + 1; c1 <= m; c1 += 1) + S1(c0, c1); +} +for (int c0 = n + 1; c0 <= m + 1; c0 += 1) + for (int c1 = c0 - 1; c1 <= m; c1 += 1) + S1(c0, c1); diff --git a/test_inputs/codegen/cloog/merge.c b/test_inputs/codegen/cloog/merge.c index 64564ad9..7b56a644 100644 --- a/test_inputs/codegen/cloog/merge.c +++ b/test_inputs/codegen/cloog/merge.c @@ -1,8 +1,6 @@ -{ - S1(0); - for (int c0 = 0; c0 <= 10; c0 += 1) { - if (c0 >= 2) - S2(c0); - S3(c0); - } +S1(0); +for (int c0 = 0; c0 <= 10; c0 += 1) { + if (c0 >= 2) + S2(c0); + S3(c0); } diff --git a/test_inputs/codegen/cloog/multi-stride.c b/test_inputs/codegen/cloog/multi-stride.c index 2c63c085..e69de29b 100644 --- a/test_inputs/codegen/cloog/multi-stride.c +++ b/test_inputs/codegen/cloog/multi-stride.c @@ -1,2 +0,0 @@ -{ -} diff --git a/test_inputs/codegen/cloog/nul_lcpc.c b/test_inputs/codegen/cloog/nul_lcpc.c index e6f39682..410d59d0 100644 --- a/test_inputs/codegen/cloog/nul_lcpc.c +++ b/test_inputs/codegen/cloog/nul_lcpc.c @@ -1,13 +1,11 @@ -{ - for (int c0 = 1; c0 <= 6; c0 += 2) { - for (int c2 = 1; c2 <= c0; c2 += 1) { - S1(c0, (c0 - 1) / 2, c2); - S2(c0, (c0 - 1) / 2, c2); - } - for (int c2 = c0 + 1; c2 <= p; c2 += 1) - S1(c0, (c0 - 1) / 2, c2); +for (int c0 = 1; c0 <= 6; c0 += 2) { + for (int c2 = 1; c2 <= c0; c2 += 1) { + S1(c0, (c0 - 1) / 2, c2); + S2(c0, (c0 - 1) / 2, c2); } - for (int c0 = 7; c0 <= m; c0 += 2) - for (int c2 = 1; c2 <= p; c2 += 1) - S1(c0, (c0 - 1) / 2, c2); + for (int c2 = c0 + 1; c2 <= p; c2 += 1) + S1(c0, (c0 - 1) / 2, c2); } +for (int c0 = 7; c0 <= m; c0 += 2) + for (int c2 = 1; c2 <= p; c2 += 1) + S1(c0, (c0 - 1) / 2, c2); diff --git a/test_inputs/codegen/cloog/orc.c b/test_inputs/codegen/cloog/orc.c index 40999440..770b9808 100644 --- a/test_inputs/codegen/cloog/orc.c +++ b/test_inputs/codegen/cloog/orc.c @@ -1,16 +1,14 @@ -{ - for (int c0 = 0; c0 <= 2; c0 += 1) { - S1(c0); - for (int c1 = 0; c1 <= -c0 + 11; c1 += 1) { - S2(c0, c1); - S3(c0, c1); - } - S4(c0); - } - for (int c0 = 0; c0 <= 14; c0 += 1) { - S5(c0); - for (int c1 = 0; c1 <= 9; c1 += 1) - S6(c0, c1); - S7(c0); +for (int c0 = 0; c0 <= 2; c0 += 1) { + S1(c0); + for (int c1 = 0; c1 <= -c0 + 11; c1 += 1) { + S2(c0, c1); + S3(c0, c1); } + S4(c0); +} +for (int c0 = 0; c0 <= 14; c0 += 1) { + S5(c0); + for (int c1 = 0; c1 <= 9; c1 += 1) + S6(c0, c1); + S7(c0); } diff --git a/test_inputs/codegen/cloog/reservoir-fusion1.c b/test_inputs/codegen/cloog/reservoir-fusion1.c index d586ebae..2296fdc0 100644 --- a/test_inputs/codegen/cloog/reservoir-fusion1.c +++ b/test_inputs/codegen/cloog/reservoir-fusion1.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 0; c0 <= M; c0 += 1) - S1(c0); - for (int c0 = 1; c0 <= M; c0 += 1) - S2(c0); - for (int c0 = 0; c0 <= M; c0 += 1) - S3(c0); -} +for (int c0 = 0; c0 <= M; c0 += 1) + S1(c0); +for (int c0 = 1; c0 <= M; c0 += 1) + S2(c0); +for (int c0 = 0; c0 <= M; c0 += 1) + S3(c0); diff --git a/test_inputs/codegen/cloog/reservoir-lim-lam2.c b/test_inputs/codegen/cloog/reservoir-lim-lam2.c index 483fe52b..1f7eb4f0 100644 --- a/test_inputs/codegen/cloog/reservoir-lim-lam2.c +++ b/test_inputs/codegen/cloog/reservoir-lim-lam2.c @@ -1,10 +1,8 @@ -{ - for (int c0 = 1; c0 <= M; c0 += 1) - S1(c0); - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 2; c1 <= N; c1 += 1) - S2(c0, c1); - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 < N; c1 += 1) - S3(c0, c1); -} +for (int c0 = 1; c0 <= M; c0 += 1) + S1(c0); +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 2; c1 <= N; c1 += 1) + S2(c0, c1); +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 < N; c1 += 1) + S3(c0, c1); diff --git a/test_inputs/codegen/cloog/reservoir-lim-lam5.c b/test_inputs/codegen/cloog/reservoir-lim-lam5.c index 05cbb742..08cae75e 100644 --- a/test_inputs/codegen/cloog/reservoir-lim-lam5.c +++ b/test_inputs/codegen/cloog/reservoir-lim-lam5.c @@ -1,11 +1,9 @@ -{ - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S1(c0, c1); - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S2(c0, c1); - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S3(c0, c1); -} +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S1(c0, c1); +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S2(c0, c1); +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S3(c0, c1); diff --git a/test_inputs/codegen/cloog/reservoir-lim-lam6.c b/test_inputs/codegen/cloog/reservoir-lim-lam6.c index 39e45383..08abc407 100644 --- a/test_inputs/codegen/cloog/reservoir-lim-lam6.c +++ b/test_inputs/codegen/cloog/reservoir-lim-lam6.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 0; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S1(c0, c1); - for (int c0 = 0; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S2(c1, c0); -} +for (int c0 = 0; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S1(c0, c1); +for (int c0 = 0; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S2(c1, c0); diff --git a/test_inputs/codegen/cloog/reservoir-mg-interp.c b/test_inputs/codegen/cloog/reservoir-mg-interp.c dissimilarity index 89% index c5d7774a..a0bd219a 100644 --- a/test_inputs/codegen/cloog/reservoir-mg-interp.c +++ b/test_inputs/codegen/cloog/reservoir-mg-interp.c @@ -1,85 +1,83 @@ -{ - if (N >= 2) - for (int c0 = 1; c0 < O; c0 += 1) { - for (int c3 = 1; c3 <= M; c3 += 1) - S1(c0, 1, c3); - for (int c3 = 1; c3 < M; c3 += 1) { - S6(c0, 1, c3); - S7(c0, 1, c3); - } - if (N >= 3) { - for (int c3 = 1; c3 <= M; c3 += 1) - S3(c0, 1, c3); - for (int c3 = 1; c3 <= M; c3 += 1) - S1(c0, 2, c3); - for (int c3 = 1; c3 < M; c3 += 1) { - S6(c0, 2, c3); - S7(c0, 2, c3); - } - for (int c3 = 1; c3 < M; c3 += 1) - S11(c0, 1, c3); - } else { - for (int c3 = 1; c3 <= M; c3 += 1) - S3(c0, 1, c3); - for (int c3 = 1; c3 < M; c3 += 1) - S11(c0, 1, c3); - } - for (int c1 = 3; c1 < 2 * N - 4; c1 += 2) { - for (int c3 = 1; c3 < M; c3 += 1) - S10(c0, (c1 - 1) / 2, c3); - for (int c3 = 1; c3 <= M; c3 += 1) - S3(c0, (c1 + 1) / 2, c3); - for (int c3 = 1; c3 <= M; c3 += 1) - S1(c0, (c1 + 3) / 2, c3); - for (int c3 = 1; c3 < M; c3 += 1) { - S6(c0, (c1 + 3) / 2, c3); - S7(c0, (c1 + 3) / 2, c3); - } - for (int c3 = 1; c3 < M; c3 += 1) - S11(c0, (c1 + 1) / 2, c3); - } - if (N >= 3) { - for (int c3 = 1; c3 < M; c3 += 1) - S10(c0, N - 2, c3); - for (int c3 = 1; c3 <= M; c3 += 1) - S3(c0, N - 1, c3); - for (int c3 = 1; c3 < M; c3 += 1) - S11(c0, N - 1, c3); - } - for (int c3 = 1; c3 < M; c3 += 1) - S10(c0, N - 1, c3); - } - for (int c0 = 1; c0 < O; c0 += 1) - for (int c1 = 1; c1 < N; c1 += 1) { - for (int c3 = 1; c3 <= M; c3 += 1) - S2(c0, c1, c3); - for (int c3 = 1; c3 < M; c3 += 1) - S8(c0, c1, c3); - for (int c3 = 1; c3 < M; c3 += 1) - S9(c0, c1, c3); - } - for (int c0 = 1; c0 < O; c0 += 1) - for (int c1 = 1; c1 < N; c1 += 1) - for (int c2 = 1; c2 < M; c2 += 1) - S4(c0, c1, c2); - for (int c0 = 1; c0 < O; c0 += 1) - for (int c1 = 1; c1 < N; c1 += 1) - for (int c2 = 1; c2 < M; c2 += 1) - S5(c0, c1, c2); - for (int c0 = R; c0 < O; c0 += 1) - for (int c1 = Q; c1 < N; c1 += 1) - for (int c2 = P; c2 < M; c2 += 1) - S12(c0, c1, c2); - for (int c0 = R; c0 < O; c0 += 1) - for (int c1 = Q; c1 < N; c1 += 1) - for (int c2 = 1; c2 < M; c2 += 1) - S13(c0, c1, c2); - for (int c0 = R; c0 < O; c0 += 1) - for (int c1 = 1; c1 < N; c1 += 1) - for (int c2 = P; c2 < M; c2 += 1) - S14(c0, c1, c2); - for (int c0 = R; c0 < O; c0 += 1) - for (int c1 = 1; c1 < N; c1 += 1) - for (int c2 = 1; c2 < M; c2 += 1) - S15(c0, c1, c2); -} +if (N >= 2) + for (int c0 = 1; c0 < O; c0 += 1) { + for (int c3 = 1; c3 <= M; c3 += 1) + S1(c0, 1, c3); + for (int c3 = 1; c3 < M; c3 += 1) { + S6(c0, 1, c3); + S7(c0, 1, c3); + } + if (N >= 3) { + for (int c3 = 1; c3 <= M; c3 += 1) + S3(c0, 1, c3); + for (int c3 = 1; c3 <= M; c3 += 1) + S1(c0, 2, c3); + for (int c3 = 1; c3 < M; c3 += 1) { + S6(c0, 2, c3); + S7(c0, 2, c3); + } + for (int c3 = 1; c3 < M; c3 += 1) + S11(c0, 1, c3); + } else { + for (int c3 = 1; c3 <= M; c3 += 1) + S3(c0, 1, c3); + for (int c3 = 1; c3 < M; c3 += 1) + S11(c0, 1, c3); + } + for (int c1 = 3; c1 < 2 * N - 4; c1 += 2) { + for (int c3 = 1; c3 < M; c3 += 1) + S10(c0, (c1 - 1) / 2, c3); + for (int c3 = 1; c3 <= M; c3 += 1) + S3(c0, (c1 + 1) / 2, c3); + for (int c3 = 1; c3 <= M; c3 += 1) + S1(c0, (c1 + 3) / 2, c3); + for (int c3 = 1; c3 < M; c3 += 1) { + S6(c0, (c1 + 3) / 2, c3); + S7(c0, (c1 + 3) / 2, c3); + } + for (int c3 = 1; c3 < M; c3 += 1) + S11(c0, (c1 + 1) / 2, c3); + } + if (N >= 3) { + for (int c3 = 1; c3 < M; c3 += 1) + S10(c0, N - 2, c3); + for (int c3 = 1; c3 <= M; c3 += 1) + S3(c0, N - 1, c3); + for (int c3 = 1; c3 < M; c3 += 1) + S11(c0, N - 1, c3); + } + for (int c3 = 1; c3 < M; c3 += 1) + S10(c0, N - 1, c3); + } +for (int c0 = 1; c0 < O; c0 += 1) + for (int c1 = 1; c1 < N; c1 += 1) { + for (int c3 = 1; c3 <= M; c3 += 1) + S2(c0, c1, c3); + for (int c3 = 1; c3 < M; c3 += 1) + S8(c0, c1, c3); + for (int c3 = 1; c3 < M; c3 += 1) + S9(c0, c1, c3); + } +for (int c0 = 1; c0 < O; c0 += 1) + for (int c1 = 1; c1 < N; c1 += 1) + for (int c2 = 1; c2 < M; c2 += 1) + S4(c0, c1, c2); +for (int c0 = 1; c0 < O; c0 += 1) + for (int c1 = 1; c1 < N; c1 += 1) + for (int c2 = 1; c2 < M; c2 += 1) + S5(c0, c1, c2); +for (int c0 = R; c0 < O; c0 += 1) + for (int c1 = Q; c1 < N; c1 += 1) + for (int c2 = P; c2 < M; c2 += 1) + S12(c0, c1, c2); +for (int c0 = R; c0 < O; c0 += 1) + for (int c1 = Q; c1 < N; c1 += 1) + for (int c2 = 1; c2 < M; c2 += 1) + S13(c0, c1, c2); +for (int c0 = R; c0 < O; c0 += 1) + for (int c1 = 1; c1 < N; c1 += 1) + for (int c2 = P; c2 < M; c2 += 1) + S14(c0, c1, c2); +for (int c0 = R; c0 < O; c0 += 1) + for (int c1 = 1; c1 < N; c1 += 1) + for (int c2 = 1; c2 < M; c2 += 1) + S15(c0, c1, c2); diff --git a/test_inputs/codegen/cloog/reservoir-mg-interp2.c b/test_inputs/codegen/cloog/reservoir-mg-interp2.c dissimilarity index 100% index 48c5dfdd..4b329e67 100644 --- a/test_inputs/codegen/cloog/reservoir-mg-interp2.c +++ b/test_inputs/codegen/cloog/reservoir-mg-interp2.c @@ -1,18 +1,16 @@ -{ - for (int c0 = 1; c0 < O; c0 += 1) - for (int c1 = Q; c1 < N; c1 += 1) - for (int c2 = P; c2 < M; c2 += 1) - S1(c0, c1, c2); - for (int c0 = 1; c0 < O; c0 += 1) - for (int c1 = Q; c1 < N; c1 += 1) - for (int c2 = 1; c2 < M; c2 += 1) - S2(c0, c1, c2); - for (int c0 = 1; c0 < O; c0 += 1) - for (int c1 = 1; c1 < N; c1 += 1) - for (int c2 = P; c2 < M; c2 += 1) - S3(c0, c1, c2); - for (int c0 = 1; c0 < O; c0 += 1) - for (int c1 = 1; c1 < N; c1 += 1) - for (int c2 = 1; c2 < M; c2 += 1) - S4(c0, c1, c2); -} +for (int c0 = 1; c0 < O; c0 += 1) + for (int c1 = Q; c1 < N; c1 += 1) + for (int c2 = P; c2 < M; c2 += 1) + S1(c0, c1, c2); +for (int c0 = 1; c0 < O; c0 += 1) + for (int c1 = Q; c1 < N; c1 += 1) + for (int c2 = 1; c2 < M; c2 += 1) + S2(c0, c1, c2); +for (int c0 = 1; c0 < O; c0 += 1) + for (int c1 = 1; c1 < N; c1 += 1) + for (int c2 = P; c2 < M; c2 += 1) + S3(c0, c1, c2); +for (int c0 = 1; c0 < O; c0 += 1) + for (int c1 = 1; c1 < N; c1 += 1) + for (int c2 = 1; c2 < M; c2 += 1) + S4(c0, c1, c2); diff --git a/test_inputs/codegen/cloog/reservoir-pingali2.c b/test_inputs/codegen/cloog/reservoir-pingali2.c index 195f15bb..6b066dee 100644 --- a/test_inputs/codegen/cloog/reservoir-pingali2.c +++ b/test_inputs/codegen/cloog/reservoir-pingali2.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S1(c0, c1); - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S2(c0, c1); -} +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S1(c0, c1); +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S2(c0, c1); diff --git a/test_inputs/codegen/cloog/reservoir-pingali3.c b/test_inputs/codegen/cloog/reservoir-pingali3.c index eede1429..2148d670 100644 --- a/test_inputs/codegen/cloog/reservoir-pingali3.c +++ b/test_inputs/codegen/cloog/reservoir-pingali3.c @@ -1,9 +1,7 @@ -{ - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S1(c0, c1); - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - for (int c2 = 1; c2 <= M; c2 += 1) - S2(c0, c1, c2); -} +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S1(c0, c1); +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + for (int c2 = 1; c2 <= M; c2 += 1) + S2(c0, c1, c2); diff --git a/test_inputs/codegen/cloog/reservoir-pingali4.c b/test_inputs/codegen/cloog/reservoir-pingali4.c index 195f15bb..6b066dee 100644 --- a/test_inputs/codegen/cloog/reservoir-pingali4.c +++ b/test_inputs/codegen/cloog/reservoir-pingali4.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S1(c0, c1); - for (int c0 = 1; c0 <= M; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S2(c0, c1); -} +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S1(c0, c1); +for (int c0 = 1; c0 <= M; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S2(c0, c1); diff --git a/test_inputs/codegen/cloog/singleton.c b/test_inputs/codegen/cloog/singleton.c index 0023bc6c..0cf8d161 100644 --- a/test_inputs/codegen/cloog/singleton.c +++ b/test_inputs/codegen/cloog/singleton.c @@ -1,4 +1,2 @@ -{ - S2(); - S1(); -} +S2(); +S1(); diff --git a/test_inputs/codegen/cloog/stride.c b/test_inputs/codegen/cloog/stride.c index 9bd4ddfb..ccacebcd 100644 --- a/test_inputs/codegen/cloog/stride.c +++ b/test_inputs/codegen/cloog/stride.c @@ -1,7 +1,5 @@ -{ - for (int c0 = 3; c0 <= 24; c0 += 3) - S2(c0, c0 / 3); - S1(25); - for (int c0 = 27; c0 <= 100; c0 += 3) - S2(c0, c0 / 3); -} +for (int c0 = 3; c0 <= 24; c0 += 3) + S2(c0, c0 / 3); +S1(25); +for (int c0 = 27; c0 <= 100; c0 += 3) + S2(c0, c0 / 3); diff --git a/test_inputs/codegen/cloog/stride2.c b/test_inputs/codegen/cloog/stride2.c index c56af8e7..8eab0d79 100644 --- a/test_inputs/codegen/cloog/stride2.c +++ b/test_inputs/codegen/cloog/stride2.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 3; c0 <= 26; c0 += 3) - S2(c0, c0 / 3); - S1(27); - S2(27, 9); - for (int c0 = 30; c0 <= 100; c0 += 3) - S2(c0, c0 / 3); -} +for (int c0 = 3; c0 <= 26; c0 += 3) + S2(c0, c0 / 3); +S1(27); +S2(27, 9); +for (int c0 = 30; c0 <= 100; c0 += 3) + S2(c0, c0 / 3); diff --git a/test_inputs/codegen/cloog/test.c b/test_inputs/codegen/cloog/test.c index f0544abd..67485ca7 100644 --- a/test_inputs/codegen/cloog/test.c +++ b/test_inputs/codegen/cloog/test.c @@ -1,17 +1,15 @@ -{ - for (int c0 = 1; c0 <= 2; c0 += 1) - for (int c1 = 1; c1 <= M; c1 += 1) - S1(c0, c1); - for (int c0 = 3; c0 <= N; c0 += 1) { - for (int c1 = 1; c1 <= min(M, c0 - 1); c1 += 1) - S1(c0, c1); - if (c0 >= M + 1) { - S2(c0, c0); - } else { - S1(c0, c0); - S2(c0, c0); - } - for (int c1 = c0 + 1; c1 <= M; c1 += 1) - S1(c0, c1); +for (int c0 = 1; c0 <= 2; c0 += 1) + for (int c1 = 1; c1 <= M; c1 += 1) + S1(c0, c1); +for (int c0 = 3; c0 <= N; c0 += 1) { + for (int c1 = 1; c1 <= min(M, c0 - 1); c1 += 1) + S1(c0, c1); + if (c0 >= M + 1) { + S2(c0, c0); + } else { + S1(c0, c0); + S2(c0, c0); } + for (int c1 = c0 + 1; c1 <= M; c1 += 1) + S1(c0, c1); } diff --git a/test_inputs/codegen/cloog/thomasset.c b/test_inputs/codegen/cloog/thomasset.c index 8d6709e7..f52de94a 100644 --- a/test_inputs/codegen/cloog/thomasset.c +++ b/test_inputs/codegen/cloog/thomasset.c @@ -1,9 +1,7 @@ -{ - for (int c0 = 0; c0 <= floord(n - 1, 3); c0 += 1) - for (int c2 = 3 * c0 + 1; c2 <= min(n, 3 * c0 + 3); c2 += 1) - S1(c2, c0); - for (int c0 = floord(n, 3); c0 <= 2 * floord(n, 3); c0 += 1) - for (int c1 = 0; c1 < n; c1 += 1) - for (int c3 = max(1, (n % 3) - n + 3 * c0); c3 <= min(n, (n % 3) - n + 3 * c0 + 2); c3 += 1) - S2(c1 + 1, c3, 0, n / 3, c0 - n / 3); -} +for (int c0 = 0; c0 <= floord(n - 1, 3); c0 += 1) + for (int c2 = 3 * c0 + 1; c2 <= min(n, 3 * c0 + 3); c2 += 1) + S1(c2, c0); +for (int c0 = floord(n, 3); c0 <= 2 * floord(n, 3); c0 += 1) + for (int c1 = 0; c1 < n; c1 += 1) + for (int c3 = max(1, (n % 3) - n + 3 * c0); c3 <= min(n, (n % 3) - n + 3 * c0 + 2); c3 += 1) + S2(c1 + 1, c3, 0, n / 3, c0 - n / 3); diff --git a/test_inputs/codegen/cloog/uday_scalars.c b/test_inputs/codegen/cloog/uday_scalars.c index 7d870a51..904dc24d 100644 --- a/test_inputs/codegen/cloog/uday_scalars.c +++ b/test_inputs/codegen/cloog/uday_scalars.c @@ -1,6 +1,4 @@ -{ - for (int c0 = 0; c0 <= n; c0 += 1) - S1(c0, 0, 0); - for (int c0 = 0; c0 <= n; c0 += 1) - S2(0, c0, 0); -} +for (int c0 = 0; c0 <= n; c0 += 1) + S1(c0, 0, 0); +for (int c0 = 0; c0 <= n; c0 += 1) + S2(0, c0, 0); diff --git a/test_inputs/codegen/cloog/unroll.c b/test_inputs/codegen/cloog/unroll.c index 83c4577b..8dee4f88 100644 --- a/test_inputs/codegen/cloog/unroll.c +++ b/test_inputs/codegen/cloog/unroll.c @@ -1,13 +1,11 @@ -{ - S1(0); - S1(1); - S1(2); - S1(3); - S1(4); - S1(5); - S1(6); - S1(7); - S1(8); - S1(9); - S1(10); -} +S1(0); +S1(1); +S1(2); +S1(3); +S1(4); +S1(5); +S1(6); +S1(7); +S1(8); +S1(9); +S1(10); diff --git a/test_inputs/codegen/cloog/usvd_e_t.c b/test_inputs/codegen/cloog/usvd_e_t.c dissimilarity index 97% index af8c9fe4..ed92b95b 100644 --- a/test_inputs/codegen/cloog/usvd_e_t.c +++ b/test_inputs/codegen/cloog/usvd_e_t.c @@ -1,348 +1,346 @@ -{ - for (int c0 = 0; c0 <= 2; c0 += 1) { - S1(c0, 0, 0); - for (int c1 = 0; c1 <= 4; c1 += 1) - S2(c0, c1, 0); - } - S1(3, 0, 0); - for (int c1 = 0; c1 <= 4; c1 += 1) - S2(3, c1, 0); - for (int c1 = 7; c1 <= 11; c1 += 1) - S8(3, c1, 0); - S1(4, 0, 0); - S2(4, 0, 0); - S3(4, 0, 0); - S5(4, 0, 0); - for (int c1 = 1; c1 <= 4; c1 += 1) { - S2(4, c1, 0); - S5(4, c1, 0); - } - for (int c1 = 7; c1 <= 11; c1 += 1) - S8(4, c1, 0); - for (int c0 = 5; c0 <= 6; c0 += 1) { - for (int c1 = -4; c1 < c0 - 8; c1 += 1) - S6(c0, c1, 0); - for (int c1 = c0 - 9; c1 < 0; c1 += 1) - S7(c0, c1, 0); - S3(c0, 0, 0); - S7(c0, 0, 0); - for (int c1 = 1; c1 < c0 - 3; c1 += 1) - S4(c0, c1, -1); - for (int c1 = c0 - 4; c1 <= 4; c1 += 1) - S5(c0, c1, 0); - for (int c1 = 7; c1 <= 11; c1 += 1) - S8(c0, c1, 0); - } - for (int c1 = -4; c1 < -1; c1 += 1) - S6(7, c1, 0); - for (int c1 = -2; c1 < 0; c1 += 1) - S7(7, c1, 0); - S3(7, 0, 0); - S7(7, 0, 0); - for (int c1 = 1; c1 <= 3; c1 += 1) - S4(7, c1, -1); - for (int c1 = 3; c1 <= 4; c1 += 1) - S5(7, c1, 0); - S9(7, 4, 0); - S10(7, 4, 0); - S11(7, 4, 0); - S21(7, 4, 0); - S23(7, 4, 0); - S11(7, 4, 1); - S16(7, 4, 1); - S17(7, 4, 1); - for (int c2 = 2; c2 <= 4; c2 += 1) - S11(7, 4, c2); - S12(7, 5, 0); - S21(7, 5, 0); - S22(7, 5, 0); - S23(7, 5, 0); - S12(7, 5, 1); - S16(7, 5, 1); - S17(7, 5, 1); - for (int c2 = 2; c2 <= 4; c2 += 1) - S12(7, 5, c2); - S21(7, 6, 0); - S22(7, 6, 0); - S23(7, 6, 0); - for (int c1 = 7; c1 <= 8; c1 += 1) { - S8(7, c1, 0); - S21(7, c1, 0); - S22(7, c1, 0); - S23(7, c1, 0); - } - S8(7, 9, 0); - S22(7, 9, 0); - for (int c1 = 10; c1 <= 11; c1 += 1) - S8(7, c1, 0); - for (int c1 = -4; c1 < 0; c1 += 1) - S6(8, c1, 0); - S7(8, -1, 0); - S3(8, 0, 0); - S7(8, 0, 0); - S19(8, 1, -2); - S4(8, 1, -1); - S19(8, 1, -1); - S19(8, 1, 0); - S15(8, 1, 4); - S18(8, 1, 4); - for (int c2 = -4; c2 < -2; c2 += 1) { - S14(8, 2, c2); - S20(8, 2, c2); - } - S14(8, 2, -2); - S19(8, 2, -2); - S20(8, 2, -2); - S4(8, 2, -1); - S14(8, 2, -1); - S19(8, 2, -1); - S20(8, 2, -1); - S14(8, 2, 0); - S19(8, 2, 0); - S20(8, 2, 0); - S15(8, 2, 4); - S18(8, 2, 4); - for (int c2 = -4; c2 < -1; c2 += 1) { - S14(8, 3, c2); - S20(8, 3, c2); - } - S4(8, 3, -1); - S14(8, 3, -1); - S20(8, 3, -1); - S14(8, 3, 0); - S20(8, 3, 0); - S15(8, 3, 4); - S18(8, 3, 4); - for (int c2 = -4; c2 < -1; c2 += 1) { - S14(8, 4, c2); - S20(8, 4, c2); - } - S4(8, 4, -1); - S14(8, 4, -1); - S20(8, 4, -1); - S5(8, 4, 0); - S9(8, 4, 0); - S10(8, 4, 0); - S14(8, 4, 0); - S20(8, 4, 0); - S23(8, 4, 0); - S13(8, 4, 1); - S21(8, 4, 1); - S23(8, 4, 1); - S24(8, 4, 1); - S13(8, 4, 2); - S16(8, 4, 2); - S17(8, 4, 2); - S24(8, 4, 2); - S13(8, 4, 3); - S24(8, 4, 3); - S13(8, 4, 4); - S15(8, 4, 4); - S23(8, 5, 0); - S11(8, 5, 1); - S21(8, 5, 1); - S22(8, 5, 1); - S23(8, 5, 1); - S24(8, 5, 1); - S11(8, 5, 2); - S16(8, 5, 2); - S17(8, 5, 2); - S24(8, 5, 2); - S11(8, 5, 3); - S24(8, 5, 3); - S11(8, 5, 4); - S15(8, 5, 4); - S23(8, 6, 0); - S12(8, 6, 1); - S21(8, 6, 1); - S22(8, 6, 1); - S23(8, 6, 1); - S24(8, 6, 1); - S12(8, 6, 2); - S16(8, 6, 2); - S17(8, 6, 2); - S24(8, 6, 2); - S12(8, 6, 3); - S24(8, 6, 3); - S12(8, 6, 4); - for (int c1 = 7; c1 <= 8; c1 += 1) { - S23(8, c1, 0); - S21(8, c1, 1); - S22(8, c1, 1); - S23(8, c1, 1); - for (int c2 = 1; c2 <= 3; c2 += 1) - S24(8, c1, c2); - } - S22(8, 9, 1); - S7(9, 0, 0); - for (int c1 = 1; c1 <= 2; c1 += 1) { - for (int c2 = -1; c2 <= 0; c2 += 1) - S19(9, c1, c2); - for (int c2 = 4; c2 <= 5; c2 += 1) { - S15(9, c1, c2); - S18(9, c1, c2); - } - } - S20(9, 3, -4); - for (int c2 = -3; c2 < -1; c2 += 1) { - S14(9, 3, c2); - S20(9, 3, c2); - } - for (int c2 = -1; c2 <= 0; c2 += 1) { - S14(9, 3, c2); - S19(9, 3, c2); - S20(9, 3, c2); - } - for (int c2 = 4; c2 <= 5; c2 += 1) { - S15(9, 3, c2); - S18(9, 3, c2); - } - S20(9, 4, -4); - for (int c2 = -3; c2 < 0; c2 += 1) { - S14(9, 4, c2); - S20(9, 4, c2); - } - S9(9, 4, 0); - S10(9, 4, 0); - S14(9, 4, 0); - S20(9, 4, 0); - for (int c2 = 0; c2 <= 1; c2 += 1) - S23(9, 4, c2); - S13(9, 4, 2); - S21(9, 4, 2); - S23(9, 4, 2); - S24(9, 4, 2); - S13(9, 4, 3); - S16(9, 4, 3); - S17(9, 4, 3); - S24(9, 4, 3); - S13(9, 4, 4); - for (int c2 = 4; c2 <= 5; c2 += 1) { - S15(9, 4, c2); - S18(9, 4, c2); - } - for (int c2 = 0; c2 <= 1; c2 += 1) - S23(9, 5, c2); - S13(9, 5, 2); - S21(9, 5, 2); - S22(9, 5, 2); - S23(9, 5, 2); - S24(9, 5, 2); - S13(9, 5, 3); - S16(9, 5, 3); - S17(9, 5, 3); - S24(9, 5, 3); - S13(9, 5, 4); - for (int c2 = 4; c2 <= 5; c2 += 1) - S15(9, 5, c2); - for (int c2 = 0; c2 <= 1; c2 += 1) - S23(9, 6, c2); - S11(9, 6, 2); - S21(9, 6, 2); - S22(9, 6, 2); - S23(9, 6, 2); - S24(9, 6, 2); - S11(9, 6, 3); - S16(9, 6, 3); - S17(9, 6, 3); - S24(9, 6, 3); - S11(9, 6, 4); - for (int c2 = 0; c2 <= 1; c2 += 1) - S23(9, 7, c2); - S12(9, 7, 2); - S21(9, 7, 2); - S22(9, 7, 2); - S23(9, 7, 2); - S24(9, 7, 2); - S12(9, 7, 3); - S16(9, 7, 3); - S17(9, 7, 3); - S24(9, 7, 3); - S12(9, 7, 4); - for (int c2 = 0; c2 <= 1; c2 += 1) - S23(9, 8, c2); - S21(9, 8, 2); - S22(9, 8, 2); - S23(9, 8, 2); - for (int c2 = 2; c2 <= 3; c2 += 1) - S24(9, 8, c2); - S22(9, 9, 2); - for (int c1 = 1; c1 <= 3; c1 += 1) { - S19(10, c1, 0); - S26(10, c1, 3); - S15(10, c1, 4); - S18(10, c1, 4); - S25(10, c1, 4); - for (int c2 = 5; c2 <= 6; c2 += 1) { - S15(10, c1, c2); - S18(10, c1, c2); - } - } - for (int c2 = -4; c2 < -2; c2 += 1) - S20(10, 4, c2); - for (int c2 = -2; c2 < 0; c2 += 1) { - S14(10, 4, c2); - S20(10, 4, c2); - } - S9(10, 4, 0); - S10(10, 4, 0); - S14(10, 4, 0); - S19(10, 4, 0); - S20(10, 4, 0); - S13(10, 4, 3); - S21(10, 4, 3); - S24(10, 4, 3); - S26(10, 4, 3); - S13(10, 4, 4); - S15(10, 4, 4); - S16(10, 4, 4); - S17(10, 4, 4); - S18(10, 4, 4); - S25(10, 4, 4); - for (int c2 = 5; c2 <= 6; c2 += 1) { - S15(10, 4, c2); - S18(10, 4, c2); - } - S13(10, 5, 3); - S21(10, 5, 3); - S22(10, 5, 3); - S24(10, 5, 3); - S26(10, 5, 3); - S13(10, 5, 4); - S15(10, 5, 4); - S16(10, 5, 4); - S17(10, 5, 4); - S18(10, 5, 4); - S25(10, 5, 4); - for (int c2 = 5; c2 <= 6; c2 += 1) { - S15(10, 5, c2); - S18(10, 5, c2); - } - S13(10, 6, 3); - S21(10, 6, 3); - S22(10, 6, 3); - S24(10, 6, 3); - S13(10, 6, 4); - S16(10, 6, 4); - S17(10, 6, 4); - S11(10, 7, 3); - S21(10, 7, 3); - S22(10, 7, 3); - S24(10, 7, 3); - S11(10, 7, 4); - S16(10, 7, 4); - S17(10, 7, 4); - S12(10, 8, 3); - S21(10, 8, 3); - S22(10, 8, 3); - S24(10, 8, 3); - S12(10, 8, 4); - S16(10, 8, 4); - S17(10, 8, 4); - S22(10, 9, 3); - for (int c0 = 11; c0 <= 14; c0 += 1) - for (int c1 = 1; c1 <= 5; c1 += 1) { - S26(c0, c1, 3); - S25(c0, c1, 4); - } -} +for (int c0 = 0; c0 <= 2; c0 += 1) { + S1(c0, 0, 0); + for (int c1 = 0; c1 <= 4; c1 += 1) + S2(c0, c1, 0); +} +S1(3, 0, 0); +for (int c1 = 0; c1 <= 4; c1 += 1) + S2(3, c1, 0); +for (int c1 = 7; c1 <= 11; c1 += 1) + S8(3, c1, 0); +S1(4, 0, 0); +S2(4, 0, 0); +S3(4, 0, 0); +S5(4, 0, 0); +for (int c1 = 1; c1 <= 4; c1 += 1) { + S2(4, c1, 0); + S5(4, c1, 0); +} +for (int c1 = 7; c1 <= 11; c1 += 1) + S8(4, c1, 0); +for (int c0 = 5; c0 <= 6; c0 += 1) { + for (int c1 = -4; c1 < c0 - 8; c1 += 1) + S6(c0, c1, 0); + for (int c1 = c0 - 9; c1 < 0; c1 += 1) + S7(c0, c1, 0); + S3(c0, 0, 0); + S7(c0, 0, 0); + for (int c1 = 1; c1 < c0 - 3; c1 += 1) + S4(c0, c1, -1); + for (int c1 = c0 - 4; c1 <= 4; c1 += 1) + S5(c0, c1, 0); + for (int c1 = 7; c1 <= 11; c1 += 1) + S8(c0, c1, 0); +} +for (int c1 = -4; c1 < -1; c1 += 1) + S6(7, c1, 0); +for (int c1 = -2; c1 < 0; c1 += 1) + S7(7, c1, 0); +S3(7, 0, 0); +S7(7, 0, 0); +for (int c1 = 1; c1 <= 3; c1 += 1) + S4(7, c1, -1); +for (int c1 = 3; c1 <= 4; c1 += 1) + S5(7, c1, 0); +S9(7, 4, 0); +S10(7, 4, 0); +S11(7, 4, 0); +S21(7, 4, 0); +S23(7, 4, 0); +S11(7, 4, 1); +S16(7, 4, 1); +S17(7, 4, 1); +for (int c2 = 2; c2 <= 4; c2 += 1) + S11(7, 4, c2); +S12(7, 5, 0); +S21(7, 5, 0); +S22(7, 5, 0); +S23(7, 5, 0); +S12(7, 5, 1); +S16(7, 5, 1); +S17(7, 5, 1); +for (int c2 = 2; c2 <= 4; c2 += 1) + S12(7, 5, c2); +S21(7, 6, 0); +S22(7, 6, 0); +S23(7, 6, 0); +for (int c1 = 7; c1 <= 8; c1 += 1) { + S8(7, c1, 0); + S21(7, c1, 0); + S22(7, c1, 0); + S23(7, c1, 0); +} +S8(7, 9, 0); +S22(7, 9, 0); +for (int c1 = 10; c1 <= 11; c1 += 1) + S8(7, c1, 0); +for (int c1 = -4; c1 < 0; c1 += 1) + S6(8, c1, 0); +S7(8, -1, 0); +S3(8, 0, 0); +S7(8, 0, 0); +S19(8, 1, -2); +S4(8, 1, -1); +S19(8, 1, -1); +S19(8, 1, 0); +S15(8, 1, 4); +S18(8, 1, 4); +for (int c2 = -4; c2 < -2; c2 += 1) { + S14(8, 2, c2); + S20(8, 2, c2); +} +S14(8, 2, -2); +S19(8, 2, -2); +S20(8, 2, -2); +S4(8, 2, -1); +S14(8, 2, -1); +S19(8, 2, -1); +S20(8, 2, -1); +S14(8, 2, 0); +S19(8, 2, 0); +S20(8, 2, 0); +S15(8, 2, 4); +S18(8, 2, 4); +for (int c2 = -4; c2 < -1; c2 += 1) { + S14(8, 3, c2); + S20(8, 3, c2); +} +S4(8, 3, -1); +S14(8, 3, -1); +S20(8, 3, -1); +S14(8, 3, 0); +S20(8, 3, 0); +S15(8, 3, 4); +S18(8, 3, 4); +for (int c2 = -4; c2 < -1; c2 += 1) { + S14(8, 4, c2); + S20(8, 4, c2); +} +S4(8, 4, -1); +S14(8, 4, -1); +S20(8, 4, -1); +S5(8, 4, 0); +S9(8, 4, 0); +S10(8, 4, 0); +S14(8, 4, 0); +S20(8, 4, 0); +S23(8, 4, 0); +S13(8, 4, 1); +S21(8, 4, 1); +S23(8, 4, 1); +S24(8, 4, 1); +S13(8, 4, 2); +S16(8, 4, 2); +S17(8, 4, 2); +S24(8, 4, 2); +S13(8, 4, 3); +S24(8, 4, 3); +S13(8, 4, 4); +S15(8, 4, 4); +S23(8, 5, 0); +S11(8, 5, 1); +S21(8, 5, 1); +S22(8, 5, 1); +S23(8, 5, 1); +S24(8, 5, 1); +S11(8, 5, 2); +S16(8, 5, 2); +S17(8, 5, 2); +S24(8, 5, 2); +S11(8, 5, 3); +S24(8, 5, 3); +S11(8, 5, 4); +S15(8, 5, 4); +S23(8, 6, 0); +S12(8, 6, 1); +S21(8, 6, 1); +S22(8, 6, 1); +S23(8, 6, 1); +S24(8, 6, 1); +S12(8, 6, 2); +S16(8, 6, 2); +S17(8, 6, 2); +S24(8, 6, 2); +S12(8, 6, 3); +S24(8, 6, 3); +S12(8, 6, 4); +for (int c1 = 7; c1 <= 8; c1 += 1) { + S23(8, c1, 0); + S21(8, c1, 1); + S22(8, c1, 1); + S23(8, c1, 1); + for (int c2 = 1; c2 <= 3; c2 += 1) + S24(8, c1, c2); +} +S22(8, 9, 1); +S7(9, 0, 0); +for (int c1 = 1; c1 <= 2; c1 += 1) { + for (int c2 = -1; c2 <= 0; c2 += 1) + S19(9, c1, c2); + for (int c2 = 4; c2 <= 5; c2 += 1) { + S15(9, c1, c2); + S18(9, c1, c2); + } +} +S20(9, 3, -4); +for (int c2 = -3; c2 < -1; c2 += 1) { + S14(9, 3, c2); + S20(9, 3, c2); +} +for (int c2 = -1; c2 <= 0; c2 += 1) { + S14(9, 3, c2); + S19(9, 3, c2); + S20(9, 3, c2); +} +for (int c2 = 4; c2 <= 5; c2 += 1) { + S15(9, 3, c2); + S18(9, 3, c2); +} +S20(9, 4, -4); +for (int c2 = -3; c2 < 0; c2 += 1) { + S14(9, 4, c2); + S20(9, 4, c2); +} +S9(9, 4, 0); +S10(9, 4, 0); +S14(9, 4, 0); +S20(9, 4, 0); +for (int c2 = 0; c2 <= 1; c2 += 1) + S23(9, 4, c2); +S13(9, 4, 2); +S21(9, 4, 2); +S23(9, 4, 2); +S24(9, 4, 2); +S13(9, 4, 3); +S16(9, 4, 3); +S17(9, 4, 3); +S24(9, 4, 3); +S13(9, 4, 4); +for (int c2 = 4; c2 <= 5; c2 += 1) { + S15(9, 4, c2); + S18(9, 4, c2); +} +for (int c2 = 0; c2 <= 1; c2 += 1) + S23(9, 5, c2); +S13(9, 5, 2); +S21(9, 5, 2); +S22(9, 5, 2); +S23(9, 5, 2); +S24(9, 5, 2); +S13(9, 5, 3); +S16(9, 5, 3); +S17(9, 5, 3); +S24(9, 5, 3); +S13(9, 5, 4); +for (int c2 = 4; c2 <= 5; c2 += 1) + S15(9, 5, c2); +for (int c2 = 0; c2 <= 1; c2 += 1) + S23(9, 6, c2); +S11(9, 6, 2); +S21(9, 6, 2); +S22(9, 6, 2); +S23(9, 6, 2); +S24(9, 6, 2); +S11(9, 6, 3); +S16(9, 6, 3); +S17(9, 6, 3); +S24(9, 6, 3); +S11(9, 6, 4); +for (int c2 = 0; c2 <= 1; c2 += 1) + S23(9, 7, c2); +S12(9, 7, 2); +S21(9, 7, 2); +S22(9, 7, 2); +S23(9, 7, 2); +S24(9, 7, 2); +S12(9, 7, 3); +S16(9, 7, 3); +S17(9, 7, 3); +S24(9, 7, 3); +S12(9, 7, 4); +for (int c2 = 0; c2 <= 1; c2 += 1) + S23(9, 8, c2); +S21(9, 8, 2); +S22(9, 8, 2); +S23(9, 8, 2); +for (int c2 = 2; c2 <= 3; c2 += 1) + S24(9, 8, c2); +S22(9, 9, 2); +for (int c1 = 1; c1 <= 3; c1 += 1) { + S19(10, c1, 0); + S26(10, c1, 3); + S15(10, c1, 4); + S18(10, c1, 4); + S25(10, c1, 4); + for (int c2 = 5; c2 <= 6; c2 += 1) { + S15(10, c1, c2); + S18(10, c1, c2); + } +} +for (int c2 = -4; c2 < -2; c2 += 1) + S20(10, 4, c2); +for (int c2 = -2; c2 < 0; c2 += 1) { + S14(10, 4, c2); + S20(10, 4, c2); +} +S9(10, 4, 0); +S10(10, 4, 0); +S14(10, 4, 0); +S19(10, 4, 0); +S20(10, 4, 0); +S13(10, 4, 3); +S21(10, 4, 3); +S24(10, 4, 3); +S26(10, 4, 3); +S13(10, 4, 4); +S15(10, 4, 4); +S16(10, 4, 4); +S17(10, 4, 4); +S18(10, 4, 4); +S25(10, 4, 4); +for (int c2 = 5; c2 <= 6; c2 += 1) { + S15(10, 4, c2); + S18(10, 4, c2); +} +S13(10, 5, 3); +S21(10, 5, 3); +S22(10, 5, 3); +S24(10, 5, 3); +S26(10, 5, 3); +S13(10, 5, 4); +S15(10, 5, 4); +S16(10, 5, 4); +S17(10, 5, 4); +S18(10, 5, 4); +S25(10, 5, 4); +for (int c2 = 5; c2 <= 6; c2 += 1) { + S15(10, 5, c2); + S18(10, 5, c2); +} +S13(10, 6, 3); +S21(10, 6, 3); +S22(10, 6, 3); +S24(10, 6, 3); +S13(10, 6, 4); +S16(10, 6, 4); +S17(10, 6, 4); +S11(10, 7, 3); +S21(10, 7, 3); +S22(10, 7, 3); +S24(10, 7, 3); +S11(10, 7, 4); +S16(10, 7, 4); +S17(10, 7, 4); +S12(10, 8, 3); +S21(10, 8, 3); +S22(10, 8, 3); +S24(10, 8, 3); +S12(10, 8, 4); +S16(10, 8, 4); +S17(10, 8, 4); +S22(10, 9, 3); +for (int c0 = 11; c0 <= 14; c0 += 1) + for (int c1 = 1; c1 <= 5; c1 += 1) { + S26(c0, c1, 3); + S25(c0, c1, 4); + } diff --git a/test_inputs/codegen/cloog/vasilache.c b/test_inputs/codegen/cloog/vasilache.c dissimilarity index 97% index 0df78897..e7978f2b 100644 --- a/test_inputs/codegen/cloog/vasilache.c +++ b/test_inputs/codegen/cloog/vasilache.c @@ -1,24 +1,22 @@ -{ - S1(); - S2(); - for (int c0 = 0; c0 < N; c0 += 1) - for (int c1 = 0; c1 < N; c1 += 1) { - S4(c0, c1); - S5(c0, c1); - } - for (int c0 = 0; c0 < N; c0 += 1) - for (int c1 = 0; c1 < N; c1 += 1) - for (int c2 = 0; c2 <= (N - 1) / 32; c2 += 1) { - S7(c0, c1, c2, 32 * c2); - for (int c3 = 32 * c2 + 1; c3 <= min(N - 1, 32 * c2 + 31); c3 += 1) { - S6(c0, c1, c2, c3 - 1); - S7(c0, c1, c2, c3); - } - if (32 * c2 + 31 >= N) { - S6(c0, c1, c2, N - 1); - } else { - S6(c0, c1, c2, 32 * c2 + 31); - } - } - S8(); -} +S1(); +S2(); +for (int c0 = 0; c0 < N; c0 += 1) + for (int c1 = 0; c1 < N; c1 += 1) { + S4(c0, c1); + S5(c0, c1); + } +for (int c0 = 0; c0 < N; c0 += 1) + for (int c1 = 0; c1 < N; c1 += 1) + for (int c2 = 0; c2 <= (N - 1) / 32; c2 += 1) { + S7(c0, c1, c2, 32 * c2); + for (int c3 = 32 * c2 + 1; c3 <= min(N - 1, 32 * c2 + 31); c3 += 1) { + S6(c0, c1, c2, c3 - 1); + S7(c0, c1, c2, c3); + } + if (32 * c2 + 31 >= N) { + S6(c0, c1, c2, N - 1); + } else { + S6(c0, c1, c2, 32 * c2 + 31); + } + } +S8(); diff --git a/test_inputs/codegen/cloog/vivien.c b/test_inputs/codegen/cloog/vivien.c dissimilarity index 83% index 3976babf..98a64cb8 100644 --- a/test_inputs/codegen/cloog/vivien.c +++ b/test_inputs/codegen/cloog/vivien.c @@ -1,88 +1,86 @@ -{ - for (int c0 = -27 * n + 2; c0 <= 1; c0 += 1) - S1(c0 - 1); - for (int c0 = 2; c0 <= min(2 * n, n + 29); c0 += 1) { - if (c0 >= 3) { - if (2 * n >= c0 + 1) { - S4(c0 - c0 / 2 - 1, c0 / 2 + 1); - if (c0 + 2 >= 2 * n) { - for (int c2 = 1; c2 < -n + c0; c2 += 1) - S5(-n + c0, n, c2); - } else if (c0 >= 5) { - S4(c0 - c0 / 2 - 2, c0 / 2 + 2); - for (int c2 = 1; c2 < c0 - c0 / 2 - 1; c2 += 1) - S5(c0 - c0 / 2 - 1, c0 / 2 + 1, c2); - } - } - for (int c1 = -c0 + c0 / 2 + 3; c1 <= min(-1, n - c0); c1 += 1) { - S6(-c1 + 2, c0 + c1 - 2); - S4(-c1, c0 + c1); - for (int c2 = 1; c2 <= -c1; c2 += 1) - S5(-c1 + 1, c0 + c1 - 1, c2); - } - if (2 * n >= c0 + 3 && c0 >= n + 2) { - S6(-n + c0 + 1, n - 1); - for (int c2 = 1; c2 < -n + c0; c2 += 1) - S5(-n + c0, n, c2); - } - if (n >= 3 && c0 == n + 2) { - S1(n + 1); - S6(2, n); - } else { - if (c0 >= n + 3 && 2 * n >= c0 + 1) - S6(-n + c0, n); - if (c0 >= n + 3) { - S1(c0 - 1); - } else { - if (n + 1 >= c0 && c0 <= 4) { - S1(c0 - 1); - } else if (c0 >= 5 && n + 1 >= c0) { - S1(c0 - 1); - S6(2, c0 - 2); - } - if (n + 1 >= c0) - S6(1, c0 - 1); - } - } - if (n == 2 && c0 == 4) - S1(3); - } else { - S1(1); - } - if (c0 % 2 == 0) - S3(c0 / 2); - for (int c1 = max(1, -n + c0); c1 < (c0 + 1) / 2; c1 += 1) - S2(c0 - c1, c1); - } - for (int c0 = max(2 * n + 1, -27 * n + 2); c0 <= n + 29; c0 += 1) - S1(c0 - 1); - for (int c0 = n + 30; c0 <= 2 * n; c0 += 1) { - if (2 * n >= c0 + 1) { - S4(c0 - c0 / 2 - 1, c0 / 2 + 1); - if (c0 + 2 >= 2 * n) { - for (int c2 = 1; c2 < -n + c0; c2 += 1) - S5(-n + c0, n, c2); - } else { - S4(c0 - c0 / 2 - 2, c0 / 2 + 2); - for (int c2 = 1; c2 < c0 - c0 / 2 - 1; c2 += 1) - S5(c0 - c0 / 2 - 1, c0 / 2 + 1, c2); - } - for (int c1 = -c0 + c0 / 2 + 3; c1 <= n - c0; c1 += 1) { - S6(-c1 + 2, c0 + c1 - 2); - S4(-c1, c0 + c1); - for (int c2 = 1; c2 <= -c1; c2 += 1) - S5(-c1 + 1, c0 + c1 - 1, c2); - } - if (2 * n >= c0 + 3) { - S6(-n + c0 + 1, n - 1); - for (int c2 = 1; c2 < -n + c0; c2 += 1) - S5(-n + c0, n, c2); - } - S6(-n + c0, n); - } - if (c0 % 2 == 0) - S3(c0 / 2); - for (int c1 = -n + c0; c1 < (c0 + 1) / 2; c1 += 1) - S2(c0 - c1, c1); - } -} +for (int c0 = -27 * n + 2; c0 <= 1; c0 += 1) + S1(c0 - 1); +for (int c0 = 2; c0 <= min(2 * n, n + 29); c0 += 1) { + if (c0 >= 3) { + if (2 * n >= c0 + 1) { + S4(c0 - c0 / 2 - 1, c0 / 2 + 1); + if (c0 + 2 >= 2 * n) { + for (int c2 = 1; c2 < -n + c0; c2 += 1) + S5(-n + c0, n, c2); + } else if (c0 >= 5) { + S4(c0 - c0 / 2 - 2, c0 / 2 + 2); + for (int c2 = 1; c2 < c0 - c0 / 2 - 1; c2 += 1) + S5(c0 - c0 / 2 - 1, c0 / 2 + 1, c2); + } + } + for (int c1 = -c0 + c0 / 2 + 3; c1 <= min(-1, n - c0); c1 += 1) { + S6(-c1 + 2, c0 + c1 - 2); + S4(-c1, c0 + c1); + for (int c2 = 1; c2 <= -c1; c2 += 1) + S5(-c1 + 1, c0 + c1 - 1, c2); + } + if (2 * n >= c0 + 3 && c0 >= n + 2) { + S6(-n + c0 + 1, n - 1); + for (int c2 = 1; c2 < -n + c0; c2 += 1) + S5(-n + c0, n, c2); + } + if (n >= 3 && c0 == n + 2) { + S1(n + 1); + S6(2, n); + } else { + if (c0 >= n + 3 && 2 * n >= c0 + 1) + S6(-n + c0, n); + if (c0 >= n + 3) { + S1(c0 - 1); + } else { + if (n + 1 >= c0 && c0 <= 4) { + S1(c0 - 1); + } else if (c0 >= 5 && n + 1 >= c0) { + S1(c0 - 1); + S6(2, c0 - 2); + } + if (n + 1 >= c0) + S6(1, c0 - 1); + } + } + if (n == 2 && c0 == 4) + S1(3); + } else { + S1(1); + } + if (c0 % 2 == 0) + S3(c0 / 2); + for (int c1 = max(1, -n + c0); c1 < (c0 + 1) / 2; c1 += 1) + S2(c0 - c1, c1); +} +for (int c0 = max(2 * n + 1, -27 * n + 2); c0 <= n + 29; c0 += 1) + S1(c0 - 1); +for (int c0 = n + 30; c0 <= 2 * n; c0 += 1) { + if (2 * n >= c0 + 1) { + S4(c0 - c0 / 2 - 1, c0 / 2 + 1); + if (c0 + 2 >= 2 * n) { + for (int c2 = 1; c2 < -n + c0; c2 += 1) + S5(-n + c0, n, c2); + } else { + S4(c0 - c0 / 2 - 2, c0 / 2 + 2); + for (int c2 = 1; c2 < c0 - c0 / 2 - 1; c2 += 1) + S5(c0 - c0 / 2 - 1, c0 / 2 + 1, c2); + } + for (int c1 = -c0 + c0 / 2 + 3; c1 <= n - c0; c1 += 1) { + S6(-c1 + 2, c0 + c1 - 2); + S4(-c1, c0 + c1); + for (int c2 = 1; c2 <= -c1; c2 += 1) + S5(-c1 + 1, c0 + c1 - 1, c2); + } + if (2 * n >= c0 + 3) { + S6(-n + c0 + 1, n - 1); + for (int c2 = 1; c2 < -n + c0; c2 += 1) + S5(-n + c0, n, c2); + } + S6(-n + c0, n); + } + if (c0 % 2 == 0) + S3(c0 / 2); + for (int c1 = -n + c0; c1 < (c0 + 1) / 2; c1 += 1) + S2(c0 - c1, c1); +} diff --git a/test_inputs/codegen/cloog/vivien2.c b/test_inputs/codegen/cloog/vivien2.c dissimilarity index 95% index f13c6d74..b74f1182 100644 --- a/test_inputs/codegen/cloog/vivien2.c +++ b/test_inputs/codegen/cloog/vivien2.c @@ -1,80 +1,78 @@ -{ - for (int c0 = -27 * n + 2; c0 <= 1; c0 += 1) - S1(c0 - 1); - for (int c0 = 2; c0 <= n + 29; c0 += 1) { - if (c0 >= 3) { - S4(c0 - c0 / 2 - 1, c0 / 2 + 1); - if (c0 >= 5 && 2 * n >= c0 + 3) { - S4(c0 - c0 / 2 - 2, c0 / 2 + 2); - for (int c2 = 1; c2 < c0 - c0 / 2 - 1; c2 += 1) - S5(c0 - c0 / 2 - 1, c0 / 2 + 1, c2); - } - for (int c1 = -c0 + c0 / 2 + 3; c1 <= min(-1, n - c0); c1 += 1) { - S6(-c1 + 2, c0 + c1 - 2); - S4(-c1, c0 + c1); - for (int c2 = 1; c2 <= -c1; c2 += 1) - S5(-c1 + 1, c0 + c1 - 1, c2); - } - if (2 * n >= c0 + 3 && c0 >= n + 2) { - S6(-n + c0 + 1, n - 1); - for (int c2 = 1; c2 < -n + c0; c2 += 1) - S5(-n + c0, n, c2); - if (c0 == n + 2) { - S1(n + 1); - S6(2, n); - } - } else if (c0 + 2 >= 2 * n) { - for (int c2 = 1; c2 < -n + c0; c2 += 1) - S5(-n + c0, n, c2); - } - if (c0 >= n + 3) { - S6(-n + c0, n); - S1(c0 - 1); - } else { - if (c0 >= 5 && n + 1 >= c0) { - S1(c0 - 1); - S6(2, c0 - 2); - } else if (c0 <= 4) { - S1(c0 - 1); - } - if (n + 1 >= c0) - S6(1, c0 - 1); - } - } else { - S1(1); - } - if (c0 % 2 == 0) - S3(c0 / 2); - for (int c1 = max(1, -n + c0); c1 < (c0 + 1) / 2; c1 += 1) - S2(c0 - c1, c1); - } - for (int c0 = n + 30; c0 <= 2 * n; c0 += 1) { - if (2 * n >= c0 + 1) { - S4(c0 - c0 / 2 - 1, c0 / 2 + 1); - if (c0 + 2 >= 2 * n) { - for (int c2 = 1; c2 < -n + c0; c2 += 1) - S5(-n + c0, n, c2); - } else { - S4(c0 - c0 / 2 - 2, c0 / 2 + 2); - for (int c2 = 1; c2 < c0 - c0 / 2 - 1; c2 += 1) - S5(c0 - c0 / 2 - 1, c0 / 2 + 1, c2); - } - for (int c1 = -c0 + c0 / 2 + 3; c1 <= n - c0; c1 += 1) { - S6(-c1 + 2, c0 + c1 - 2); - S4(-c1, c0 + c1); - for (int c2 = 1; c2 <= -c1; c2 += 1) - S5(-c1 + 1, c0 + c1 - 1, c2); - } - if (2 * n >= c0 + 3) { - S6(-n + c0 + 1, n - 1); - for (int c2 = 1; c2 < -n + c0; c2 += 1) - S5(-n + c0, n, c2); - } - S6(-n + c0, n); - } - if (c0 % 2 == 0) - S3(c0 / 2); - for (int c1 = -n + c0; c1 < (c0 + 1) / 2; c1 += 1) - S2(c0 - c1, c1); - } -} +for (int c0 = -27 * n + 2; c0 <= 1; c0 += 1) + S1(c0 - 1); +for (int c0 = 2; c0 <= n + 29; c0 += 1) { + if (c0 >= 3) { + S4(c0 - c0 / 2 - 1, c0 / 2 + 1); + if (c0 >= 5 && 2 * n >= c0 + 3) { + S4(c0 - c0 / 2 - 2, c0 / 2 + 2); + for (int c2 = 1; c2 < c0 - c0 / 2 - 1; c2 += 1) + S5(c0 - c0 / 2 - 1, c0 / 2 + 1, c2); + } + for (int c1 = -c0 + c0 / 2 + 3; c1 <= min(-1, n - c0); c1 += 1) { + S6(-c1 + 2, c0 + c1 - 2); + S4(-c1, c0 + c1); + for (int c2 = 1; c2 <= -c1; c2 += 1) + S5(-c1 + 1, c0 + c1 - 1, c2); + } + if (2 * n >= c0 + 3 && c0 >= n + 2) { + S6(-n + c0 + 1, n - 1); + for (int c2 = 1; c2 < -n + c0; c2 += 1) + S5(-n + c0, n, c2); + if (c0 == n + 2) { + S1(n + 1); + S6(2, n); + } + } else if (c0 + 2 >= 2 * n) { + for (int c2 = 1; c2 < -n + c0; c2 += 1) + S5(-n + c0, n, c2); + } + if (c0 >= n + 3) { + S6(-n + c0, n); + S1(c0 - 1); + } else { + if (c0 >= 5 && n + 1 >= c0) { + S1(c0 - 1); + S6(2, c0 - 2); + } else if (c0 <= 4) { + S1(c0 - 1); + } + if (n + 1 >= c0) + S6(1, c0 - 1); + } + } else { + S1(1); + } + if (c0 % 2 == 0) + S3(c0 / 2); + for (int c1 = max(1, -n + c0); c1 < (c0 + 1) / 2; c1 += 1) + S2(c0 - c1, c1); +} +for (int c0 = n + 30; c0 <= 2 * n; c0 += 1) { + if (2 * n >= c0 + 1) { + S4(c0 - c0 / 2 - 1, c0 / 2 + 1); + if (c0 + 2 >= 2 * n) { + for (int c2 = 1; c2 < -n + c0; c2 += 1) + S5(-n + c0, n, c2); + } else { + S4(c0 - c0 / 2 - 2, c0 / 2 + 2); + for (int c2 = 1; c2 < c0 - c0 / 2 - 1; c2 += 1) + S5(c0 - c0 / 2 - 1, c0 / 2 + 1, c2); + } + for (int c1 = -c0 + c0 / 2 + 3; c1 <= n - c0; c1 += 1) { + S6(-c1 + 2, c0 + c1 - 2); + S4(-c1, c0 + c1); + for (int c2 = 1; c2 <= -c1; c2 += 1) + S5(-c1 + 1, c0 + c1 - 1, c2); + } + if (2 * n >= c0 + 3) { + S6(-n + c0 + 1, n - 1); + for (int c2 = 1; c2 < -n + c0; c2 += 1) + S5(-n + c0, n, c2); + } + S6(-n + c0, n); + } + if (c0 % 2 == 0) + S3(c0 / 2); + for (int c1 = -n + c0; c1 < (c0 + 1) / 2; c1 += 1) + S2(c0 - c1, c1); +} diff --git a/test_inputs/codegen/cloog/walters.c b/test_inputs/codegen/cloog/walters.c dissimilarity index 98% index 3854892a..9edd1294 100644 --- a/test_inputs/codegen/cloog/walters.c +++ b/test_inputs/codegen/cloog/walters.c @@ -1,16 +1,14 @@ -{ - S2(1, 0, 1, 0); - S4(1, 0, 1, 0); - S3(2, 0, 1, 1); - S4(2, 0, 1, 1); - for (int c0 = 3; c0 <= 10; c0 += 1) { - if ((c0 + 1) % 3 == 0) { - S3(c0, (c0 - 2) / 3, (c0 + 1) / 3, (c0 + 1) / 3); - } else if (c0 % 3 == 0) { - S1(c0, c0 / 3, c0 / 3, c0 / 3); - } else { - S2(c0, (c0 - 1) / 3, (c0 + 2) / 3, (c0 - 1) / 3); - } - S4(c0, c0 / 3, (c0 - 1) / 3 + 1, c0 - (c0 - 1) / 3 - c0 / 3 - 1); - } -} +S2(1, 0, 1, 0); +S4(1, 0, 1, 0); +S3(2, 0, 1, 1); +S4(2, 0, 1, 1); +for (int c0 = 3; c0 <= 10; c0 += 1) { + if ((c0 + 1) % 3 == 0) { + S3(c0, (c0 - 2) / 3, (c0 + 1) / 3, (c0 + 1) / 3); + } else if (c0 % 3 == 0) { + S1(c0, c0 / 3, c0 / 3, c0 / 3); + } else { + S2(c0, (c0 - 1) / 3, (c0 + 2) / 3, (c0 - 1) / 3); + } + S4(c0, c0 / 3, (c0 - 1) / 3 + 1, c0 - (c0 - 1) / 3 - c0 / 3 - 1); +} diff --git a/test_inputs/codegen/cloog/walters2.c b/test_inputs/codegen/cloog/walters2.c index 27565fbd..ddfd2e5d 100644 --- a/test_inputs/codegen/cloog/walters2.c +++ b/test_inputs/codegen/cloog/walters2.c @@ -1,12 +1,10 @@ -{ - for (int c1 = 0; c1 <= 51; c1 += 1) - S2(0, c1); - for (int c0 = 1; c0 <= 24; c0 += 1) { - S2(c0, 0); - for (int c1 = 1; c1 <= 50; c1 += 1) - S1(c0, c1); - S2(c0, 51); - } - for (int c1 = 0; c1 <= 51; c1 += 1) - S2(25, c1); +for (int c1 = 0; c1 <= 51; c1 += 1) + S2(0, c1); +for (int c0 = 1; c0 <= 24; c0 += 1) { + S2(c0, 0); + for (int c1 = 1; c1 <= 50; c1 += 1) + S1(c0, c1); + S2(c0, 51); } +for (int c1 = 0; c1 <= 51; c1 += 1) + S2(25, c1); diff --git a/test_inputs/codegen/cloog/walters3.c b/test_inputs/codegen/cloog/walters3.c index bafb9acb..93f8a48d 100644 --- a/test_inputs/codegen/cloog/walters3.c +++ b/test_inputs/codegen/cloog/walters3.c @@ -1,7 +1,5 @@ -{ - for (int c0 = 2; c0 <= 8; c0 += 2) { - S1(c0, c0 / 2, c0 / 2); - S2(c0, c0 / 2, c0 / 2); - } - S2(10, 5, 5); +for (int c0 = 2; c0 <= 8; c0 += 2) { + S1(c0, c0 / 2, c0 / 2); + S2(c0, c0 / 2, c0 / 2); } +S2(10, 5, 5); diff --git a/test_inputs/codegen/cloog/yosr.c b/test_inputs/codegen/cloog/yosr.c index 1c20057b..711d44d1 100644 --- a/test_inputs/codegen/cloog/yosr.c +++ b/test_inputs/codegen/cloog/yosr.c @@ -1,12 +1,10 @@ -{ - for (int c0 = 1; c0 < n; c0 += 1) { - for (int c2 = c0 + 1; c2 <= n; c2 += 1) - S1(c0, c2); - for (int c1 = 1; c1 < c0; c1 += 1) - for (int c2 = c1 + 1; c2 <= n; c2 += 1) - S2(c1, c2, c0); - } - for (int c1 = 1; c1 < n; c1 += 1) +for (int c0 = 1; c0 < n; c0 += 1) { + for (int c2 = c0 + 1; c2 <= n; c2 += 1) + S1(c0, c2); + for (int c1 = 1; c1 < c0; c1 += 1) for (int c2 = c1 + 1; c2 <= n; c2 += 1) - S2(c1, c2, n); + S2(c1, c2, c0); } +for (int c1 = 1; c1 < n; c1 += 1) + for (int c2 = c1 + 1; c2 <= n; c2 += 1) + S2(c1, c2, n); diff --git a/test_inputs/codegen/cloog/yosr2.c b/test_inputs/codegen/cloog/yosr2.c index 1a3e992d..449743d8 100644 --- a/test_inputs/codegen/cloog/yosr2.c +++ b/test_inputs/codegen/cloog/yosr2.c @@ -1,13 +1,11 @@ -{ - for (int c1 = 1; c1 <= M; c1 += 1) - S2(c1); - for (int c0 = 2; c0 <= M; c0 += 1) { - for (int c2 = 1; c2 < c0; c2 += 1) - S1(c0, c2); - for (int c1 = 1; c1 < c0; c1 += 1) - S4(c1, c0); - for (int c2 = c0 + 1; c2 <= M; c2 += 1) - for (int c3 = 1; c3 < c0; c3 += 1) - S3(c0, c2, c3); - } +for (int c1 = 1; c1 <= M; c1 += 1) + S2(c1); +for (int c0 = 2; c0 <= M; c0 += 1) { + for (int c2 = 1; c2 < c0; c2 += 1) + S1(c0, c2); + for (int c1 = 1; c1 < c0; c1 += 1) + S4(c1, c0); + for (int c2 = c0 + 1; c2 <= M; c2 += 1) + for (int c3 = 1; c3 < c0; c3 += 1) + S3(c0, c2, c3); } diff --git a/test_inputs/codegen/cloog/youcefn.c b/test_inputs/codegen/cloog/youcefn.c index 1107790b..456c688c 100644 --- a/test_inputs/codegen/cloog/youcefn.c +++ b/test_inputs/codegen/cloog/youcefn.c @@ -1,10 +1,8 @@ -{ - for (int c0 = 1; c0 <= n; c0 += 1) { - S1(c0, c0); - for (int c1 = c0; c1 <= n; c1 += 1) - S2(c0, c1); - S3(c0, n); - } - for (int c0 = n + 1; c0 <= m; c0 += 1) - S3(c0, n); +for (int c0 = 1; c0 <= n; c0 += 1) { + S1(c0, c0); + for (int c1 = c0; c1 <= n; c1 += 1) + S2(c0, c1); + S3(c0, n); } +for (int c0 = n + 1; c0 <= m; c0 += 1) + S3(c0, n); diff --git a/test_inputs/codegen/component0.c b/test_inputs/codegen/component0.c index 9b1c6850..a5f0e600 100644 --- a/test_inputs/codegen/component0.c +++ b/test_inputs/codegen/component0.c @@ -1,5 +1,3 @@ -{ - A(); - for (int c0 = 0; c0 <= 9; c0 += 1) - B(c0); -} +A(); +for (int c0 = 0; c0 <= 9; c0 += 1) + B(c0); diff --git a/test_inputs/codegen/component1.c b/test_inputs/codegen/component1.c index 9b1c6850..a5f0e600 100644 --- a/test_inputs/codegen/component1.c +++ b/test_inputs/codegen/component1.c @@ -1,5 +1,3 @@ -{ - A(); - for (int c0 = 0; c0 <= 9; c0 += 1) - B(c0); -} +A(); +for (int c0 = 0; c0 <= 9; c0 += 1) + B(c0); diff --git a/test_inputs/codegen/component3.c b/test_inputs/codegen/component3.c index 9b1c6850..a5f0e600 100644 --- a/test_inputs/codegen/component3.c +++ b/test_inputs/codegen/component3.c @@ -1,5 +1,3 @@ -{ - A(); - for (int c0 = 0; c0 <= 9; c0 += 1) - B(c0); -} +A(); +for (int c0 = 0; c0 <= 9; c0 += 1) + B(c0); diff --git a/test_inputs/codegen/component4.c b/test_inputs/codegen/component4.c index 1f188dd0..4b9229c0 100644 --- a/test_inputs/codegen/component4.c +++ b/test_inputs/codegen/component4.c @@ -1,7 +1,5 @@ -{ - for (int c1 = 0; c1 <= 9; c1 += 1) - A(c1); - for (int c0 = 0; c0 <= 9; c0 += 1) - for (int c2 = 0; c2 <= 9; c2 += 1) - B(c0, c2); -} +for (int c1 = 0; c1 <= 9; c1 += 1) + A(c1); +for (int c0 = 0; c0 <= 9; c0 += 1) + for (int c2 = 0; c2 <= 9; c2 += 1) + B(c0, c2); diff --git a/test_inputs/codegen/component6.c b/test_inputs/codegen/component6.c index 9b1c6850..a5f0e600 100644 --- a/test_inputs/codegen/component6.c +++ b/test_inputs/codegen/component6.c @@ -1,5 +1,3 @@ -{ - A(); - for (int c0 = 0; c0 <= 9; c0 += 1) - B(c0); -} +A(); +for (int c0 = 0; c0 <= 9; c0 += 1) + B(c0); diff --git a/test_inputs/codegen/component7.c b/test_inputs/codegen/component7.c index ca0a0def..04218f9e 100644 --- a/test_inputs/codegen/component7.c +++ b/test_inputs/codegen/component7.c @@ -1,6 +1,4 @@ -{ - S(); - for (int c0 = 0; c0 < K; c0 += 32) - for (int c1 = c0; c1 <= min(K - 1, c0 + 31); c1 += 1) - T(c1); -} +S(); +for (int c0 = 0; c0 < K; c0 += 32) + for (int c1 = c0; c1 <= min(K - 1, c0 + 31); c1 += 1) + T(c1); diff --git a/test_inputs/codegen/group.c b/test_inputs/codegen/group.c index ff65b13c..9fad2400 100644 --- a/test_inputs/codegen/group.c +++ b/test_inputs/codegen/group.c @@ -1,7 +1,5 @@ -{ - if (N == 0) { - C(); - A(); - } - B(); +if (N == 0) { + C(); + A(); } +B(); diff --git a/test_inputs/codegen/isolate1.c b/test_inputs/codegen/isolate1.c index db6edf89..8bbc0c06 100644 --- a/test_inputs/codegen/isolate1.c +++ b/test_inputs/codegen/isolate1.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 0; c0 <= 3; c0 += 1) - A(c0); - for (int c0 = 4; c0 <= 6; c0 += 1) - A(c0); - for (int c0 = 7; c0 <= 99; c0 += 1) - A(c0); -} +for (int c0 = 0; c0 <= 3; c0 += 1) + A(c0); +for (int c0 = 4; c0 <= 6; c0 += 1) + A(c0); +for (int c0 = 7; c0 <= 99; c0 += 1) + A(c0); diff --git a/test_inputs/codegen/isolate3.c b/test_inputs/codegen/isolate3.c index 921ea490..7955efa0 100644 --- a/test_inputs/codegen/isolate3.c +++ b/test_inputs/codegen/isolate3.c @@ -1,17 +1,15 @@ -{ - for (int c0 = 0; c0 <= 9; c0 += 1) - A(c0); - A(10); - A(11); - A(12); - A(13); - A(14); - A(15); - A(16); - A(17); - A(18); - A(19); - A(20); - for (int c0 = 21; c0 <= 99; c0 += 1) - A(c0); -} +for (int c0 = 0; c0 <= 9; c0 += 1) + A(c0); +A(10); +A(11); +A(12); +A(13); +A(14); +A(15); +A(16); +A(17); +A(18); +A(19); +A(20); +for (int c0 = 21; c0 <= 99; c0 += 1) + A(c0); diff --git a/test_inputs/codegen/isolate4.c b/test_inputs/codegen/isolate4.c index 71484e15..870848e2 100644 --- a/test_inputs/codegen/isolate4.c +++ b/test_inputs/codegen/isolate4.c @@ -1,13 +1,11 @@ -{ - A(0); - A(1); - A(2); - A(3); - A(4); - for (int c0 = 5; c0 <= 15; c0 += 1) - A(c0); - A(16); - A(17); - A(18); - A(19); -} +A(0); +A(1); +A(2); +A(3); +A(4); +for (int c0 = 5; c0 <= 15; c0 += 1) + A(c0); +A(16); +A(17); +A(18); +A(19); diff --git a/test_inputs/codegen/isolate5.c b/test_inputs/codegen/isolate5.c dissimilarity index 97% index 0f1588d8..f14a4888 100644 --- a/test_inputs/codegen/isolate5.c +++ b/test_inputs/codegen/isolate5.c @@ -1,29 +1,27 @@ -{ - for (int c0 = 0; c0 <= 9; c0 += 1) { - if ((c0 + 1) % 2 == 0) { - for (int c1 = 0; c1 <= 1; c1 += 1) - B((c0 - 1) / 2, c1); - } else { - for (int c1 = 0; c1 <= 1; c1 += 1) - A(c0 / 2, c1); - } - } - for (int c0 = 10; c0 <= 89; c0 += 1) { - if ((c0 + 1) % 2 == 0) { - for (int c1 = 0; c1 <= 1; c1 += 1) - B((c0 - 1) / 2, c1); - } else { - for (int c1 = 0; c1 <= 1; c1 += 1) - A(c0 / 2, c1); - } - } - for (int c0 = 90; c0 <= 199; c0 += 1) { - if ((c0 + 1) % 2 == 0) { - for (int c1 = 0; c1 <= 1; c1 += 1) - B((c0 - 1) / 2, c1); - } else { - for (int c1 = 0; c1 <= 1; c1 += 1) - A(c0 / 2, c1); - } - } -} +for (int c0 = 0; c0 <= 9; c0 += 1) { + if ((c0 + 1) % 2 == 0) { + for (int c1 = 0; c1 <= 1; c1 += 1) + B((c0 - 1) / 2, c1); + } else { + for (int c1 = 0; c1 <= 1; c1 += 1) + A(c0 / 2, c1); + } +} +for (int c0 = 10; c0 <= 89; c0 += 1) { + if ((c0 + 1) % 2 == 0) { + for (int c1 = 0; c1 <= 1; c1 += 1) + B((c0 - 1) / 2, c1); + } else { + for (int c1 = 0; c1 <= 1; c1 += 1) + A(c0 / 2, c1); + } +} +for (int c0 = 90; c0 <= 199; c0 += 1) { + if ((c0 + 1) % 2 == 0) { + for (int c1 = 0; c1 <= 1; c1 += 1) + B((c0 - 1) / 2, c1); + } else { + for (int c1 = 0; c1 <= 1; c1 += 1) + A(c0 / 2, c1); + } +} diff --git a/test_inputs/codegen/isolate6.c b/test_inputs/codegen/isolate6.c dissimilarity index 99% index e92a2b89..db798041 100644 --- a/test_inputs/codegen/isolate6.c +++ b/test_inputs/codegen/isolate6.c @@ -1,26 +1,24 @@ -{ - for (int c0 = 0; c0 <= 8; c0 += 1) { - for (int c1 = 0; c1 <= -c0 + 8; c1 += 1) - for (int c2 = 10 * c0; c2 <= 10 * c0 + 9; c2 += 1) { - A(c2, 10 * c1); - A(c2, 10 * c1 + 1); - A(c2, 10 * c1 + 2); - A(c2, 10 * c1 + 3); - A(c2, 10 * c1 + 4); - A(c2, 10 * c1 + 5); - A(c2, 10 * c1 + 6); - A(c2, 10 * c1 + 7); - A(c2, 10 * c1 + 8); - A(c2, 10 * c1 + 9); - } - for (int c1 = -c0 + 9; c1 <= -c0 + 10; c1 += 1) - for (int c2 = 10 * c0; c2 <= min(10 * c0 + 9, -10 * c1 + 100); c2 += 1) - for (int c3 = 10 * c1; c3 <= min(10 * c1 + 9, -c2 + 100); c3 += 1) - A(c2, c3); - } - for (int c0 = 9; c0 <= 10; c0 += 1) - for (int c1 = 0; c1 <= -c0 + 10; c1 += 1) - for (int c2 = 10 * c0; c2 <= min(10 * c0 + 9, -10 * c1 + 100); c2 += 1) - for (int c3 = 10 * c1; c3 <= min(10 * c1 + 9, -c2 + 100); c3 += 1) - A(c2, c3); -} +for (int c0 = 0; c0 <= 8; c0 += 1) { + for (int c1 = 0; c1 <= -c0 + 8; c1 += 1) + for (int c2 = 10 * c0; c2 <= 10 * c0 + 9; c2 += 1) { + A(c2, 10 * c1); + A(c2, 10 * c1 + 1); + A(c2, 10 * c1 + 2); + A(c2, 10 * c1 + 3); + A(c2, 10 * c1 + 4); + A(c2, 10 * c1 + 5); + A(c2, 10 * c1 + 6); + A(c2, 10 * c1 + 7); + A(c2, 10 * c1 + 8); + A(c2, 10 * c1 + 9); + } + for (int c1 = -c0 + 9; c1 <= -c0 + 10; c1 += 1) + for (int c2 = 10 * c0; c2 <= min(10 * c0 + 9, -10 * c1 + 100); c2 += 1) + for (int c3 = 10 * c1; c3 <= min(10 * c1 + 9, -c2 + 100); c3 += 1) + A(c2, c3); +} +for (int c0 = 9; c0 <= 10; c0 += 1) + for (int c1 = 0; c1 <= -c0 + 10; c1 += 1) + for (int c2 = 10 * c0; c2 <= min(10 * c0 + 9, -10 * c1 + 100); c2 += 1) + for (int c3 = 10 * c1; c3 <= min(10 * c1 + 9, -c2 + 100); c3 += 1) + A(c2, c3); diff --git a/test_inputs/codegen/isolate7.c b/test_inputs/codegen/isolate7.c dissimilarity index 81% index 1eac2027..aac1337a 100644 --- a/test_inputs/codegen/isolate7.c +++ b/test_inputs/codegen/isolate7.c @@ -1,29 +1,27 @@ -{ - for (int c0 = 0; c0 < n - 31; c0 += 32) - for (int c1 = 0; c1 <= n; c1 += 32) { - if (n >= c1 + 32) { - for (int c2 = 0; c2 <= 31; c2 += 1) - for (int c3 = 0; c3 <= 31; c3 += 1) - S_1(c0 + c2, c1 + c3); - } else { - for (int c2 = 0; c2 <= 31; c2 += 1) { - for (int c3 = 0; c3 < n - c1; c3 += 1) - S_1(c0 + c2, c1 + c3); - S_2(c0 + c2); - } - } - } - for (int c1 = 0; c1 < n; c1 += 32) { - if (n >= c1 + 32) { - for (int c2 = 0; c2 < (n + 32) % 32; c2 += 1) - for (int c3 = 0; c3 <= 31; c3 += 1) - S_1(-((n + 32) % 32) + n + c2, c1 + c3); - } else { - for (int c2 = 0; c2 < n - c1; c2 += 1) { - for (int c3 = 0; c3 < n - c1; c3 += 1) - S_1(c1 + c2, c1 + c3); - S_2(c1 + c2); - } - } - } -} +for (int c0 = 0; c0 < n - 31; c0 += 32) + for (int c1 = 0; c1 <= n; c1 += 32) { + if (n >= c1 + 32) { + for (int c2 = 0; c2 <= 31; c2 += 1) + for (int c3 = 0; c3 <= 31; c3 += 1) + S_1(c0 + c2, c1 + c3); + } else { + for (int c2 = 0; c2 <= 31; c2 += 1) { + for (int c3 = 0; c3 < n - c1; c3 += 1) + S_1(c0 + c2, c1 + c3); + S_2(c0 + c2); + } + } + } +for (int c1 = 0; c1 < n; c1 += 32) { + if (n >= c1 + 32) { + for (int c2 = 0; c2 < (n + 32) % 32; c2 += 1) + for (int c3 = 0; c3 <= 31; c3 += 1) + S_1(-((n + 32) % 32) + n + c2, c1 + c3); + } else { + for (int c2 = 0; c2 < n - c1; c2 += 1) { + for (int c3 = 0; c3 < n - c1; c3 += 1) + S_1(c1 + c2, c1 + c3); + S_2(c1 + c2); + } + } +} diff --git a/test_inputs/codegen/omega/basics-0.c b/test_inputs/codegen/omega/basics-0.c index 53995e9e..1391c316 100644 --- a/test_inputs/codegen/omega/basics-0.c +++ b/test_inputs/codegen/omega/basics-0.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 5; c0 <= 8; c0 += 1) - s0(c0); - for (int c0 = 10; c0 <= 16; c0 += 2) - s0(c0); - for (int c0 = 20; c0 <= 25; c0 += 1) - s0(c0); -} +for (int c0 = 5; c0 <= 8; c0 += 1) + s0(c0); +for (int c0 = 10; c0 <= 16; c0 += 2) + s0(c0); +for (int c0 = 20; c0 <= 25; c0 += 1) + s0(c0); diff --git a/test_inputs/codegen/omega/chosol-0.c b/test_inputs/codegen/omega/chosol-0.c index 464ee493..4317a0fc 100644 --- a/test_inputs/codegen/omega/chosol-0.c +++ b/test_inputs/codegen/omega/chosol-0.c @@ -1,9 +1,7 @@ -{ - for (int c1 = 2; c1 <= n; c1 += 1) - s0(c1); - for (int c1 = 1; c1 < n; c1 += 1) { - for (int c3 = c1 + 1; c3 <= n; c3 += 1) - s1(c3, c1); - s2(c1 + 1); - } +for (int c1 = 2; c1 <= n; c1 += 1) + s0(c1); +for (int c1 = 1; c1 < n; c1 += 1) { + for (int c3 = c1 + 1; c3 <= n; c3 += 1) + s1(c3, c1); + s2(c1 + 1); } diff --git a/test_inputs/codegen/omega/chosol-1.c b/test_inputs/codegen/omega/chosol-1.c index 464ee493..4317a0fc 100644 --- a/test_inputs/codegen/omega/chosol-1.c +++ b/test_inputs/codegen/omega/chosol-1.c @@ -1,9 +1,7 @@ -{ - for (int c1 = 2; c1 <= n; c1 += 1) - s0(c1); - for (int c1 = 1; c1 < n; c1 += 1) { - for (int c3 = c1 + 1; c3 <= n; c3 += 1) - s1(c3, c1); - s2(c1 + 1); - } +for (int c1 = 2; c1 <= n; c1 += 1) + s0(c1); +for (int c1 = 1; c1 < n; c1 += 1) { + for (int c3 = c1 + 1; c3 <= n; c3 += 1) + s1(c3, c1); + s2(c1 + 1); } diff --git a/test_inputs/codegen/omega/code_gen-2.c b/test_inputs/codegen/omega/code_gen-2.c dissimilarity index 98% index f92e5836..fa128c1e 100644 --- a/test_inputs/codegen/omega/code_gen-2.c +++ b/test_inputs/codegen/omega/code_gen-2.c @@ -1,17 +1,15 @@ -{ - for (int c1 = 0; c1 <= 7; c1 += 1) - s0(1, c1); - for (int c0 = 2; c0 <= 6; c0 += 1) { - for (int c1 = 0; c1 < c0 - 1; c1 += 1) - s1(c0, c1); - for (int c1 = c0 - 1; c1 <= 4; c1 += 1) { - s1(c0, c1); - s0(c0, c1); - } - for (int c1 = 5; c1 <= 7; c1 += 1) - s0(c0, c1); - } - for (int c0 = 7; c0 <= 8; c0 += 1) - for (int c1 = c0 - 1; c1 <= 7; c1 += 1) - s0(c0, c1); -} +for (int c1 = 0; c1 <= 7; c1 += 1) + s0(1, c1); +for (int c0 = 2; c0 <= 6; c0 += 1) { + for (int c1 = 0; c1 < c0 - 1; c1 += 1) + s1(c0, c1); + for (int c1 = c0 - 1; c1 <= 4; c1 += 1) { + s1(c0, c1); + s0(c0, c1); + } + for (int c1 = 5; c1 <= 7; c1 += 1) + s0(c0, c1); +} +for (int c0 = 7; c0 <= 8; c0 += 1) + for (int c1 = c0 - 1; c1 <= 7; c1 += 1) + s0(c0, c1); diff --git a/test_inputs/codegen/omega/collard-0.c b/test_inputs/codegen/omega/collard-0.c index 413fbda4..ca71cfac 100644 --- a/test_inputs/codegen/omega/collard-0.c +++ b/test_inputs/codegen/omega/collard-0.c @@ -1,16 +1,14 @@ -{ - for (int c4 = 1; c4 <= n; c4 += 1) - s2(c4); - for (int c1 = 1; c1 < n; c1 += 1) { - for (int c4 = 0; c4 < n - c1; c4 += 1) - s0(c1, n - c4); - for (int c3 = 0; c3 < n - c1; c3 += 1) - for (int c4 = c1 + 1; c4 <= n; c4 += 1) - s1(c1, n - c3, c4); - } - for (int c1 = 1; c1 <= n; c1 += 1) { - s4(c1); - for (int c3 = c1 + 1; c3 <= n; c3 += 1) - s3(c3, c1); - } +for (int c4 = 1; c4 <= n; c4 += 1) + s2(c4); +for (int c1 = 1; c1 < n; c1 += 1) { + for (int c4 = 0; c4 < n - c1; c4 += 1) + s0(c1, n - c4); + for (int c3 = 0; c3 < n - c1; c3 += 1) + for (int c4 = c1 + 1; c4 <= n; c4 += 1) + s1(c1, n - c3, c4); +} +for (int c1 = 1; c1 <= n; c1 += 1) { + s4(c1); + for (int c3 = c1 + 1; c3 <= n; c3 += 1) + s3(c3, c1); } diff --git a/test_inputs/codegen/omega/fc1-1.c b/test_inputs/codegen/omega/fc1-1.c dissimilarity index 99% index 768a04fb..14420335 100644 --- a/test_inputs/codegen/omega/fc1-1.c +++ b/test_inputs/codegen/omega/fc1-1.c @@ -1,17 +1,15 @@ -{ - for (int c3 = 1; c3 <= n; c3 += 1) - s2(c3); - for (int c0 = 0; c0 < n - 1; c0 += 1) { - for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) - s0(c0 + 1, n - c3); - for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) - for (int c6 = c0 + 2; c6 <= n; c6 += 1) - s1(c0 + 1, n - c3, c6); - } - for (int c0 = n - 1; c0 < 2 * n - 1; c0 += 1) { - if (c0 >= n) - for (int c2 = -n + c0 + 2; c2 <= n; c2 += 1) - s3(c2, -n + c0 + 1); - s4(-n + c0 + 2); - } -} +for (int c3 = 1; c3 <= n; c3 += 1) + s2(c3); +for (int c0 = 0; c0 < n - 1; c0 += 1) { + for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) + s0(c0 + 1, n - c3); + for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) + for (int c6 = c0 + 2; c6 <= n; c6 += 1) + s1(c0 + 1, n - c3, c6); +} +for (int c0 = n - 1; c0 < 2 * n - 1; c0 += 1) { + if (c0 >= n) + for (int c2 = -n + c0 + 2; c2 <= n; c2 += 1) + s3(c2, -n + c0 + 1); + s4(-n + c0 + 2); +} diff --git a/test_inputs/codegen/omega/fc1-2.c b/test_inputs/codegen/omega/fc1-2.c dissimilarity index 99% index 768a04fb..14420335 100644 --- a/test_inputs/codegen/omega/fc1-2.c +++ b/test_inputs/codegen/omega/fc1-2.c @@ -1,17 +1,15 @@ -{ - for (int c3 = 1; c3 <= n; c3 += 1) - s2(c3); - for (int c0 = 0; c0 < n - 1; c0 += 1) { - for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) - s0(c0 + 1, n - c3); - for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) - for (int c6 = c0 + 2; c6 <= n; c6 += 1) - s1(c0 + 1, n - c3, c6); - } - for (int c0 = n - 1; c0 < 2 * n - 1; c0 += 1) { - if (c0 >= n) - for (int c2 = -n + c0 + 2; c2 <= n; c2 += 1) - s3(c2, -n + c0 + 1); - s4(-n + c0 + 2); - } -} +for (int c3 = 1; c3 <= n; c3 += 1) + s2(c3); +for (int c0 = 0; c0 < n - 1; c0 += 1) { + for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) + s0(c0 + 1, n - c3); + for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) + for (int c6 = c0 + 2; c6 <= n; c6 += 1) + s1(c0 + 1, n - c3, c6); +} +for (int c0 = n - 1; c0 < 2 * n - 1; c0 += 1) { + if (c0 >= n) + for (int c2 = -n + c0 + 2; c2 <= n; c2 += 1) + s3(c2, -n + c0 + 1); + s4(-n + c0 + 2); +} diff --git a/test_inputs/codegen/omega/fc2-1.c b/test_inputs/codegen/omega/fc2-1.c dissimilarity index 99% index 768a04fb..14420335 100644 --- a/test_inputs/codegen/omega/fc2-1.c +++ b/test_inputs/codegen/omega/fc2-1.c @@ -1,17 +1,15 @@ -{ - for (int c3 = 1; c3 <= n; c3 += 1) - s2(c3); - for (int c0 = 0; c0 < n - 1; c0 += 1) { - for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) - s0(c0 + 1, n - c3); - for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) - for (int c6 = c0 + 2; c6 <= n; c6 += 1) - s1(c0 + 1, n - c3, c6); - } - for (int c0 = n - 1; c0 < 2 * n - 1; c0 += 1) { - if (c0 >= n) - for (int c2 = -n + c0 + 2; c2 <= n; c2 += 1) - s3(c2, -n + c0 + 1); - s4(-n + c0 + 2); - } -} +for (int c3 = 1; c3 <= n; c3 += 1) + s2(c3); +for (int c0 = 0; c0 < n - 1; c0 += 1) { + for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) + s0(c0 + 1, n - c3); + for (int c3 = 0; c3 < n - c0 - 1; c3 += 1) + for (int c6 = c0 + 2; c6 <= n; c6 += 1) + s1(c0 + 1, n - c3, c6); +} +for (int c0 = n - 1; c0 < 2 * n - 1; c0 += 1) { + if (c0 >= n) + for (int c2 = -n + c0 + 2; c2 <= n; c2 += 1) + s3(c2, -n + c0 + 1); + s4(-n + c0 + 2); +} diff --git a/test_inputs/codegen/omega/lift1-5.c b/test_inputs/codegen/omega/lift1-5.c dissimilarity index 100% index 2a24f683..9ef20eff 100644 --- a/test_inputs/codegen/omega/lift1-5.c +++ b/test_inputs/codegen/omega/lift1-5.c @@ -1,16 +1,14 @@ -{ - for (int c0 = 1; c0 <= 60; c0 += 1) - for (int c1 = 1; c1 <= 100; c1 += 1) - for (int c2 = 1; c2 <= 100; c2 += 1) - for (int c3 = 1; c3 <= 100; c3 += 1) - for (int c4 = 1; c4 <= 100; c4 += 1) { - s1(c0, c1, c2, c3, c4); - s0(c0, c1, c2, c3, c4); - } - for (int c0 = 61; c0 <= 100; c0 += 1) - for (int c1 = 1; c1 <= 100; c1 += 1) - for (int c2 = 1; c2 <= 100; c2 += 1) - for (int c3 = 1; c3 <= 100; c3 += 1) - for (int c4 = 1; c4 <= 100; c4 += 1) - s1(c0, c1, c2, c3, c4); -} +for (int c0 = 1; c0 <= 60; c0 += 1) + for (int c1 = 1; c1 <= 100; c1 += 1) + for (int c2 = 1; c2 <= 100; c2 += 1) + for (int c3 = 1; c3 <= 100; c3 += 1) + for (int c4 = 1; c4 <= 100; c4 += 1) { + s1(c0, c1, c2, c3, c4); + s0(c0, c1, c2, c3, c4); + } +for (int c0 = 61; c0 <= 100; c0 += 1) + for (int c1 = 1; c1 <= 100; c1 += 1) + for (int c2 = 1; c2 <= 100; c2 += 1) + for (int c3 = 1; c3 <= 100; c3 += 1) + for (int c4 = 1; c4 <= 100; c4 += 1) + s1(c0, c1, c2, c3, c4); diff --git a/test_inputs/codegen/omega/lift2-5.c b/test_inputs/codegen/omega/lift2-5.c dissimilarity index 100% index 16bd6dba..3c10b8ad 100644 --- a/test_inputs/codegen/omega/lift2-5.c +++ b/test_inputs/codegen/omega/lift2-5.c @@ -1,22 +1,20 @@ -{ - for (int c0 = 1; c0 <= 4; c0 += 1) - for (int c1 = 1; c1 <= 100; c1 += 1) - for (int c2 = 1; c2 <= 100; c2 += 1) - for (int c3 = 1; c3 <= 100; c3 += 1) - for (int c4 = 1; c4 <= 100; c4 += 1) - s1(c0, c1, c2, c3, c4); - for (int c0 = 5; c0 <= 60; c0 += 1) - for (int c1 = 1; c1 <= 100; c1 += 1) - for (int c2 = 1; c2 <= 100; c2 += 1) - for (int c3 = 1; c3 <= 100; c3 += 1) - for (int c4 = 1; c4 <= 100; c4 += 1) { - s1(c0, c1, c2, c3, c4); - s0(c0, c1, c2, c3, c4); - } - for (int c0 = 61; c0 <= 100; c0 += 1) - for (int c1 = 1; c1 <= 100; c1 += 1) - for (int c2 = 1; c2 <= 100; c2 += 1) - for (int c3 = 1; c3 <= 100; c3 += 1) - for (int c4 = 1; c4 <= 100; c4 += 1) - s1(c0, c1, c2, c3, c4); -} +for (int c0 = 1; c0 <= 4; c0 += 1) + for (int c1 = 1; c1 <= 100; c1 += 1) + for (int c2 = 1; c2 <= 100; c2 += 1) + for (int c3 = 1; c3 <= 100; c3 += 1) + for (int c4 = 1; c4 <= 100; c4 += 1) + s1(c0, c1, c2, c3, c4); +for (int c0 = 5; c0 <= 60; c0 += 1) + for (int c1 = 1; c1 <= 100; c1 += 1) + for (int c2 = 1; c2 <= 100; c2 += 1) + for (int c3 = 1; c3 <= 100; c3 += 1) + for (int c4 = 1; c4 <= 100; c4 += 1) { + s1(c0, c1, c2, c3, c4); + s0(c0, c1, c2, c3, c4); + } +for (int c0 = 61; c0 <= 100; c0 += 1) + for (int c1 = 1; c1 <= 100; c1 += 1) + for (int c2 = 1; c2 <= 100; c2 += 1) + for (int c3 = 1; c3 <= 100; c3 += 1) + for (int c4 = 1; c4 <= 100; c4 += 1) + s1(c0, c1, c2, c3, c4); diff --git a/test_inputs/codegen/omega/m12-1.c b/test_inputs/codegen/omega/m12-1.c dissimilarity index 97% index f72181e7..68d3c361 100644 --- a/test_inputs/codegen/omega/m12-1.c +++ b/test_inputs/codegen/omega/m12-1.c @@ -1,25 +1,23 @@ -{ - for (int c1 = 1; c1 <= n; c1 += 1) - for (int c2 = 1; c2 <= m; c2 += 1) { - s0(1, c1, c2, 0); - s1(1, c1, c2, 0); - } - for (int c1 = 1; c1 <= n; c1 += 1) { - s3(2, c1, 0, 0); - s2(2, c1, 0, 0); - } - for (int c1 = 1; c1 <= m; c1 += 1) { - for (int c3 = 1; c3 <= n; c3 += 1) { - s4(3, c1, 1, c3); - s5(3, c1, 1, c3); - } - for (int c3 = 1; c3 <= n; c3 += 1) { - s7(3, c1, 2, c3); - s6(3, c1, 2, c3); - } - } - for (int c1 = 1; c1 <= m; c1 += 1) { - s8(4, c1, 0, 0); - s9(4, c1, 0, 0); - } -} +for (int c1 = 1; c1 <= n; c1 += 1) + for (int c2 = 1; c2 <= m; c2 += 1) { + s0(1, c1, c2, 0); + s1(1, c1, c2, 0); + } +for (int c1 = 1; c1 <= n; c1 += 1) { + s3(2, c1, 0, 0); + s2(2, c1, 0, 0); +} +for (int c1 = 1; c1 <= m; c1 += 1) { + for (int c3 = 1; c3 <= n; c3 += 1) { + s4(3, c1, 1, c3); + s5(3, c1, 1, c3); + } + for (int c3 = 1; c3 <= n; c3 += 1) { + s7(3, c1, 2, c3); + s6(3, c1, 2, c3); + } +} +for (int c1 = 1; c1 <= m; c1 += 1) { + s8(4, c1, 0, 0); + s9(4, c1, 0, 0); +} diff --git a/test_inputs/codegen/omega/m2-1.c b/test_inputs/codegen/omega/m2-1.c index 09255e0c..b7468358 100644 --- a/test_inputs/codegen/omega/m2-1.c +++ b/test_inputs/codegen/omega/m2-1.c @@ -1,12 +1,10 @@ -{ - for (int c0 = 2; c0 <= 4; c0 += 1) - for (int c1 = 2; c1 <= 9; c1 += 1) - s0(c0, c1); - for (int c0 = 5; c0 <= 9; c0 += 1) { - s1(c0, 1); - for (int c1 = 2; c1 <= 9; c1 += 1) { - s1(c0, c1); - s0(c0, c1); - } +for (int c0 = 2; c0 <= 4; c0 += 1) + for (int c1 = 2; c1 <= 9; c1 += 1) + s0(c0, c1); +for (int c0 = 5; c0 <= 9; c0 += 1) { + s1(c0, 1); + for (int c1 = 2; c1 <= 9; c1 += 1) { + s1(c0, c1); + s0(c0, c1); } } diff --git a/test_inputs/codegen/omega/p6-0.c b/test_inputs/codegen/omega/p6-0.c index 53995e9e..1391c316 100644 --- a/test_inputs/codegen/omega/p6-0.c +++ b/test_inputs/codegen/omega/p6-0.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 5; c0 <= 8; c0 += 1) - s0(c0); - for (int c0 = 10; c0 <= 16; c0 += 2) - s0(c0); - for (int c0 = 20; c0 <= 25; c0 += 1) - s0(c0); -} +for (int c0 = 5; c0 <= 8; c0 += 1) + s0(c0); +for (int c0 = 10; c0 <= 16; c0 += 2) + s0(c0); +for (int c0 = 20; c0 <= 25; c0 += 1) + s0(c0); diff --git a/test_inputs/codegen/omega/stride7-1.c b/test_inputs/codegen/omega/stride7-1.c index e79d58de..b8379dfa 100644 --- a/test_inputs/codegen/omega/stride7-1.c +++ b/test_inputs/codegen/omega/stride7-1.c @@ -1,14 +1,12 @@ -{ - for (int c0 = 1; c0 <= 3; c0 += 1) - for (int c1 = 1; c1 <= 9; c1 += 1) - s1(c1, c0); - for (int c0 = 4; c0 <= 9; c0 += 1) - for (int c1 = 1; c1 <= 9; c1 += 1) { - if (c0 % 4 == 0) - s0(c1, c0 / 4); - s1(c1, c0); - } - for (int c0 = 3; c0 <= 9; c0 += 1) - for (int c1 = 1; c1 <= 9; c1 += 1) - s0(c1, c0); -} +for (int c0 = 1; c0 <= 3; c0 += 1) + for (int c1 = 1; c1 <= 9; c1 += 1) + s1(c1, c0); +for (int c0 = 4; c0 <= 9; c0 += 1) + for (int c1 = 1; c1 <= 9; c1 += 1) { + if (c0 % 4 == 0) + s0(c1, c0 / 4); + s1(c1, c0); + } +for (int c0 = 3; c0 <= 9; c0 += 1) + for (int c1 = 1; c1 <= 9; c1 += 1) + s0(c1, c0); diff --git a/test_inputs/codegen/omega/ts1d-check-sblock-0.c b/test_inputs/codegen/omega/ts1d-check-sblock-0.c dissimilarity index 98% index db057354..42fc844d 100644 --- a/test_inputs/codegen/omega/ts1d-check-sblock-0.c +++ b/test_inputs/codegen/omega/ts1d-check-sblock-0.c @@ -1,15 +1,13 @@ -{ - for (int c1 = 0; c1 <= 1; c1 += 1) { - if (c1 == 1) { - s0(1, 1, 1, 0, 0); - s0(1, 1, 1, N - 1, 0); - } else { - for (int c3 = 0; c3 < N; c3 += 1) - s0(1, 0, 1, c3, 0); - } - } - for (int c1 = 0; c1 <= floord(T - 1, 1000); c1 += 1) - for (int c2 = 1000 * c1 + 1; c2 <= min(N + T - 3, N + 1000 * c1 + 997); c2 += 1) - for (int c3 = max(0, -N - 1000 * c1 + c2 + 2); c3 <= min(min(999, T - 1000 * c1 - 1), -1000 * c1 + c2 - 1); c3 += 1) - s1(2, 1000 * c1 + c3, 1, -1000 * c1 + c2 - c3, 1); -} +for (int c1 = 0; c1 <= 1; c1 += 1) { + if (c1 == 1) { + s0(1, 1, 1, 0, 0); + s0(1, 1, 1, N - 1, 0); + } else { + for (int c3 = 0; c3 < N; c3 += 1) + s0(1, 0, 1, c3, 0); + } +} +for (int c1 = 0; c1 <= floord(T - 1, 1000); c1 += 1) + for (int c2 = 1000 * c1 + 1; c2 <= min(N + T - 3, N + 1000 * c1 + 997); c2 += 1) + for (int c3 = max(0, -N - 1000 * c1 + c2 + 2); c3 <= min(min(999, T - 1000 * c1 - 1), -1000 * c1 + c2 - 1); c3 += 1) + s1(2, 1000 * c1 + c3, 1, -1000 * c1 + c2 - c3, 1); diff --git a/test_inputs/codegen/omega/ts1d-check0-0.c b/test_inputs/codegen/omega/ts1d-check0-0.c dissimilarity index 99% index 484bd1f6..29c72599 100644 --- a/test_inputs/codegen/omega/ts1d-check0-0.c +++ b/test_inputs/codegen/omega/ts1d-check0-0.c @@ -1,13 +1,11 @@ -{ - for (int c1 = 0; c1 < N; c1 += 1) - s0(1, c1, 1, 0, 0); - for (int c1 = 0; c1 <= floord(T - 1, 500); c1 += 1) - for (int c2 = 1000 * c1; c2 <= min(N + 2 * T - 3, N + 1000 * c1 + 997); c2 += 1) { - for (int c3 = max(0, -((N + c2) % 2) - N - 1000 * c1 + c2 + 2); c3 <= min(min(998, 2 * T - 1000 * c1 - 2), -1000 * c1 + c2 - 2); c3 += 2) { - s1(2, 1000 * c1 + c3, 0, -1000 * c1 + c2 - c3, 1); - s2(2, 1000 * c1 + c3 + 1, 0, -1000 * c1 + c2 - c3 - 1, 1); - } - if (2 * T >= c2 + 1 && 1000 * c1 + 999 >= c2) - s1(2, ((c2 + 1) % 2) + c2 - 1, 0, -((c2 + 1) % 2) + 1, 1); - } -} +for (int c1 = 0; c1 < N; c1 += 1) + s0(1, c1, 1, 0, 0); +for (int c1 = 0; c1 <= floord(T - 1, 500); c1 += 1) + for (int c2 = 1000 * c1; c2 <= min(N + 2 * T - 3, N + 1000 * c1 + 997); c2 += 1) { + for (int c3 = max(0, -((N + c2) % 2) - N - 1000 * c1 + c2 + 2); c3 <= min(min(998, 2 * T - 1000 * c1 - 2), -1000 * c1 + c2 - 2); c3 += 2) { + s1(2, 1000 * c1 + c3, 0, -1000 * c1 + c2 - c3, 1); + s2(2, 1000 * c1 + c3 + 1, 0, -1000 * c1 + c2 - c3 - 1, 1); + } + if (2 * T >= c2 + 1 && 1000 * c1 + 999 >= c2) + s1(2, ((c2 + 1) % 2) + c2 - 1, 0, -((c2 + 1) % 2) + 1, 1); + } diff --git a/test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c b/test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c dissimilarity index 99% index b5569c96..b793bf56 100644 --- a/test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c +++ b/test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c @@ -1,36 +1,34 @@ -{ - for (int c1 = -1; c1 < T; c1 += 1) - for (int c2 = 0; c2 < N; c2 += 1) { - if (c1 == -1) { - s0(1, -1, c2, 0, 0); - } else if (c2 == 0) { - s0(1, c1, 0, 0, 0); - } else if (c2 + 1 == N) { - s0(1, c1, N - 1, 0, 0); - } - } - for (int c1 = 0; c1 <= floord(T - 1, 500); c1 += 1) { - for (int c3 = -((c1 + 9) / 8) + 2; c3 <= floord(N - 500 * c1 - 3, 4000) + 1; c3 += 1) - for (int c4 = max(500 * c1 + 1, 1000 * c1 + 4000 * c3 - 3999); c4 <= min(min(N + T - 3, 1000 * c1 + 4000 * c3 - 3000), 2 * N - 4000 * c3 + 3995); c4 += 1) - for (int c5 = max(0, -N - 500 * c1 + c4 + 2); c5 <= min(min(T - 500 * c1 - 1, -500 * c1 + c4 - 1), -500 * c1 - 2000 * c3 + (c4 + 1) / 2 + 1999); c5 += 1) - s1(2, 500 * c1 + c5, 1, -500 * c1 + c4 - c5, 1); - for (int c3 = max(-((T + 4000) / 4000) + 2, -((c1 + 9) / 8) + 2); c3 <= floord(N - 500 * c1 - 3, 4000) + 1; c3 += 1) - for (int c4 = max(1000 * c1 + 4000 * c3 - 3999, -4000 * c3 + 4000); c4 <= min(min(2 * T + 4000 * c3 - 4000, 1000 * c1 + 4000 * c3 - 3000), 2 * N - 4000 * c3 + 3995); c4 += 1) - s2(2, -2000 * c3 + (c4 + 1) / 2 + 1999, 1, 2000 * c3 + c4 - (c4 + 1) / 2 - 1999, 1); - for (int c3 = -((c1 + 7) / 8) + 1; c3 <= min(floord(N + T - 1000 * c1 - 1004, 4000) + 1, floord(N - 500 * c1 - 504, 4000) + 1); c3 += 1) - for (int c4 = max(500 * c1 + 1, 1000 * c1 + 4000 * c3 - 2999); c4 <= min(min(N + T - 3, N + 500 * c1 + 497), 1000 * c1 + 4000 * c3); c4 += 1) - for (int c5 = max(0, -N - 500 * c1 + c4 + 2); c5 <= min(min(499, T - 500 * c1 - 1), -500 * c1 + c4 - 1); c5 += 1) - s3(2, 500 * c1 + c5, 1, -500 * c1 + c4 - c5, 1); - for (int c3 = max(-((T + 4000) / 4000) + 1, -((c1 + 9) / 8) + 1); c3 <= floord(N - 500 * c1 - 3, 4000); c3 += 1) - for (int c4 = max(-4000 * c3, 1000 * c1 + 4000 * c3 + 1); c4 <= min(min(2 * N - 4000 * c3 - 5, 2 * T + 4000 * c3), 1000 * c1 + 4000 * c3 + 1000); c4 += 1) - s4(2, -2000 * c3 + (c4 + 1) / 2 - 1, 1, 2000 * c3 + c4 - (c4 + 1) / 2 + 1, 1); - for (int c3 = -((c1 + 8) / 8) + 1; c3 <= min(floord(N + T - 1000 * c1 - 4, 4000), floord(N - 500 * c1 + 496, 4000)); c3 += 1) - for (int c4 = max(1000 * c1 + 4000 * c3 + 1, -4000 * c3 + 2); c4 <= min(min(min(N + T - 3, N + 500 * c1 + 497), 2 * T + 4000 * c3 - 2), 1000 * c1 + 4000 * c3 + 998); c4 += 1) - for (int c5 = max(-N - 500 * c1 + c4 + 2, -500 * c1 - 2000 * c3 + (c4 + 1) / 2); c5 <= min(min(499, T - 500 * c1 - 1), -500 * c1 + c4 - 1); c5 += 1) - s5(2, 500 * c1 + c5, 1, -500 * c1 + c4 - c5, 1); - } - if (T >= 1) - for (int c3 = -((T + 3998) / 4000) + 1; c3 <= floord(N - T - 2, 4000) + 1; c3 += 1) - for (int c4 = max(T, 2 * T + 4000 * c3 - 4001); c4 < min(N + T - 2, 2 * T + 4000 * c3 - 1); c4 += 1) - s6(2, T - 1, 1, -T + c4 + 1, 1); -} +for (int c1 = -1; c1 < T; c1 += 1) + for (int c2 = 0; c2 < N; c2 += 1) { + if (c1 == -1) { + s0(1, -1, c2, 0, 0); + } else if (c2 == 0) { + s0(1, c1, 0, 0, 0); + } else if (c2 + 1 == N) { + s0(1, c1, N - 1, 0, 0); + } + } +for (int c1 = 0; c1 <= floord(T - 1, 500); c1 += 1) { + for (int c3 = -((c1 + 9) / 8) + 2; c3 <= floord(N - 500 * c1 - 3, 4000) + 1; c3 += 1) + for (int c4 = max(500 * c1 + 1, 1000 * c1 + 4000 * c3 - 3999); c4 <= min(min(N + T - 3, 1000 * c1 + 4000 * c3 - 3000), 2 * N - 4000 * c3 + 3995); c4 += 1) + for (int c5 = max(0, -N - 500 * c1 + c4 + 2); c5 <= min(min(T - 500 * c1 - 1, -500 * c1 + c4 - 1), -500 * c1 - 2000 * c3 + (c4 + 1) / 2 + 1999); c5 += 1) + s1(2, 500 * c1 + c5, 1, -500 * c1 + c4 - c5, 1); + for (int c3 = max(-((T + 4000) / 4000) + 2, -((c1 + 9) / 8) + 2); c3 <= floord(N - 500 * c1 - 3, 4000) + 1; c3 += 1) + for (int c4 = max(1000 * c1 + 4000 * c3 - 3999, -4000 * c3 + 4000); c4 <= min(min(2 * T + 4000 * c3 - 4000, 1000 * c1 + 4000 * c3 - 3000), 2 * N - 4000 * c3 + 3995); c4 += 1) + s2(2, -2000 * c3 + (c4 + 1) / 2 + 1999, 1, 2000 * c3 + c4 - (c4 + 1) / 2 - 1999, 1); + for (int c3 = -((c1 + 7) / 8) + 1; c3 <= min(floord(N + T - 1000 * c1 - 1004, 4000) + 1, floord(N - 500 * c1 - 504, 4000) + 1); c3 += 1) + for (int c4 = max(500 * c1 + 1, 1000 * c1 + 4000 * c3 - 2999); c4 <= min(min(N + T - 3, N + 500 * c1 + 497), 1000 * c1 + 4000 * c3); c4 += 1) + for (int c5 = max(0, -N - 500 * c1 + c4 + 2); c5 <= min(min(499, T - 500 * c1 - 1), -500 * c1 + c4 - 1); c5 += 1) + s3(2, 500 * c1 + c5, 1, -500 * c1 + c4 - c5, 1); + for (int c3 = max(-((T + 4000) / 4000) + 1, -((c1 + 9) / 8) + 1); c3 <= floord(N - 500 * c1 - 3, 4000); c3 += 1) + for (int c4 = max(-4000 * c3, 1000 * c1 + 4000 * c3 + 1); c4 <= min(min(2 * N - 4000 * c3 - 5, 2 * T + 4000 * c3), 1000 * c1 + 4000 * c3 + 1000); c4 += 1) + s4(2, -2000 * c3 + (c4 + 1) / 2 - 1, 1, 2000 * c3 + c4 - (c4 + 1) / 2 + 1, 1); + for (int c3 = -((c1 + 8) / 8) + 1; c3 <= min(floord(N + T - 1000 * c1 - 4, 4000), floord(N - 500 * c1 + 496, 4000)); c3 += 1) + for (int c4 = max(1000 * c1 + 4000 * c3 + 1, -4000 * c3 + 2); c4 <= min(min(min(N + T - 3, N + 500 * c1 + 497), 2 * T + 4000 * c3 - 2), 1000 * c1 + 4000 * c3 + 998); c4 += 1) + for (int c5 = max(-N - 500 * c1 + c4 + 2, -500 * c1 - 2000 * c3 + (c4 + 1) / 2); c5 <= min(min(499, T - 500 * c1 - 1), -500 * c1 + c4 - 1); c5 += 1) + s5(2, 500 * c1 + c5, 1, -500 * c1 + c4 - c5, 1); +} +if (T >= 1) + for (int c3 = -((T + 3998) / 4000) + 1; c3 <= floord(N - T - 2, 4000) + 1; c3 += 1) + for (int c4 = max(T, 2 * T + 4000 * c3 - 4001); c4 < min(N + T - 2, 2 * T + 4000 * c3 - 1); c4 += 1) + s6(2, T - 1, 1, -T + c4 + 1, 1); diff --git a/test_inputs/codegen/omega/ts1d-orig0-0.c b/test_inputs/codegen/omega/ts1d-orig0-0.c index 9eff756c..72e3b2ed 100644 --- a/test_inputs/codegen/omega/ts1d-orig0-0.c +++ b/test_inputs/codegen/omega/ts1d-orig0-0.c @@ -1,10 +1,8 @@ -{ - for (int c1 = 0; c1 < N; c1 += 1) - s0(1, c1, 1, 0, 0); - for (int c1 = 0; c1 < T; c1 += 1) { - for (int c3 = 0; c3 < N; c3 += 1) - s1(2, c1, 0, c3, 1); - for (int c3 = 1; c3 < N - 1; c3 += 1) - s2(2, c1, 1, c3, 1); - } +for (int c1 = 0; c1 < N; c1 += 1) + s0(1, c1, 1, 0, 0); +for (int c1 = 0; c1 < T; c1 += 1) { + for (int c3 = 0; c3 < N; c3 += 1) + s1(2, c1, 0, c3, 1); + for (int c3 = 1; c3 < N - 1; c3 += 1) + s2(2, c1, 1, c3, 1); } diff --git a/test_inputs/codegen/omega/wak1-0.c b/test_inputs/codegen/omega/wak1-0.c dissimilarity index 93% index 32ea68ec..e5a0253a 100644 --- a/test_inputs/codegen/omega/wak1-0.c +++ b/test_inputs/codegen/omega/wak1-0.c @@ -1,27 +1,25 @@ -{ - for (int c0 = a3; c0 <= min(min(a1 - 1, b3), a2 - 1); c0 += 1) - s2(c0); - for (int c0 = a1; c0 <= min(b1, a2 - 1); c0 += 1) { - s0(c0); - if (c0 >= a3 && b3 >= c0) - s2(c0); - } - for (int c0 = max(max(a1, b1 + 1), a3); c0 <= min(b3, a2 - 1); c0 += 1) - s2(c0); - for (int c0 = a2; c0 <= b2; c0 += 1) { - if (c0 >= a1 && b1 >= c0) - s0(c0); - s1(c0); - if (c0 >= a3 && b3 >= c0) - s2(c0); - } - for (int c0 = max(max(a3, a2), b2 + 1); c0 <= min(a1 - 1, b3); c0 += 1) - s2(c0); - for (int c0 = max(max(a1, a2), b2 + 1); c0 <= b1; c0 += 1) { - s0(c0); - if (c0 >= a3 && b3 >= c0) - s2(c0); - } - for (int c0 = max(max(max(max(a1, b1 + 1), a3), a2), b2 + 1); c0 <= b3; c0 += 1) - s2(c0); -} +for (int c0 = a3; c0 <= min(min(a1 - 1, b3), a2 - 1); c0 += 1) + s2(c0); +for (int c0 = a1; c0 <= min(b1, a2 - 1); c0 += 1) { + s0(c0); + if (c0 >= a3 && b3 >= c0) + s2(c0); +} +for (int c0 = max(max(a1, b1 + 1), a3); c0 <= min(b3, a2 - 1); c0 += 1) + s2(c0); +for (int c0 = a2; c0 <= b2; c0 += 1) { + if (c0 >= a1 && b1 >= c0) + s0(c0); + s1(c0); + if (c0 >= a3 && b3 >= c0) + s2(c0); +} +for (int c0 = max(max(a3, a2), b2 + 1); c0 <= min(a1 - 1, b3); c0 += 1) + s2(c0); +for (int c0 = max(max(a1, a2), b2 + 1); c0 <= b1; c0 += 1) { + s0(c0); + if (c0 >= a3 && b3 >= c0) + s2(c0); +} +for (int c0 = max(max(max(max(a1, b1 + 1), a3), a2), b2 + 1); c0 <= b3; c0 += 1) + s2(c0); diff --git a/test_inputs/codegen/omega/wak1-1.c b/test_inputs/codegen/omega/wak1-1.c dissimilarity index 99% index a09f7055..5ecd174f 100644 --- a/test_inputs/codegen/omega/wak1-1.c +++ b/test_inputs/codegen/omega/wak1-1.c @@ -1,55 +1,53 @@ -{ - for (int c0 = a2; c0 <= min(min(a1 - 1, a3 - 1), b2); c0 += 1) - s1(c0); - for (int c0 = a3; c0 <= min(min(a1 - 1, b3), a2 - 1); c0 += 1) - s2(c0); - for (int c0 = max(a3, a2); c0 <= min(min(a1 - 1, b3), b2); c0 += 1) { - s1(c0); - s2(c0); - } - for (int c0 = max(max(a3, b3 + 1), a2); c0 <= min(a1 - 1, b2); c0 += 1) - s1(c0); - for (int c0 = a1; c0 <= min(min(b1, a3 - 1), a2 - 1); c0 += 1) - s0(c0); - for (int c0 = max(a1, a2); c0 <= min(min(b1, a3 - 1), b2); c0 += 1) { - s0(c0); - s1(c0); - } - for (int c0 = max(a1, a3); c0 <= min(min(b1, b3), a2 - 1); c0 += 1) { - s0(c0); - s2(c0); - } - for (int c0 = max(max(a1, a3), b3 + 1); c0 <= min(b1, a2 - 1); c0 += 1) - s0(c0); - for (int c0 = max(max(a1, a3), a2); c0 <= min(min(b1, b3), b2); c0 += 1) { - s0(c0); - s1(c0); - s2(c0); - } - for (int c0 = max(max(max(a1, a3), b3 + 1), a2); c0 <= min(b1, b2); c0 += 1) { - s0(c0); - s1(c0); - } - for (int c0 = max(max(a1, a2), b2 + 1); c0 <= min(b1, a3 - 1); c0 += 1) - s0(c0); - for (int c0 = max(max(a3, a2), b2 + 1); c0 <= min(a1 - 1, b3); c0 += 1) - s2(c0); - for (int c0 = max(max(max(a1, a3), a2), b2 + 1); c0 <= min(b1, b3); c0 += 1) { - s0(c0); - s2(c0); - } - for (int c0 = max(max(max(max(a1, a3), b3 + 1), a2), b2 + 1); c0 <= b1; c0 += 1) - s0(c0); - for (int c0 = max(max(a1, b1 + 1), a2); c0 <= min(a3 - 1, b2); c0 += 1) - s1(c0); - for (int c0 = max(max(a1, b1 + 1), a3); c0 <= min(b3, a2 - 1); c0 += 1) - s2(c0); - for (int c0 = max(max(max(a1, b1 + 1), a3), a2); c0 <= min(b3, b2); c0 += 1) { - s1(c0); - s2(c0); - } - for (int c0 = max(max(max(max(a1, b1 + 1), a3), b3 + 1), a2); c0 <= b2; c0 += 1) - s1(c0); - for (int c0 = max(max(max(max(a1, b1 + 1), a3), a2), b2 + 1); c0 <= b3; c0 += 1) - s2(c0); -} +for (int c0 = a2; c0 <= min(min(a1 - 1, a3 - 1), b2); c0 += 1) + s1(c0); +for (int c0 = a3; c0 <= min(min(a1 - 1, b3), a2 - 1); c0 += 1) + s2(c0); +for (int c0 = max(a3, a2); c0 <= min(min(a1 - 1, b3), b2); c0 += 1) { + s1(c0); + s2(c0); +} +for (int c0 = max(max(a3, b3 + 1), a2); c0 <= min(a1 - 1, b2); c0 += 1) + s1(c0); +for (int c0 = a1; c0 <= min(min(b1, a3 - 1), a2 - 1); c0 += 1) + s0(c0); +for (int c0 = max(a1, a2); c0 <= min(min(b1, a3 - 1), b2); c0 += 1) { + s0(c0); + s1(c0); +} +for (int c0 = max(a1, a3); c0 <= min(min(b1, b3), a2 - 1); c0 += 1) { + s0(c0); + s2(c0); +} +for (int c0 = max(max(a1, a3), b3 + 1); c0 <= min(b1, a2 - 1); c0 += 1) + s0(c0); +for (int c0 = max(max(a1, a3), a2); c0 <= min(min(b1, b3), b2); c0 += 1) { + s0(c0); + s1(c0); + s2(c0); +} +for (int c0 = max(max(max(a1, a3), b3 + 1), a2); c0 <= min(b1, b2); c0 += 1) { + s0(c0); + s1(c0); +} +for (int c0 = max(max(a1, a2), b2 + 1); c0 <= min(b1, a3 - 1); c0 += 1) + s0(c0); +for (int c0 = max(max(a3, a2), b2 + 1); c0 <= min(a1 - 1, b3); c0 += 1) + s2(c0); +for (int c0 = max(max(max(a1, a3), a2), b2 + 1); c0 <= min(b1, b3); c0 += 1) { + s0(c0); + s2(c0); +} +for (int c0 = max(max(max(max(a1, a3), b3 + 1), a2), b2 + 1); c0 <= b1; c0 += 1) + s0(c0); +for (int c0 = max(max(a1, b1 + 1), a2); c0 <= min(a3 - 1, b2); c0 += 1) + s1(c0); +for (int c0 = max(max(a1, b1 + 1), a3); c0 <= min(b3, a2 - 1); c0 += 1) + s2(c0); +for (int c0 = max(max(max(a1, b1 + 1), a3), a2); c0 <= min(b3, b2); c0 += 1) { + s1(c0); + s2(c0); +} +for (int c0 = max(max(max(max(a1, b1 + 1), a3), b3 + 1), a2); c0 <= b2; c0 += 1) + s1(c0); +for (int c0 = max(max(max(max(a1, b1 + 1), a3), a2), b2 + 1); c0 <= b3; c0 += 1) + s2(c0); diff --git a/test_inputs/codegen/omega/wak3-1.c b/test_inputs/codegen/omega/wak3-1.c dissimilarity index 99% index 3045b219..ef2c580d 100644 --- a/test_inputs/codegen/omega/wak3-1.c +++ b/test_inputs/codegen/omega/wak3-1.c @@ -1,21 +1,19 @@ -{ - for (int c0 = a; c0 <= min(a + 9, b); c0 += 1) - s0(c0); - for (int c0 = a + 10; c0 <= min(a + 19, b); c0 += 1) { - s0(c0); - s1(c0); - } - for (int c0 = max(a + 10, b + 1); c0 <= min(a + 19, b + 10); c0 += 1) - s1(c0); - for (int c0 = a + 20; c0 <= b; c0 += 1) { - s0(c0); - s1(c0); - s2(c0); - } - for (int c0 = max(a + 20, b + 1); c0 <= b + 10; c0 += 1) { - s1(c0); - s2(c0); - } - for (int c0 = max(a + 20, b + 11); c0 <= b + 20; c0 += 1) - s2(c0); -} +for (int c0 = a; c0 <= min(a + 9, b); c0 += 1) + s0(c0); +for (int c0 = a + 10; c0 <= min(a + 19, b); c0 += 1) { + s0(c0); + s1(c0); +} +for (int c0 = max(a + 10, b + 1); c0 <= min(a + 19, b + 10); c0 += 1) + s1(c0); +for (int c0 = a + 20; c0 <= b; c0 += 1) { + s0(c0); + s1(c0); + s2(c0); +} +for (int c0 = max(a + 20, b + 1); c0 <= b + 10; c0 += 1) { + s1(c0); + s2(c0); +} +for (int c0 = max(a + 20, b + 11); c0 <= b + 20; c0 += 1) + s2(c0); diff --git a/test_inputs/codegen/pldi2012/figure8_b.c b/test_inputs/codegen/pldi2012/figure8_b.c index 94559693..95098f23 100644 --- a/test_inputs/codegen/pldi2012/figure8_b.c +++ b/test_inputs/codegen/pldi2012/figure8_b.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 2; c0 < n - 1; c0 += 4) { - s1(c0); - s0(c0 + 2); - } - if (n >= 1 && n % 4 >= 2) - s1(-(n % 4) + n + 2); +for (int c0 = 2; c0 < n - 1; c0 += 4) { + s1(c0); + s0(c0 + 2); } +if (n >= 1 && n % 4 >= 2) + s1(-(n % 4) + n + 2); diff --git a/test_inputs/codegen/roman.c b/test_inputs/codegen/roman.c dissimilarity index 97% index d7e4077e..62f02327 100644 --- a/test_inputs/codegen/roman.c +++ b/test_inputs/codegen/roman.c @@ -1,32 +1,30 @@ -{ - for (int c1 = 0; c1 <= min(np1 - i, -i + 1); c1 += 1) { - S_9(c1); - S_12(c1); - } - for (int c1 = max(0, -i + 2); c1 <= -((-np1 + i + 4294967295) % 4294967296) + 4294967295; c1 += 1) { - S_9(c1); - S_10(c1); - for (int c3 = 0; c3 <= min(19, i + c1 - 3); c3 += 1) { - S_15(c1, c3); - for (int c5 = 0; c5 < c3; c5 += 1) { - S_16(c1, c3, c5); - S_17(c1, c3, c5); - } - S_16(c1, c3, c3); - S_18(c1, c3); - S_24(c1, c3); - S_19(c1, c3); - } - if (i + c1 <= 21) { - S_15(c1, i + c1 - 2); - for (int c5 = 0; c5 < i + c1 - 2; c5 += 1) { - S_16(c1, i + c1 - 2, c5); - S_17(c1, i + c1 - 2, c5); - } - S_16(c1, i + c1 - 2, i + c1 - 2); - S_18(c1, i + c1 - 2); - S_24(c1, i + c1 - 2); - } - S_12(c1); - } -} +for (int c1 = 0; c1 <= min(np1 - i, -i + 1); c1 += 1) { + S_9(c1); + S_12(c1); +} +for (int c1 = max(0, -i + 2); c1 <= -((-np1 + i + 4294967295) % 4294967296) + 4294967295; c1 += 1) { + S_9(c1); + S_10(c1); + for (int c3 = 0; c3 <= min(19, i + c1 - 3); c3 += 1) { + S_15(c1, c3); + for (int c5 = 0; c5 < c3; c5 += 1) { + S_16(c1, c3, c5); + S_17(c1, c3, c5); + } + S_16(c1, c3, c3); + S_18(c1, c3); + S_24(c1, c3); + S_19(c1, c3); + } + if (i + c1 <= 21) { + S_15(c1, i + c1 - 2); + for (int c5 = 0; c5 < i + c1 - 2; c5 += 1) { + S_16(c1, i + c1 - 2, c5); + S_17(c1, i + c1 - 2, c5); + } + S_16(c1, i + c1 - 2, i + c1 - 2); + S_18(c1, i + c1 - 2); + S_24(c1, i + c1 - 2); + } + S_12(c1); +} diff --git a/test_inputs/codegen/separate.c b/test_inputs/codegen/separate.c index 14d91be3..d368d714 100644 --- a/test_inputs/codegen/separate.c +++ b/test_inputs/codegen/separate.c @@ -1,8 +1,6 @@ -{ - a(0); - for (int c0 = 1; c0 <= 9; c0 += 1) { - a(c0); - b(c0 - 1); - } - b(9); +a(0); +for (int c0 = 1; c0 <= 9; c0 += 1) { + a(c0); + b(c0 - 1); } +b(9); diff --git a/test_inputs/codegen/separation_class.c b/test_inputs/codegen/separation_class.c dissimilarity index 99% index daac0d76..6cc43631 100644 --- a/test_inputs/codegen/separation_class.c +++ b/test_inputs/codegen/separation_class.c @@ -1,17 +1,15 @@ -{ - for (int c0 = 0; c0 <= 8; c0 += 1) { - for (int c1 = 0; c1 <= -c0 + 8; c1 += 1) - for (int c2 = 10 * c0; c2 <= 10 * c0 + 9; c2 += 1) - for (int c3 = 10 * c1; c3 <= 10 * c1 + 9; c3 += 1) - A(c2, c3); - for (int c1 = -c0 + 9; c1 <= -c0 + 10; c1 += 1) - for (int c2 = 10 * c0; c2 <= min(10 * c0 + 9, -10 * c1 + 100); c2 += 1) - for (int c3 = 10 * c1; c3 <= min(10 * c1 + 9, -c2 + 100); c3 += 1) - A(c2, c3); - } - for (int c0 = 9; c0 <= 10; c0 += 1) - for (int c1 = 0; c1 <= -c0 + 10; c1 += 1) - for (int c2 = 10 * c0; c2 <= min(10 * c0 + 9, -10 * c1 + 100); c2 += 1) - for (int c3 = 10 * c1; c3 <= min(10 * c1 + 9, -c2 + 100); c3 += 1) - A(c2, c3); -} +for (int c0 = 0; c0 <= 8; c0 += 1) { + for (int c1 = 0; c1 <= -c0 + 8; c1 += 1) + for (int c2 = 10 * c0; c2 <= 10 * c0 + 9; c2 += 1) + for (int c3 = 10 * c1; c3 <= 10 * c1 + 9; c3 += 1) + A(c2, c3); + for (int c1 = -c0 + 9; c1 <= -c0 + 10; c1 += 1) + for (int c2 = 10 * c0; c2 <= min(10 * c0 + 9, -10 * c1 + 100); c2 += 1) + for (int c3 = 10 * c1; c3 <= min(10 * c1 + 9, -c2 + 100); c3 += 1) + A(c2, c3); +} +for (int c0 = 9; c0 <= 10; c0 += 1) + for (int c1 = 0; c1 <= -c0 + 10; c1 += 1) + for (int c2 = 10 * c0; c2 <= min(10 * c0 + 9, -10 * c1 + 100); c2 += 1) + for (int c3 = 10 * c1; c3 <= min(10 * c1 + 9, -c2 + 100); c3 += 1) + A(c2, c3); diff --git a/test_inputs/codegen/separation_class2.c b/test_inputs/codegen/separation_class2.c dissimilarity index 92% index 80be0a73..67b9a9b9 100644 --- a/test_inputs/codegen/separation_class2.c +++ b/test_inputs/codegen/separation_class2.c @@ -1,15 +1,13 @@ -{ - for (int c0 = 0; c0 < -(n % 8) + n; c0 += 8) { - for (int c1 = 0; c1 < -(n % 8) + n; c1 += 8) - for (int c2 = 0; c2 <= 7; c2 += 1) - for (int c3 = 0; c3 <= 7; c3 += 1) - A(c0 + c2, c1 + c3); - for (int c2 = 0; c2 <= 7; c2 += 1) - for (int c3 = 0; c3 < n % 8; c3 += 1) - A(c0 + c2, -(n % 8) + n + c3); - } - for (int c1 = 0; c1 < n; c1 += 8) - for (int c2 = 0; c2 < n % 8; c2 += 1) - for (int c3 = 0; c3 <= min(7, n - c1 - 1); c3 += 1) - A(-(n % 8) + n + c2, c1 + c3); -} +for (int c0 = 0; c0 < -(n % 8) + n; c0 += 8) { + for (int c1 = 0; c1 < -(n % 8) + n; c1 += 8) + for (int c2 = 0; c2 <= 7; c2 += 1) + for (int c3 = 0; c3 <= 7; c3 += 1) + A(c0 + c2, c1 + c3); + for (int c2 = 0; c2 <= 7; c2 += 1) + for (int c3 = 0; c3 < n % 8; c3 += 1) + A(c0 + c2, -(n % 8) + n + c3); +} +for (int c1 = 0; c1 < n; c1 += 8) + for (int c2 = 0; c2 < n % 8; c2 += 1) + for (int c3 = 0; c3 <= min(7, n - c1 - 1); c3 += 1) + A(-(n % 8) + n + c2, c1 + c3); diff --git a/test_inputs/codegen/stride7.c b/test_inputs/codegen/stride7.c index b9d3127d..16fb2160 100644 --- a/test_inputs/codegen/stride7.c +++ b/test_inputs/codegen/stride7.c @@ -1,8 +1,6 @@ -{ - for (int c0 = 2; c0 <= 100; c0 += 64) - for (int c2 = c0 - 1; c2 <= 120; c2 += 1) - s2(c0, c2); - for (int c0 = 66; c0 <= 200; c0 += 64) - for (int c2 = 122; c2 <= c0 + 62; c2 += 1) - s4(c0, c2); -} +for (int c0 = 2; c0 <= 100; c0 += 64) + for (int c2 = c0 - 1; c2 <= 120; c2 += 1) + s2(c0, c2); +for (int c0 = 66; c0 <= 200; c0 += 64) + for (int c2 = 122; c2 <= c0 + 62; c2 += 1) + s4(c0, c2); diff --git a/test_inputs/codegen/unroll.c b/test_inputs/codegen/unroll.c index 63594bb6..73db38d6 100644 --- a/test_inputs/codegen/unroll.c +++ b/test_inputs/codegen/unroll.c @@ -1,5 +1,3 @@ -{ - A(0); - A(100000000); - A(200000000); -} +A(0); +A(100000000); +A(200000000); diff --git a/test_inputs/codegen/unroll11.c b/test_inputs/codegen/unroll11.c index c1fc5298..05e47395 100644 --- a/test_inputs/codegen/unroll11.c +++ b/test_inputs/codegen/unroll11.c @@ -1,8 +1,6 @@ -{ - if (t1 >= 126) - S(0, t1 - 384); - S(0, t1 - 256); - if (t1 >= 126) - S(1, t1 - 384); - S(1, t1 - 256); -} +if (t1 >= 126) + S(0, t1 - 384); +S(0, t1 - 256); +if (t1 >= 126) + S(1, t1 - 384); +S(1, t1 - 256); diff --git a/test_inputs/codegen/unroll2.c b/test_inputs/codegen/unroll2.c index 7ae38be1..0e0ff1f6 100644 --- a/test_inputs/codegen/unroll2.c +++ b/test_inputs/codegen/unroll2.c @@ -1,11 +1,9 @@ -{ - A(0); - A(1); - A(2); - A(3); - for (int c0 = 4; c0 <= 99996; c0 += 1) - A(c0); - A(99997); - A(99998); - A(99999); -} +A(0); +A(1); +A(2); +A(3); +for (int c0 = 4; c0 <= 99996; c0 += 1) + A(c0); +A(99997); +A(99998); +A(99999); diff --git a/test_inputs/codegen/unroll4.c b/test_inputs/codegen/unroll4.c dissimilarity index 100% index 1e7ecccc..582fde37 100644 --- a/test_inputs/codegen/unroll4.c +++ b/test_inputs/codegen/unroll4.c @@ -1,16 +1,14 @@ -{ - write_shared_A(3, ((t1 + 3) % 4) + 1, ((t2 + 31) % 32) + 1); - if (t2 >= 1 && t2 <= 2 && t1 % 3 == 0) - write_shared_A(3, (-t1 / 3) + 4, t2 + 32); - if (((t1 + 3) % 4) + 1 >= t2 || t2 >= ((t1 + 3) % 4) + ((t2 + 1) % 2) + 2) - write_shared_A(3, ((t1 + 3) % 4) + 5, -((((t1 + 3) % 4) - t2 + 33) % 32) + t1 + 4 * ((-t1 + 4) / 4) + 32); - if (t1 >= 1 && t2 >= t1 + 1 && t2 <= 4) - write_shared_A(3, t1 + 4, t2 + 32); - write_shared_A(4, ((t1 + 3) % 4) + 1, ((t2 + 31) % 32) + 1); - if (t2 >= 1 && t2 <= 2 && t1 % 3 == 0) - write_shared_A(4, (-t1 / 3) + 4, t2 + 32); - if (((t1 + 3) % 4) + 1 >= t2 || t2 >= ((t1 + 3) % 4) + ((t2 + 1) % 2) + 2) - write_shared_A(4, ((t1 + 3) % 4) + 5, -((((t1 + 3) % 4) - t2 + 33) % 32) + t1 + 4 * ((-t1 + 4) / 4) + 32); - if (t1 >= 1 && t2 >= t1 + 1 && t2 <= 4) - write_shared_A(4, t1 + 4, t2 + 32); -} +write_shared_A(3, ((t1 + 3) % 4) + 1, ((t2 + 31) % 32) + 1); +if (t2 >= 1 && t2 <= 2 && t1 % 3 == 0) + write_shared_A(3, (-t1 / 3) + 4, t2 + 32); +if (((t1 + 3) % 4) + 1 >= t2 || t2 >= ((t1 + 3) % 4) + ((t2 + 1) % 2) + 2) + write_shared_A(3, ((t1 + 3) % 4) + 5, -((((t1 + 3) % 4) - t2 + 33) % 32) + t1 + 4 * ((-t1 + 4) / 4) + 32); +if (t1 >= 1 && t2 >= t1 + 1 && t2 <= 4) + write_shared_A(3, t1 + 4, t2 + 32); +write_shared_A(4, ((t1 + 3) % 4) + 1, ((t2 + 31) % 32) + 1); +if (t2 >= 1 && t2 <= 2 && t1 % 3 == 0) + write_shared_A(4, (-t1 / 3) + 4, t2 + 32); +if (((t1 + 3) % 4) + 1 >= t2 || t2 >= ((t1 + 3) % 4) + ((t2 + 1) % 2) + 2) + write_shared_A(4, ((t1 + 3) % 4) + 5, -((((t1 + 3) % 4) - t2 + 33) % 32) + t1 + 4 * ((-t1 + 4) / 4) + 32); +if (t1 >= 1 && t2 >= t1 + 1 && t2 <= 4) + write_shared_A(4, t1 + 4, t2 + 32); diff --git a/test_inputs/codegen/unroll6.c b/test_inputs/codegen/unroll6.c index 1d8cc5eb..97563c6d 100644 --- a/test_inputs/codegen/unroll6.c +++ b/test_inputs/codegen/unroll6.c @@ -1,8 +1,6 @@ -{ - if (g >= 0 && nn >= 128 * g + 6 && nn >= ((t1 + 127) % 128) + 128 * g + 3) - for (int c1 = 393214; c1 < nn - 1; c1 += 393216) - A(c1, ((t1 + 127) % 128) + 128 * g + 1, ((t1 + 127) % 128) + 1); - if (t1 >= 1 && t1 <= 2 && nn >= t1 + 128 * g + 130 && t1 + 128 * g >= -127) - for (int c1 = 393214; c1 < nn - 1; c1 += 393216) - A(c1, t1 + 128 * g + 128, t1 + 128); -} +if (g >= 0 && nn >= 128 * g + 6 && nn >= ((t1 + 127) % 128) + 128 * g + 3) + for (int c1 = 393214; c1 < nn - 1; c1 += 393216) + A(c1, ((t1 + 127) % 128) + 128 * g + 1, ((t1 + 127) % 128) + 1); +if (t1 >= 1 && t1 <= 2 && nn >= t1 + 128 * g + 130 && t1 + 128 * g >= -127) + for (int c1 = 393214; c1 < nn - 1; c1 += 393216) + A(c1, t1 + 128 * g + 128, t1 + 128); diff --git a/test_inputs/codegen/unroll7.c b/test_inputs/codegen/unroll7.c index 8392185f..a7b4441e 100644 --- a/test_inputs/codegen/unroll7.c +++ b/test_inputs/codegen/unroll7.c @@ -1,10 +1,8 @@ -{ - S(0, 0); - S(0, 3); - S(0, 4); - S(1, 1); - S(1, 4); - S(2, 2); - S(3, 3); - S(4, 4); -} +S(0, 0); +S(0, 3); +S(0, 4); +S(1, 1); +S(1, 4); +S(2, 2); +S(3, 3); +S(4, 4); -- 2.11.4.GIT