From 1489c4b92608cc09f5ab211463669780c8e05f93 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Fri, 7 Aug 2015 15:55:59 +0200 Subject: [PATCH] update test case outputs pet_scop_cmp purposely tries not to depend too much on the exact output produced by isl so that we do not have to update the test case outputs each time isl is updated. However, to ease a visual inspection of subsequent changes to the pet output, we do perform such an update now. Signed-off-by: Sven Verdoolaege --- tests/QR.scop | 14 +++++++------- tests/arg.scop | 2 +- tests/autodetect/if1.scop | 2 +- tests/break.scop | 4 ++-- tests/break2.scop | 4 ++-- tests/break3.scop | 4 ++-- tests/break4.scop | 22 +++++++++++----------- tests/break5.scop | 4 ++-- tests/break6.scop | 6 +++--- tests/break7.scop | 16 ++++++++-------- tests/call1.scop | 6 +++--- tests/call2.scop | 2 +- tests/call3.scop | 6 +++--- tests/conditional_assignment.scop | 12 ++++++------ tests/conditional_assignment2.scop | 10 +++++----- tests/continue.scop | 4 ++-- tests/continue2.scop | 6 +++--- tests/continue3.scop | 4 ++-- tests/continue4.scop | 2 +- tests/continue5.scop | 4 ++-- tests/cuervo.scop | 2 +- tests/data_dependent.scop | 6 +++--- tests/data_dependent2.scop | 2 +- tests/decl.scop | 16 ++++++++-------- tests/decl4.scop | 4 ++-- tests/decl5.scop | 10 +++++----- tests/decl6.scop | 12 ++++++------ tests/div_mod.scop | 2 +- tests/dynamic_bound.scop | 8 ++++---- tests/dynamic_condition.scop | 4 ++-- tests/encapsulate/continue6.scop | 8 ++++---- tests/encapsulate/for_while.scop | 2 +- tests/encapsulate/independent5.scop | 2 +- tests/encapsulate/while.scop | 2 +- tests/encapsulate/while_affine.scop | 8 ++++---- tests/filter.scop | 2 +- tests/for_while.scop | 12 ++++++------ tests/for_while_dec.scop | 12 ++++++------ tests/for_while_inc.scop | 12 ++++++------ tests/for_while_inc2.scop | 18 +++++++++--------- tests/for_while_inc3.scop | 18 +++++++++--------- tests/for_while_inc4.scop | 24 ++++++++++++------------ tests/for_while_init.scop | 18 +++++++++--------- tests/for_while_init2.scop | 18 +++++++++--------- tests/for_while_init3.scop | 20 ++++++++++---------- tests/for_while_overflow.scop | 4 ++-- tests/for_while_unsigned.scop | 12 ++++++------ tests/for_while_unsigned2.scop | 10 +++++----- tests/inc5.scop | 4 ++-- tests/independent1.scop | 6 +++--- tests/independent2.scop | 4 ++-- tests/independent3.scop | 22 +++++++++++----------- tests/independent4.scop | 6 +++--- tests/inf.scop | 8 ++++---- tests/inf2.scop | 8 ++++---- tests/inf4.scop | 8 ++++---- tests/kill.scop | 4 ++-- tests/loop5.scop | 2 +- tests/loop6.scop | 2 +- tests/loop7.scop | 4 ++-- tests/matmul.scop | 6 +++--- tests/max.scop | 2 +- tests/min.scop | 2 +- tests/min2.scop | 2 +- tests/pencil_min.scop | 4 ++-- tests/piecewise.scop | 4 ++-- tests/piecewise2.scop | 4 ++-- tests/propagate.scop | 12 ++++++------ tests/static.scop | 4 ++-- tests/summary.scop | 4 ++-- tests/ternary.scop | 2 +- tests/tobi2.scop | 4 ++-- tests/unsigned_break1.scop | 2 +- tests/wdp.scop | 4 ++-- tests/while.scop | 12 ++++++------ tests/while_affine.scop | 8 ++++---- tests/while_break.scop | 8 ++++---- tests/while_break2.scop | 8 ++++---- tests/while_inc.scop | 2 +- tests/while_overflow.scop | 4 ++-- tests/write.scop | 2 +- tests/write2.scop | 2 +- 82 files changed, 291 insertions(+), 291 deletions(-) diff --git a/tests/QR.scop b/tests/QR.scop index 1f69a02..0f5e509 100644 --- a/tests/QR.scop +++ b/tests/QR.scop @@ -12,8 +12,8 @@ schedule: '{ domain: "[N, K] -> { S_2[k, j] : k >= 0 and k <= -1 + K and j >= 0 "[N] -> L_1[{ S_0[j, i] -> [(i)] }]" } } }, { filter: "[N, K] -> { S_1[k, j] }", child: { schedule: "[K, N] -> L_2[{ S_1[k, j] -> [(k)] }]", child: { schedule: "[K, N] -> L_3[{ S_1[k, j] -> [(j)] }]" } } }, { filter: "[N, K] -> { S_2[k, j]; S_3[k, - j, i] }", child: { schedule: "[K, N] -> L_4[{ S_3[k, j, i] -> [(k)]; S_2[k, j] -> - [(k)] }]", child: { schedule: "[K, N] -> L_5[{ S_3[k, j, i] -> [(j)]; S_2[k, j] + j, i] }", child: { schedule: "[K, N] -> L_4[{ S_2[k, j] -> [(k)]; S_3[k, j, i] -> + [(k)] }]", child: { schedule: "[K, N] -> L_5[{ S_2[k, j] -> [(j)]; S_3[k, j, i] -> [(j)] }]", child: { sequence: [ { filter: "[K, N] -> { S_2[k, j] }" }, { filter: "[K, N] -> { S_3[k, j, i] }", child: { schedule: "[K, N] -> L_6[{ S_3[k, j, i] -> [(i)] }]" } } ] } } } }, { filter: "[N, K] -> { S_4[j, i] }", child: { schedule: @@ -21,7 +21,7 @@ schedule: '{ domain: "[N, K] -> { S_2[k, j] : k >= 0 and k <= -1 + K and j >= 0 -> [(i)] }]" } } } ] } }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N, K] -> { R[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 and i0 <= + extent: '[N, K] -> { R[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 >= 0 and i1 <= -1 + N }' element_type: int element_size: 4 @@ -36,7 +36,7 @@ arrays: element_size: 4 statements: - line: 19 - domain: '[N, K] -> { S_0[j, i] : i >= j and i <= -1 + N and j >= 0 }' + domain: '[N, K] -> { S_0[j, i] : j >= 0 and i >= j and i <= -1 + N }' body: type: expression expr: @@ -119,8 +119,8 @@ statements: read: 1 write: 1 - line: 29 - domain: '[N, K] -> { S_3[k, j, i] : k <= -1 + K and i <= -1 + N and j >= 0 and i - >= 1 + j and k >= 0 }' + domain: '[N, K] -> { S_3[k, j, i] : k >= 0 and k <= -1 + K and i <= -1 + N and j + >= 0 and i >= 1 + j }' body: type: expression expr: @@ -176,7 +176,7 @@ statements: read: 1 write: 1 - line: 34 - domain: '[N, K] -> { S_4[j, i] : i >= j and i <= -1 + N and j >= 0 }' + domain: '[N, K] -> { S_4[j, i] : j >= 0 and i >= j and i <= -1 + N }' body: type: expression expr: diff --git a/tests/arg.scop b/tests/arg.scop index 53d42b2..fe70ff3 100644 --- a/tests/arg.scop +++ b/tests/arg.scop @@ -3,7 +3,7 @@ end: 166 indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_0[i] : i >= 0 and i <= 9; S_1[i] : i >= 0 and i <= 9 }", - child: { schedule: "L_0[{ S_1[i] -> [(i)]; S_0[i] -> [(i)] }]", child: { sequence: + child: { schedule: "L_0[{ S_0[i] -> [(i)]; S_1[i] -> [(i)] }]", child: { sequence: [ { filter: "{ S_0[i] }" }, { filter: "{ S_1[i] }" } ] } } }' arrays: - context: '{ : }' diff --git a/tests/autodetect/if1.scop b/tests/autodetect/if1.scop index 4aa121a..81e4c64 100644 --- a/tests/autodetect/if1.scop +++ b/tests/autodetect/if1.scop @@ -47,7 +47,7 @@ statements: reference: __pet_ref_1 kill: 1 - line: 6 - domain: '{ [S_4[] -> [a]] : a >= 1 }' + domain: '{ [S_4[] -> [i0]] : i0 >= 1 }' body: type: expression expr: diff --git a/tests/break.scop b/tests/break.scop index a4f6992..87924b9 100644 --- a/tests/break.scop +++ b/tests/break.scop @@ -4,8 +4,8 @@ indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_0[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 and j <= i; S_1[i, j] : i <= 99 and i >= 0 and j <= 99 and j >= 0 and j <= -1 + i }", - child: { schedule: "L_0[{ S_1[i, j] -> [(i)]; S_0[i, j] -> [(i)] }]", child: { schedule: - "L_1[{ S_1[i, j] -> [(j)]; S_0[i, j] -> [(j)] }]", child: { sequence: [ { filter: + child: { schedule: "L_0[{ S_0[i, j] -> [(i)]; S_1[i, j] -> [(i)] }]", child: { schedule: + "L_1[{ S_0[i, j] -> [(j)]; S_1[i, j] -> [(j)] }]", child: { sequence: [ { filter: "{ S_0[i, j] }" }, { filter: "{ S_1[i, j] }" } ] } } } }' arrays: - context: '{ : }' diff --git a/tests/break2.scop b/tests/break2.scop index 268d0ce..1c2dfe4 100644 --- a/tests/break2.scop +++ b/tests/break2.scop @@ -4,8 +4,8 @@ indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_0[i, j] : (i <= 9 and i >= 0 and j <= 99 and j >= 0) or (i <= 99 and i >= 10 and j >= 0 and j <= i); S_1[i, j] : i <= 99 and i >= 10 and - j <= 99 and j >= 0 and j <= -1 + i }", child: { schedule: "L_0[{ S_1[i, j] -> [(i)]; - S_0[i, j] -> [(i)] }]", child: { schedule: "L_1[{ S_1[i, j] -> [(j)]; S_0[i, j] + j <= 99 and j >= 0 and j <= -1 + i }", child: { schedule: "L_0[{ S_0[i, j] -> [(i)]; + S_1[i, j] -> [(i)] }]", child: { schedule: "L_1[{ S_0[i, j] -> [(j)]; S_1[i, j] -> [(j)] }]", child: { sequence: [ { filter: "{ S_0[i, j] }" }, { filter: "{ S_1[i, j] }" } ] } } } }' arrays: diff --git a/tests/break3.scop b/tests/break3.scop index 3136ae6..355fd63 100644 --- a/tests/break3.scop +++ b/tests/break3.scop @@ -4,8 +4,8 @@ indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_0[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99; S_2[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99; S_1[i, j] : i >= 0 and i <= 99 and - j >= 0 and j <= 99 }", child: { schedule: "L_0[{ S_1[i, j] -> [(i)]; S_0[i, j] -> - [(i)]; S_2[i, j] -> [(i)] }]", child: { schedule: "L_1[{ S_1[i, j] -> [(j)]; S_0[i, + j >= 0 and j <= 99 }", child: { schedule: "L_0[{ S_0[i, j] -> [(i)]; S_1[i, j] -> + [(i)]; S_2[i, j] -> [(i)] }]", child: { schedule: "L_1[{ S_0[i, j] -> [(j)]; S_1[i, j] -> [(j)]; S_2[i, j] -> [(j)] }]", child: { sequence: [ { filter: "{ S_0[i, j] }" }, { filter: "{ S_1[i, j] }" }, { filter: "{ S_2[i, j] }" } ] } } } }' arrays: diff --git a/tests/break4.scop b/tests/break4.scop index d6751c3..a429b60 100644 --- a/tests/break4.scop +++ b/tests/break4.scop @@ -14,17 +14,17 @@ schedule: '{ domain: "{ S_11[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99; >= 0 and j <= 99; S_2[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99; S_7[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99; S_4[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99; S_5[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99; S_1[i, - j] : i >= 0 and i <= 99 and j >= 81 and j <= 99 }", child: { schedule: "L_0[{ S_12[i, - j] -> [(i)]; S_11[i, j] -> [(i)]; S_17[i, j] -> [(i)]; S_8[i, j] -> [(i)]; S_16[i, - j] -> [(i)]; S_6[i, j] -> [(i)]; S_4[i, j] -> [(i)]; S_1[i, j] -> [(i)]; S_13[i, - j] -> [(i)]; S_2[i, j] -> [(i)]; S_7[i, j] -> [(i)]; S_14[i, j] -> [(i)]; S_3[i, - j] -> [(i)]; S_5[i, j] -> [(i)]; S_15[i, j] -> [(i)]; S_9[i, j] -> [(i)]; S_0[i, - j] -> [(i)]; S_10[i, j] -> [(i)] }]", child: { schedule: "L_1[{ S_12[i, j] -> [(j)]; - S_11[i, j] -> [(j)]; S_17[i, j] -> [(j)]; S_8[i, j] -> [(j)]; S_16[i, j] -> [(j)]; - S_6[i, j] -> [(j)]; S_4[i, j] -> [(j)]; S_1[i, j] -> [(j)]; S_13[i, j] -> [(j)]; - S_2[i, j] -> [(j)]; S_7[i, j] -> [(j)]; S_14[i, j] -> [(j)]; S_3[i, j] -> [(j)]; - S_5[i, j] -> [(j)]; S_15[i, j] -> [(j)]; S_9[i, j] -> [(j)]; S_0[i, j] -> [(j)]; - S_10[i, j] -> [(j)] }]", child: { sequence: [ { filter: "{ S_0[i, j] }" }, { filter: + j] : i >= 0 and i <= 99 and j >= 81 and j <= 99 }", child: { schedule: "L_0[{ S_11[i, + j] -> [(i)]; S_12[i, j] -> [(i)]; S_14[i, j] -> [(i)]; S_15[i, j] -> [(i)]; S_10[i, + j] -> [(i)]; S_13[i, j] -> [(i)]; S_6[i, j] -> [(i)]; S_3[i, j] -> [(i)]; S_16[i, + j] -> [(i)]; S_8[i, j] -> [(i)]; S_9[i, j] -> [(i)]; S_17[i, j] -> [(i)]; S_0[i, + j] -> [(i)]; S_2[i, j] -> [(i)]; S_7[i, j] -> [(i)]; S_4[i, j] -> [(i)]; S_5[i, + j] -> [(i)]; S_1[i, j] -> [(i)] }]", child: { schedule: "L_1[{ S_11[i, j] -> [(j)]; + S_12[i, j] -> [(j)]; S_14[i, j] -> [(j)]; S_15[i, j] -> [(j)]; S_10[i, j] -> [(j)]; + S_13[i, j] -> [(j)]; S_6[i, j] -> [(j)]; S_3[i, j] -> [(j)]; S_16[i, j] -> [(j)]; + S_8[i, j] -> [(j)]; S_9[i, j] -> [(j)]; S_17[i, j] -> [(j)]; S_0[i, j] -> [(j)]; + S_2[i, j] -> [(j)]; S_7[i, j] -> [(j)]; S_4[i, j] -> [(j)]; S_5[i, j] -> [(j)]; + S_1[i, j] -> [(j)] }]", child: { sequence: [ { filter: "{ S_0[i, j] }" }, { filter: "{ S_1[i, j] }" }, { filter: "{ S_2[i, j] }" }, { filter: "{ S_3[i, j] }" }, { filter: "{ S_4[i, j] }" }, { filter: "{ S_5[i, j] }" }, { filter: "{ S_6[i, j] }" }, { filter: "{ S_7[i, j] }" }, { filter: "{ S_8[i, j] }" }, { filter: "{ S_9[i, j] }" }, { filter: diff --git a/tests/break5.scop b/tests/break5.scop index 5387202..59aff66 100644 --- a/tests/break5.scop +++ b/tests/break5.scop @@ -8,8 +8,8 @@ schedule: '{ domain: "{ S_0[i, j] : (i <= 89 and i >= 75 and j >= 0 and j <= i) j <= 150 - i and j >= 0); S_1[i, j] : (i <= 89 and i >= 75 and j <= 60 and j >= 0) or (i <= 60 and i >= 10 and j >= 0 and j <= -1 + i) or (i <= 74 and i >= 61 and j <= 60 and j >= 0) or (i <= 99 and i >= 90 and j <= 149 - i and j >= 0) }", child: - { schedule: "L_0[{ S_1[i, j] -> [(i)]; S_0[i, j] -> [(i)] }]", child: { schedule: - "L_1[{ S_1[i, j] -> [(j)]; S_0[i, j] -> [(j)] }]", child: { sequence: [ { filter: + { schedule: "L_0[{ S_0[i, j] -> [(i)]; S_1[i, j] -> [(i)] }]", child: { schedule: + "L_1[{ S_0[i, j] -> [(j)]; S_1[i, j] -> [(j)] }]", child: { sequence: [ { filter: "{ S_0[i, j] }" }, { filter: "{ S_1[i, j] }" } ] } } } }' arrays: - context: '{ : }' diff --git a/tests/break6.scop b/tests/break6.scop index c620606..e94a555 100644 --- a/tests/break6.scop +++ b/tests/break6.scop @@ -5,9 +5,9 @@ context: '{ : }' schedule: '{ domain: "{ S_3[t] : t >= 0; S_5[t] : t >= 0; S_0[]; S_6[t] : t >= 0; S_8[t] : t >= 0; S_2[t] : t >= 0; S_7[t] : t >= 0; S_4[t] : t >= 0; S_1[t] : t >= 0 }", child: { sequence: [ { filter: "{ S_0[] }" }, { filter: "{ S_3[t]; S_5[t]; - S_6[t]; S_8[t]; S_2[t]; S_7[t]; S_4[t]; S_1[t] }", child: { schedule: "L_0[{ S_1[t] - -> [(t)]; S_3[t] -> [(t)]; S_2[t] -> [(t)]; S_7[t] -> [(t)]; S_8[t] -> [(t)]; S_4[t] - -> [(t)]; S_6[t] -> [(t)]; S_5[t] -> [(t)] }]", child: { sequence: [ { filter: "{ + S_6[t]; S_8[t]; S_2[t]; S_7[t]; S_4[t]; S_1[t] }", child: { schedule: "L_0[{ S_8[t] + -> [(t)]; S_6[t] -> [(t)]; S_1[t] -> [(t)]; S_3[t] -> [(t)]; S_4[t] -> [(t)]; S_5[t] + -> [(t)]; S_2[t] -> [(t)]; S_7[t] -> [(t)] }]", child: { sequence: [ { filter: "{ S_1[t] }" }, { filter: "{ S_2[t] }" }, { filter: "{ S_3[t] }" }, { filter: "{ S_4[t] }" }, { filter: "{ S_5[t] }" }, { filter: "{ S_6[t] }" }, { filter: "{ S_7[t] }" }, { filter: "{ S_8[t] }" } ] } } } ] } }' diff --git a/tests/break7.scop b/tests/break7.scop index 37f8643..d1acb8b 100644 --- a/tests/break7.scop +++ b/tests/break7.scop @@ -94,7 +94,7 @@ statements: read: 1 write: 0 - line: 12 - domain: '{ [S_3[t] -> [__pet_test_0]] : 1 = 0 }' + domain: '{ [S_3[i0] -> [__pet_test_0]] : 1 = 0 }' body: type: expression expr: @@ -102,13 +102,13 @@ statements: operation: = arguments: - type: access - index: '{ [S_3[t] -> [i1]] -> a[(0 : 1 = 0)] }' + index: '{ [S_3[i0] -> [i1]] -> a[(0 : 1 = 0)] }' reference: __pet_ref_9 read: 0 write: 1 arguments: - type: access - index: '{ S_3[t] -> i[] }' + index: '{ S_3[i0] -> i[] }' reference: __pet_ref_8 read: 1 write: 0 @@ -116,12 +116,12 @@ statements: value: 1 arguments: - type: access - index: '{ S_3[t] -> __pet_test_0[(0 : 1 = 0)] }' + index: '{ S_3[i0] -> __pet_test_0[(0 : 1 = 0)] }' reference: __pet_ref_7 read: 1 write: 0 - line: 8 - domain: '{ [S_4[t] -> [__pet_test_0]] : 1 = 0 }' + domain: '{ [S_4[i0] -> [__pet_test_0]] : 1 = 0 }' body: type: expression expr: @@ -129,7 +129,7 @@ statements: operation: += arguments: - type: access - index: '{ S_4[t] -> i[] }' + index: '{ S_4[i0] -> i[] }' reference: __pet_ref_11 read: 0 write: 1 @@ -137,10 +137,10 @@ statements: value: 1 arguments: - type: access - index: '{ S_4[t] -> __pet_test_0[(0 : 1 = 0)] }' + index: '{ S_4[i0] -> __pet_test_0[(0 : 1 = 0)] }' reference: __pet_ref_10 read: 1 write: 0 implications: - satisfied: 1 - extension: '{ __pet_test_0[t] -> __pet_test_0[0] : t >= 0 }' + extension: '{ __pet_test_0[i0] -> __pet_test_0[0] : i0 >= 0 }' diff --git a/tests/call1.scop b/tests/call1.scop index c4ee47e..a388ab0 100644 --- a/tests/call1.scop +++ b/tests/call1.scop @@ -41,9 +41,9 @@ statements: read: 1 write: 0 - type: access - may_read: '[n] -> { S_1[i] -> A[o0] : o0 >= i and o0 <= 3 + i }' - may_write: '[n] -> { S_1[i] -> A[o0] : o0 >= i and o0 <= 3 + i }' - must_write: '[n] -> { S_1[i] -> A[o0] : o0 >= i and o0 <= 3 + i }' + may_read: '[n] -> { S_1[i] -> A[o0] : o0 <= 3 + i and o0 >= i }' + may_write: '[n] -> { S_1[i] -> A[o0] : o0 <= 3 + i and o0 >= i }' + must_write: '[n] -> { S_1[i] -> A[o0] : o0 <= 3 + i and o0 >= i }' index: '[n] -> { S_1[i] -> A[] }' depth: 1 reference: __pet_ref_2 diff --git a/tests/call2.scop b/tests/call2.scop index d7e6ed3..08fb559 100644 --- a/tests/call2.scop +++ b/tests/call2.scop @@ -6,7 +6,7 @@ schedule: '{ domain: "[n] -> { S_0[i] : i >= 0 and i <= -1 + n }", child: { sche "[n] -> L_0[{ S_0[i] -> [(i)] }]" } }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + extent: '[n] -> { B[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 diff --git a/tests/call3.scop b/tests/call3.scop index 77aea83..8c4d444 100644 --- a/tests/call3.scop +++ b/tests/call3.scop @@ -39,9 +39,9 @@ statements: operation: '&' arguments: - type: access - may_read: '[n] -> { S_1[i] -> A[o0] : o0 >= i and o0 <= 3 + i }' - may_write: '[n] -> { S_1[i] -> A[o0] : o0 >= i and o0 <= 3 + i }' - must_write: '[n] -> { S_1[i] -> A[o0] : o0 >= i and o0 <= 3 + i }' + may_read: '[n] -> { S_1[i] -> A[o0] : o0 <= 3 + i and o0 >= i }' + may_write: '[n] -> { S_1[i] -> A[o0] : o0 <= 3 + i and o0 >= i }' + must_write: '[n] -> { S_1[i] -> A[o0] : o0 <= 3 + i and o0 >= i }' index: '[n] -> { S_1[i] -> A[(i)] }' reference: __pet_ref_1 read: 1 diff --git a/tests/conditional_assignment.scop b/tests/conditional_assignment.scop index 137be6f..b14026d 100644 --- a/tests/conditional_assignment.scop +++ b/tests/conditional_assignment.scop @@ -6,16 +6,16 @@ context: '[N, M] -> { : N >= 0 and M >= 0 and N <= 2147483647 and M <= 21474836 schedule: '{ domain: "[N, M] -> { S_0[i] : i >= 0 and i <= -1 + N; S_1[i, j] : i >= 0 and i <= -1 + N and j >= 0 and j <= -1 + M; S_3[]; S_4[i] : i >= 0 and i <= -1 + N; S_2[i] : i >= 0 and i <= -1 + N }", child: { sequence: [ { filter: "[N, M] - -> { S_0[i]; S_1[i, j]; S_2[i] }", child: { schedule: "[N, M] -> L_0[{ S_2[i] -> - [(i)]; S_0[i] -> [(i)]; S_1[i, j] -> [(i)] }]", child: { sequence: [ { filter: "[N, + -> { S_0[i]; S_1[i, j]; S_2[i] }", child: { schedule: "[N, M] -> L_0[{ S_0[i] -> + [(i)]; S_1[i, j] -> [(i)]; S_2[i] -> [(i)] }]", child: { sequence: [ { filter: "[N, M] -> { S_0[i] }" }, { filter: "[N, M] -> { S_1[i, j] }", child: { schedule: "[N, M] -> L_1[{ S_1[i, j] -> [(j)] }]" } }, { filter: "[N, M] -> { S_2[i] }" } ] } } }, { filter: "[N, M] -> { S_3[] }" }, { filter: "[N, M] -> { S_4[i] }", child: { schedule: "[N] -> L_2[{ S_4[i] -> [(i)] }]" } } ] } }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N, M] -> { A[i0, i1] : i1 <= 9 and i1 >= 0 and i0 >= 0 and i0 <= -1 + - N }' + extent: '[N, M] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 <= 9 and i1 >= + 0 }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' @@ -162,8 +162,8 @@ statements: name: f arguments: - type: access - may_read: '[N, M] -> { [S_4[i] -> [i1]] -> A[i + i1, o1] : i1 >= -i and - i1 <= -1 + N - i }' + may_read: '[N, M] -> { [S_4[i] -> [i1]] -> A[i + i1, o1] : i1 <= -1 + + N - i and i1 >= -i }' index: '[N, M] -> { [S_4[i] -> [i1]] -> A[((i + i1) : i1 >= -i)] }' depth: 2 reference: __pet_ref_12 diff --git a/tests/conditional_assignment2.scop b/tests/conditional_assignment2.scop index 781b57e..92471a8 100644 --- a/tests/conditional_assignment2.scop +++ b/tests/conditional_assignment2.scop @@ -7,7 +7,7 @@ schedule: '{ domain: "[N, M] -> { S_4[]; S_2[i, j] : i >= 0 and i <= -1 + N and >= 0 and j <= -1 + M; S_3[i] : i >= 0 and i <= -1 + N; S_0[]; S_1[i] : i >= 0 and i <= -1 + N; S_5[i] : i >= 0 and i <= -1 + N }", child: { sequence: [ { filter: "[N, M] -> { S_0[] }" }, { filter: "[N, M] -> { S_2[i, j]; S_3[i]; S_1[i] }", child: - { schedule: "[N, M] -> L_0[{ S_1[i] -> [(i)]; S_3[i] -> [(i)]; S_2[i, j] -> [(i)] + { schedule: "[N, M] -> L_0[{ S_2[i, j] -> [(i)]; S_3[i] -> [(i)]; S_1[i] -> [(i)] }]", child: { sequence: [ { filter: "[N, M] -> { S_1[i] }" }, { filter: "[N, M] -> { S_2[i, j] }", child: { schedule: "[N, M] -> L_1[{ S_2[i, j] -> [(j)] }]" } }, { filter: "[N, M] -> { S_3[i] }" } ] } } }, { filter: "[N, M] -> { S_4[] }" }, @@ -15,8 +15,8 @@ schedule: '{ domain: "[N, M] -> { S_4[]; S_2[i, j] : i >= 0 and i <= -1 + N and }]" } } ] } }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[M, N] -> { A[i0, i1] : i1 <= 9 and i1 >= 0 and i0 >= 0 and i0 <= -1 + - N }' + extent: '[M, N] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 <= 9 and i1 >= + 0 }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' @@ -178,8 +178,8 @@ statements: name: f arguments: - type: access - may_read: '[M, N] -> { [S_5[i] -> [i1]] -> A[i + i1, o1] : i1 >= -i and - i1 <= -1 + N - i }' + may_read: '[M, N] -> { [S_5[i] -> [i1]] -> A[i + i1, o1] : i1 <= -1 + + N - i and i1 >= -i }' index: '[M, N] -> { [S_5[i] -> [i1]] -> A[((i + i1) : i1 >= -i)] }' depth: 2 reference: __pet_ref_13 diff --git a/tests/continue.scop b/tests/continue.scop index d323dda..58cc5af 100644 --- a/tests/continue.scop +++ b/tests/continue.scop @@ -4,8 +4,8 @@ indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_0[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99; S_1[i, j] : (i <= 99 and j >= 0 and j <= -1 + i) or (i >= 0 and j >= 1 + i and j <= 99) - }", child: { schedule: "L_0[{ S_1[i, j] -> [(i)]; S_0[i, j] -> [(i)] }]", child: - { schedule: "L_1[{ S_1[i, j] -> [(j)]; S_0[i, j] -> [(j)] }]", child: { sequence: + }", child: { schedule: "L_0[{ S_0[i, j] -> [(i)]; S_1[i, j] -> [(i)] }]", child: + { schedule: "L_1[{ S_0[i, j] -> [(j)]; S_1[i, j] -> [(j)] }]", child: { sequence: [ { filter: "{ S_0[i, j] }" }, { filter: "{ S_1[i, j] }" } ] } } } }' arrays: - context: '{ : }' diff --git a/tests/continue2.scop b/tests/continue2.scop index e66bc99..8684198 100644 --- a/tests/continue2.scop +++ b/tests/continue2.scop @@ -6,9 +6,9 @@ schedule: '{ domain: "{ S_3[i] : i >= 0 and i <= 59; S_5[i] : i >= 0 and i <= 59 S_6[i] : i >= 0 and i <= 59; S_9[i] : i >= 0 and i <= 99; S_8[i] : i >= 0 and i <= 99; S_2[i] : i >= 0 and i <= 59; S_7[i] : i >= 60 and i <= 99; S_4[i] : i >= 0 and i <= 59; S_10[i] : i >= 0 and i <= 99; S_0[i] : i >= 0 and i <= 59; S_1[i] - : i >= 0 and i <= 59 }", child: { schedule: "L_0[{ S_1[i] -> [(i)]; S_3[i] -> [(i)]; - S_10[i] -> [(i)]; S_9[i] -> [(i)]; S_2[i] -> [(i)]; S_7[i] -> [(i)]; S_0[i] -> [(i)]; - S_8[i] -> [(i)]; S_4[i] -> [(i)]; S_6[i] -> [(i)]; S_5[i] -> [(i)] }]", child: { + : i >= 0 and i <= 59 }", child: { schedule: "L_0[{ S_8[i] -> [(i)]; S_9[i] -> [(i)]; + S_6[i] -> [(i)]; S_10[i] -> [(i)]; S_0[i] -> [(i)]; S_3[i] -> [(i)]; S_4[i] -> [(i)]; + S_5[i] -> [(i)]; S_2[i] -> [(i)]; S_1[i] -> [(i)]; S_7[i] -> [(i)] }]", child: { sequence: [ { filter: "{ S_3[i]; S_5[i]; S_6[i]; S_2[i]; S_7[i]; S_4[i]; S_0[i]; S_1[i] }", child: { set: [ { filter: "{ S_3[i]; S_5[i]; S_6[i]; S_2[i]; S_4[i]; S_0[i]; S_1[i] }", child: { sequence: [ { filter: "{ S_0[i] }" }, { filter: "{ S_3[i]; diff --git a/tests/continue3.scop b/tests/continue3.scop index 6829f29..06679fe 100644 --- a/tests/continue3.scop +++ b/tests/continue3.scop @@ -5,8 +5,8 @@ context: '{ : }' schedule: '{ domain: "{ S_3[i] : i >= 0 and i <= 99; S_5[i] : i >= 0 and i <= 99; S_6[i] : i >= 0 and i <= 99; S_2[i] : i >= 0 and i <= 99; S_4[i] : i >= 0 and i <= 99; S_0[i] : i >= 0 and i <= 99; S_1[i] : i >= 0 and i <= 99 }", child: { schedule: - "L_0[{ S_1[i] -> [(i)]; S_3[i] -> [(i)]; S_2[i] -> [(i)]; S_0[i] -> [(i)]; S_4[i] - -> [(i)]; S_6[i] -> [(i)]; S_5[i] -> [(i)] }]", child: { sequence: [ { filter: "{ + "L_0[{ S_6[i] -> [(i)]; S_0[i] -> [(i)]; S_1[i] -> [(i)]; S_3[i] -> [(i)]; S_4[i] + -> [(i)]; S_5[i] -> [(i)]; S_2[i] -> [(i)] }]", child: { sequence: [ { filter: "{ S_0[i] }" }, { filter: "{ S_1[i] }" }, { filter: "{ S_2[i] }" }, { filter: "{ S_3[i] }" }, { filter: "{ S_4[i] }" }, { filter: "{ S_5[i] }" }, { filter: "{ S_6[i] }" } ] } } }' diff --git a/tests/continue4.scop b/tests/continue4.scop index 4022ebe..9a3e086 100644 --- a/tests/continue4.scop +++ b/tests/continue4.scop @@ -5,7 +5,7 @@ context: '{ : }' schedule: '{ domain: "{ S_3[i] : i >= 0 and i <= 99; S_5[i] : i >= 0 and i <= 99; S_2[i] : i >= 0 and i <= 99; S_4[i] : i >= 0 and i <= 99; S_0[i] : i >= 0 and i <= 99; S_1[i] : i >= 0 and i <= 99 }", child: { schedule: "L_0[{ S_1[i] -> [(i)]; - S_3[i] -> [(i)]; S_2[i] -> [(i)]; S_0[i] -> [(i)]; S_4[i] -> [(i)]; S_5[i] -> [(i)] + S_0[i] -> [(i)]; S_3[i] -> [(i)]; S_4[i] -> [(i)]; S_5[i] -> [(i)]; S_2[i] -> [(i)] }]", child: { sequence: [ { filter: "{ S_0[i] }" }, { filter: "{ S_1[i] }" }, { filter: "{ S_2[i] }" }, { filter: "{ S_3[i] }" }, { filter: "{ S_4[i] }" }, { filter: "{ S_5[i] }" } ] } } }' diff --git a/tests/continue5.scop b/tests/continue5.scop index b2feb47..753381f 100644 --- a/tests/continue5.scop +++ b/tests/continue5.scop @@ -6,8 +6,8 @@ schedule: '{ domain: "{ S_3[i] : (i <= 56 and i >= 0) or (i <= 99 and i >= 58); : (i <= 56 and i >= 0) or (i <= 99 and i >= 58); S_2[i] : (i <= 56 and i >= 0) or (i <= 99 and i >= 58); S_4[i] : (i <= 56 and i >= 0) or (i <= 99 and i >= 58); S_0[i] : i >= 0 and i <= 99; S_1[i] : (i <= 56 and i >= 0) or (i <= 99 and i >= 58) }", - child: { schedule: "L_0[{ S_1[i] -> [(i)]; S_3[i] -> [(i)]; S_2[i] -> [(i)]; S_0[i] - -> [(i)]; S_4[i] -> [(i)]; S_5[i] -> [(i)] }]", child: { sequence: [ { filter: "{ + child: { schedule: "L_0[{ S_1[i] -> [(i)]; S_0[i] -> [(i)]; S_3[i] -> [(i)]; S_4[i] + -> [(i)]; S_5[i] -> [(i)]; S_2[i] -> [(i)] }]", child: { sequence: [ { filter: "{ S_0[i] }" }, { filter: "{ S_1[i] }" }, { filter: "{ S_2[i] }" }, { filter: "{ S_3[i] }" }, { filter: "{ S_4[i] }" }, { filter: "{ S_5[i] }" } ] } } }' arrays: diff --git a/tests/cuervo.scop b/tests/cuervo.scop index f3855e4..8e7c0e7 100644 --- a/tests/cuervo.scop +++ b/tests/cuervo.scop @@ -21,7 +21,7 @@ arrays: element_size: 4 statements: - line: 6 - domain: '[n, m] -> { S_0[i, j] : j <= m and i >= 0 and i <= n and j >= 0 }' + domain: '[n, m] -> { S_0[i, j] : i >= 0 and i <= n and j >= 0 and j <= m }' body: type: expression expr: diff --git a/tests/data_dependent.scop b/tests/data_dependent.scop index fd50079..35f9ec9 100644 --- a/tests/data_dependent.scop +++ b/tests/data_dependent.scop @@ -6,15 +6,15 @@ schedule: '{ domain: "[N, M] -> { S_0[i] : i >= 0 and i <= -1 + N; S_1[i, j] : i 0 and i <= -1 + N and j >= 0 and j <= -1 + M; S_3[]; S_4[i] : N <= 2147483649 and i >= 0 and i <= -3 + N; S_2[i] : i >= 0 and i <= -1 + N }", child: { sequence: [ { filter: "[N, M] -> { S_0[i]; S_1[i, j]; S_2[i] }", child: { schedule: "[N, M] - -> L_0[{ S_2[i] -> [(i)]; S_0[i] -> [(i)]; S_1[i, j] -> [(i)] }]", child: { sequence: + -> L_0[{ S_0[i] -> [(i)]; S_1[i, j] -> [(i)]; S_2[i] -> [(i)] }]", child: { sequence: [ { filter: "[N, M] -> { S_0[i] }" }, { filter: "[N, M] -> { S_1[i, j] }", child: { schedule: "[N, M] -> L_1[{ S_1[i, j] -> [(j)] }]" } }, { filter: "[N, M] -> { S_2[i] }" } ] } } }, { filter: "[N, M] -> { S_3[] }" }, { filter: "[N, M] -> { S_4[i] }", child: { schedule: "[N] -> L_2[{ S_4[i] -> [(i)] }]" } } ] } }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N, M] -> { A[i0, i1] : i1 <= 9 and i1 >= 0 and i0 >= 0 and i0 <= -1 + - N }' + extent: '[N, M] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 <= 9 and i1 >= + 0 }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' diff --git a/tests/data_dependent2.scop b/tests/data_dependent2.scop index 0a957c6..34c4447 100644 --- a/tests/data_dependent2.scop +++ b/tests/data_dependent2.scop @@ -5,7 +5,7 @@ context: '{ : }' schedule: '{ domain: "{ S_0[]; S_3[i, j] : i >= 0 and i <= 9 and j >= 0 and j <= 9; S_2[i, j] : i >= 0 and i <= 9 and j >= 0 and j <= 9; S_1[i] : i >= 0 and i <= 9 }", child: { sequence: [ { filter: "{ S_0[] }" }, { filter: "{ S_3[i, j]; S_2[i, - j]; S_1[i] }", child: { schedule: "L_0[{ S_1[i] -> [(i)]; S_3[i, j] -> [(i)]; S_2[i, + j]; S_1[i] }", child: { schedule: "L_0[{ S_3[i, j] -> [(i)]; S_1[i] -> [(i)]; S_2[i, j] -> [(i)] }]", child: { sequence: [ { filter: "{ S_1[i] }" }, { filter: "{ S_3[i, j]; S_2[i, j] }", child: { schedule: "L_1[{ S_3[i, j] -> [(j)]; S_2[i, j] -> [(j)] }]", child: { sequence: [ { filter: "{ S_2[i, j] }" }, { filter: "{ S_3[i, j] }" diff --git a/tests/decl.scop b/tests/decl.scop index 67d4c21..47269d3 100644 --- a/tests/decl.scop +++ b/tests/decl.scop @@ -9,13 +9,13 @@ schedule: '{ domain: "[M, N, K] -> { S_4[i, j, k] : i >= 0 and i <= -1 + M and j j <= -1 + N and k >= 0 and k <= -1 + K; S_2[i, j, k] : i >= 0 and i <= -1 + M and j >= 0 and j <= -1 + N and k >= 0 and k <= -1 + K; S_3[i, j, k] : i >= 0 and i <= -1 + M and j >= 0 and j <= -1 + N and k >= 0 and k <= -1 + K }", child: { schedule: - "[M, N, K] -> L_0[{ S_4[i, j, k] -> [(i)]; S_0[i, j] -> [(i)]; S_2[i, j, k] -> [(i)]; - S_3[i, j, k] -> [(i)]; S_1[i, j, k] -> [(i)] }]", child: { schedule: "[M, N, K] - -> L_1[{ S_4[i, j, k] -> [(j)]; S_0[i, j] -> [(j)]; S_2[i, j, k] -> [(j)]; S_3[i, - j, k] -> [(j)]; S_1[i, j, k] -> [(j)] }]", child: { sequence: [ { filter: "[M, N, + "[M, N, K] -> L_0[{ S_4[i, j, k] -> [(i)]; S_0[i, j] -> [(i)]; S_1[i, j, k] -> [(i)]; + S_2[i, j, k] -> [(i)]; S_3[i, j, k] -> [(i)] }]", child: { schedule: "[M, N, K] + -> L_1[{ S_4[i, j, k] -> [(j)]; S_0[i, j] -> [(j)]; S_1[i, j, k] -> [(j)]; S_2[i, + j, k] -> [(j)]; S_3[i, j, k] -> [(j)] }]", child: { sequence: [ { filter: "[M, N, K] -> { S_0[i, j] }" }, { filter: "[M, N, K] -> { S_4[i, j, k]; S_1[i, j, k]; S_2[i, j, k]; S_3[i, j, k] }", child: { schedule: "[M, N, K] -> L_2[{ S_4[i, j, k] -> [(k)]; - S_2[i, j, k] -> [(k)]; S_3[i, j, k] -> [(k)]; S_1[i, j, k] -> [(k)] }]", child: + S_1[i, j, k] -> [(k)]; S_2[i, j, k] -> [(k)]; S_3[i, j, k] -> [(k)] }]", child: { sequence: [ { filter: "[M, N, K] -> { S_1[i, j, k] }" }, { filter: "[M, N, K] -> { S_2[i, j, k] }" }, { filter: "[M, N, K] -> { S_4[i, j, k] }" }, { filter: "[M, N, K] -> { S_3[i, j, k] }" } ] } } } ] } } } }' @@ -26,15 +26,15 @@ arrays: element_size: 4 declared: 1 - context: '[K] -> { : K >= 0 }' - extent: '[N, K, M] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + K and i0 >= 0 }' + extent: '[N, K, M] -> { A[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + K }' element_type: float element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, K, M] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' + extent: '[N, K, M] -> { B[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + N }' element_type: float element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, K, M] -> { C[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' + extent: '[N, K, M] -> { C[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + N }' element_type: float element_size: 4 statements: diff --git a/tests/decl4.scop b/tests/decl4.scop index ddec6d4..2945ba7 100644 --- a/tests/decl4.scop +++ b/tests/decl4.scop @@ -43,7 +43,7 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_1[i] -> b[o0] : o0 <= -1 + n and o0 >= 0 }' + killed: '[n] -> { S_1[i] -> b[o0] : o0 >= 0 and o0 <= -1 + n }' index: '[n] -> { S_1[i] -> b[] }' depth: 1 reference: __pet_ref_1 @@ -57,7 +57,7 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_2[i] -> b[o0] : o0 <= -1 + n and o0 >= 0 }' + killed: '[n] -> { S_2[i] -> b[o0] : o0 >= 0 and o0 <= -1 + n }' index: '[n] -> { S_2[i] -> b[] }' depth: 1 reference: __pet_ref_2 diff --git a/tests/decl5.scop b/tests/decl5.scop index 716c189..66a70b9 100644 --- a/tests/decl5.scop +++ b/tests/decl5.scop @@ -15,7 +15,7 @@ arrays: declared: 1 exposed: 1 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { b[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + extent: '[n] -> { b[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + n }' element_type: float element_size: 4 @@ -44,8 +44,8 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_1[i] -> b[o0, o1] : o0 <= -1 + n and o1 >= 0 and o1 <= - -1 + n and o0 >= 0 }' + killed: '[n] -> { S_1[i] -> b[o0, o1] : o0 >= 0 and o0 <= -1 + n and o1 >= + 0 and o1 <= -1 + n }' index: '[n] -> { S_1[i] -> b[] }' depth: 2 reference: __pet_ref_1 @@ -59,8 +59,8 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_2[i] -> b[o0, o1] : o0 <= -1 + n and o1 >= 0 and o1 <= - -1 + n and o0 >= 0 }' + killed: '[n] -> { S_2[i] -> b[o0, o1] : o0 >= 0 and o0 <= -1 + n and o1 >= + 0 and o1 <= -1 + n }' index: '[n] -> { S_2[i] -> b[] }' depth: 2 reference: __pet_ref_2 diff --git a/tests/decl6.scop b/tests/decl6.scop index 330b897..a977d93 100644 --- a/tests/decl6.scop +++ b/tests/decl6.scop @@ -4,8 +4,8 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' schedule: '{ domain: "[n] -> { S_4[i] : i >= 0 and i <= -1 + n; S_2[i] : i >= 0 and i <= -1 + n; S_3[i] : i >= 0 and i <= -1 + n; S_1[i] : i >= 0 and i <= -1 + n; S_0[i] - : i >= 0 and i <= -1 + n }", child: { schedule: "[n] -> L_0[{ S_0[i] -> [(i)]; S_3[i] - -> [(i)]; S_4[i] -> [(i)]; S_2[i] -> [(i)]; S_1[i] -> [(i)] }]", child: { sequence: + : i >= 0 and i <= -1 + n }", child: { schedule: "[n] -> L_0[{ S_4[i] -> [(i)]; S_2[i] + -> [(i)]; S_3[i] -> [(i)]; S_1[i] -> [(i)]; S_0[i] -> [(i)] }]", child: { sequence: [ { filter: "[n] -> { S_0[i] }" }, { filter: "[n] -> { S_1[i] }" }, { filter: "[n] -> { S_4[i] }" }, { filter: "[n] -> { S_2[i]; S_3[i] }", child: { set: [ { filter: "[n] -> { S_2[i] }" }, { filter: "[n] -> { S_3[i] }" } ] } } ] } } }' @@ -32,7 +32,7 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_0[i] -> a[o0] : o0 <= -1 + n and o0 >= 0 }' + killed: '[n] -> { S_0[i] -> a[o0] : o0 >= 0 and o0 <= -1 + n }' index: '[n] -> { S_0[i] -> a[] }' depth: 1 reference: __pet_ref_0 @@ -46,7 +46,7 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_1[i] -> b[o0] : o0 <= -1 + n and o0 >= 0 }' + killed: '[n] -> { S_1[i] -> b[o0] : o0 >= 0 and o0 <= -1 + n }' index: '[n] -> { S_1[i] -> b[] }' depth: 1 reference: __pet_ref_1 @@ -78,7 +78,7 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_2[i] -> a[o0] : o0 <= -1 + n and o0 >= 0 }' + killed: '[n] -> { S_2[i] -> a[o0] : o0 >= 0 and o0 <= -1 + n }' index: '[n] -> { S_2[i] -> a[] }' depth: 1 reference: __pet_ref_4 @@ -92,7 +92,7 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_3[i] -> b[o0] : o0 <= -1 + n and o0 >= 0 }' + killed: '[n] -> { S_3[i] -> b[o0] : o0 >= 0 and o0 <= -1 + n }' index: '[n] -> { S_3[i] -> b[] }' depth: 1 reference: __pet_ref_5 diff --git a/tests/div_mod.scop b/tests/div_mod.scop index 6e3f024..6b09298 100644 --- a/tests/div_mod.scop +++ b/tests/div_mod.scop @@ -3,7 +3,7 @@ end: 232 indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_3[-1]; S_2[1]; S_0[-2]; S_1[2] }", child: { schedule: "L_0[{ - S_2[i] -> [(i)]; S_1[i] -> [(i)]; S_3[i] -> [(i)]; S_0[i] -> [(i)] }]", child: { + S_2[i] -> [(i)]; S_3[i] -> [(i)]; S_0[i] -> [(i)]; S_1[i] -> [(i)] }]", child: { sequence: [ { filter: "{ S_0[i] }" }, { filter: "{ S_1[i] }" }, { filter: "{ S_2[i] }" }, { filter: "{ S_3[i] }" } ] } } }' arrays: diff --git a/tests/dynamic_bound.scop b/tests/dynamic_bound.scop index f3edaa0..5543ebe 100644 --- a/tests/dynamic_bound.scop +++ b/tests/dynamic_bound.scop @@ -55,8 +55,8 @@ statements: - type: call name: g - line: 17 - domain: '{ [S_2[i, j] -> [N, M]] : i >= 0 and j >= 0 and N >= 1 + i and M >= 1 + - j }' + domain: '{ [S_2[i, j] -> [i2, i3]] : i >= 0 and j >= 0 and i2 >= 1 + i and i3 >= + 1 + j }' body: type: expression expr: @@ -93,8 +93,8 @@ statements: read: 1 write: 0 - line: 20 - domain: '{ [S_3[i, j] -> [N, M]] : i >= 0 and j >= 0 and N >= 1 + i and M >= 1 + - j }' + domain: '{ [S_3[i, j] -> [i2, i3]] : i >= 0 and j >= 0 and i2 >= 1 + i and i3 >= + 1 + j }' body: type: expression expr: diff --git a/tests/dynamic_condition.scop b/tests/dynamic_condition.scop index 773bc3c..b79e369 100644 --- a/tests/dynamic_condition.scop +++ b/tests/dynamic_condition.scop @@ -3,7 +3,7 @@ end: 174 indent: ' ' context: '{ : }' schedule: '{ domain: "{ S_0[i] : i >= 0 and i <= 99; S_1[i] : i >= 0 and i <= 99 }", - child: { schedule: "L_0[{ S_1[i] -> [(i)]; S_0[i] -> [(i)] }]", child: { sequence: + child: { schedule: "L_0[{ S_0[i] -> [(i)]; S_1[i] -> [(i)] }]", child: { sequence: [ { filter: "{ S_0[i] }" }, { filter: "{ S_1[i] }" } ] } } }' arrays: - context: '{ : }' @@ -31,7 +31,7 @@ statements: - type: call name: f - line: 12 - domain: '{ [S_1[i] -> [j]] : i >= 0 and i <= 99 and j <= 1 and j >= 0 }' + domain: '{ [S_1[i] -> [i1]] : i >= 0 and i <= 99 and i1 <= 1 and i1 >= 0 }' body: type: expression expr: diff --git a/tests/encapsulate/continue6.scop b/tests/encapsulate/continue6.scop index d9c0afd..a33e8e4 100644 --- a/tests/encapsulate/continue6.scop +++ b/tests/encapsulate/continue6.scop @@ -6,11 +6,11 @@ schedule: '{ domain: "{ S_3[i] : i >= 0 and i <= 99; S_5[i] : i >= 0 and i <= 99 S_10[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99; S_6[i, j] : exists (e0 = floor((j)/2): 2e0 = j and i <= 99 and i >= 0 and j <= 99 and j >= 0); S_4[i] : i >= 0 and i <= 99; S_7[i, j] : exists (e0 = floor((-1 + j)/2): 2e0 = -1 + j and i - <= 99 and i >= 0 and j <= 99 and j >= 0) }", child: { schedule: "L_0[{ S_3[i] -> - [(i)]; S_7[i, j] -> [(i)]; S_6[i, j] -> [(i)]; S_4[i] -> [(i)]; S_5[i] -> [(i)]; - S_10[i, j] -> [(i)] }]", child: { sequence: [ { filter: "{ S_4[i] }" }, { filter: + <= 99 and i >= 0 and j <= 99 and j >= 0) }", child: { schedule: "L_0[{ S_7[i, j] + -> [(i)]; S_10[i, j] -> [(i)]; S_3[i] -> [(i)]; S_4[i] -> [(i)]; S_5[i] -> [(i)]; + S_6[i, j] -> [(i)] }]", child: { sequence: [ { filter: "{ S_4[i] }" }, { filter: "{ S_3[i] }" }, { filter: "{ S_5[i] }" }, { filter: "{ S_6[i, j]; S_7[i, j] }", - child: { schedule: "L_2[{ S_6[i, j] -> [(j)]; S_7[i, j] -> [(j)] }]", child: { sequence: + child: { schedule: "L_2[{ S_7[i, j] -> [(j)]; S_6[i, j] -> [(j)] }]", child: { sequence: [ { filter: "{ S_6[i, j] }" }, { filter: "{ S_7[i, j] }" } ] } } }, { filter: "{ S_10[i, j] }", child: { schedule: "L_3[{ S_10[i, j] -> [(j)] }]" } } ] } } }' arrays: diff --git a/tests/encapsulate/for_while.scop b/tests/encapsulate/for_while.scop index 10a020c..65cfae3 100644 --- a/tests/encapsulate/for_while.scop +++ b/tests/encapsulate/for_while.scop @@ -5,7 +5,7 @@ context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' schedule: '{ domain: "[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n; S_4[x1] : x1 >= 0 and x1 <= -1 + n; S_3[x1] : x1 >= 0 and x1 <= -1 + n; S_5[x1] : x1 >= 0 and x1 <= -1 + n; R[x1] : x1 >= 0 and x1 <= -1 + n }", child: { schedule: "[n] -> L_0[{ - S1[x1] -> [(x1)]; R[x1] -> [(x1)]; S_3[x1] -> [(x1)]; S_5[x1] -> [(x1)]; S_4[x1] + S1[x1] -> [(x1)]; S_4[x1] -> [(x1)]; S_3[x1] -> [(x1)]; S_5[x1] -> [(x1)]; R[x1] -> [(x1)] }]", child: { sequence: [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_4[x1] }" }, { filter: "[n] -> { S_3[x1] }" }, { filter: "[n] -> { S_5[x1] }" }, { filter: "[n] -> { R[x1] }" } ] } } }' diff --git a/tests/encapsulate/independent5.scop b/tests/encapsulate/independent5.scop index 60296ff..dab7e33 100644 --- a/tests/encapsulate/independent5.scop +++ b/tests/encapsulate/independent5.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' schedule: '{ domain: "[n] -> { S_7[i] : i >= 0 and i <= -1 + n; S_6[i] : i >= 0 and i <= -1 + n; S_8[i] : i >= 0 and i <= -1 + n }", child: { schedule: "[n] -> L_0[{ - S_7[i] -> [(i)]; S_8[i] -> [(i)]; S_6[i] -> [(i)] }]", child: { sequence: [ { filter: + S_7[i] -> [(i)]; S_6[i] -> [(i)]; S_8[i] -> [(i)] }]", child: { sequence: [ { filter: "[n] -> { S_7[i] }" }, { filter: "[n] -> { S_6[i] }" }, { filter: "[n] -> { S_8[i] }" } ] } } }' arrays: diff --git a/tests/encapsulate/while.scop b/tests/encapsulate/while.scop index 0741a92..68efcf5 100644 --- a/tests/encapsulate/while.scop +++ b/tests/encapsulate/while.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' schedule: '{ domain: "[n] -> { S1[x] : x >= 0 and x <= -1 + n; S_3[x] : x >= 0 and x <= -1 + n; R[x] : x >= 0 and x <= -1 + n }", child: { schedule: "[n] -> L_0[{ - S1[x] -> [(x)]; R[x] -> [(x)]; S_3[x] -> [(x)] }]", child: { sequence: [ { filter: + S1[x] -> [(x)]; S_3[x] -> [(x)]; R[x] -> [(x)] }]", child: { sequence: [ { filter: "[n] -> { S1[x] }" }, { filter: "[n] -> { S_3[x] }" }, { filter: "[n] -> { R[x] }" } ] } } }' arrays: diff --git a/tests/encapsulate/while_affine.scop b/tests/encapsulate/while_affine.scop index 2c9d733..aff1eb7 100644 --- a/tests/encapsulate/while_affine.scop +++ b/tests/encapsulate/while_affine.scop @@ -4,8 +4,8 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' schedule: '{ domain: "[N] -> { S_0[99, t, j] : t >= 0 and j >= 0 and j <= -1 + N; S_1[99, t, j] : t >= 0 and j >= 0 and j <= -1 + N }", child: { schedule: "[N] -> - L_0[{ S_1[i, t, j] -> [(i)]; S_0[i, t, j] -> [(i)] }]", child: { schedule: "[N] - -> L_1[{ S_1[i, t, j] -> [(t)]; S_0[i, t, j] -> [(t)] }]", child: { sequence: [ + L_0[{ S_0[i, t, j] -> [(i)]; S_1[i, t, j] -> [(i)] }]", child: { schedule: "[N] + -> L_1[{ S_0[i, t, j] -> [(t)]; S_1[i, t, j] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_0[i, t, j] }", child: { schedule: "[N] -> L_2[{ S_0[i, t, j] -> [(j)] }]" } }, { filter: "[N] -> { S_1[i, t, j] }", child: { schedule: "[N] -> L_3[{ S_1[i, t, j] -> [(j)] }]" } } ] } } } }' @@ -20,7 +20,7 @@ arrays: element_size: 4 statements: - line: 9 - domain: '[N] -> { S_0[99, t, j] : j >= 0 and j <= -1 + N and t >= 0 }' + domain: '[N] -> { S_0[99, t, j] : t >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: @@ -35,7 +35,7 @@ statements: - type: int value: 0 - line: 11 - domain: '[N] -> { S_1[99, t, j] : j >= 0 and j <= -1 + N and t >= 0 }' + domain: '[N] -> { S_1[99, t, j] : t >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: diff --git a/tests/filter.scop b/tests/filter.scop index 12647c6..329553d 100644 --- a/tests/filter.scop +++ b/tests/filter.scop @@ -14,7 +14,7 @@ arrays: element_size: 4 statements: - line: 7 - domain: '{ [S_0[] -> [test]] : test <= -1 or test >= 1 }' + domain: '{ [S_0[] -> [i0]] : i0 <= -1 or i0 >= 1 }' body: type: expression expr: diff --git a/tests/for_while.scop b/tests/for_while.scop index 401754e..89c08fd 100644 --- a/tests/for_while.scop +++ b/tests/for_while.scop @@ -4,15 +4,15 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' schedule: '{ domain: "[n] -> { S2[x1, x2] : x1 >= 0 and x1 <= -1 + n and x2 >= 0; S1[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1, x2] : x1 >= 0 and x1 <= -1 + n and x2 - >= 0; R[x1] : x1 >= 0 and x1 <= -1 + n }", child: { schedule: "[n] -> L_0[{ S1[x1] - -> [(x1)]; R[x1] -> [(x1)]; S_1[x1, x2] -> [(x1)]; S2[x1, x2] -> [(x1)] }]", child: + >= 0; R[x1] : x1 >= 0 and x1 <= -1 + n }", child: { schedule: "[n] -> L_0[{ S2[x1, + x2] -> [(x1)]; S1[x1] -> [(x1)]; S_1[x1, x2] -> [(x1)]; R[x1] -> [(x1)] }]", child: { sequence: [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S2[x1, x2]; S_1[x1, - x2] }", child: { schedule: "[n] -> L_1[{ S_1[x1, x2] -> [(x2)]; S2[x1, x2] -> [(x2)] + x2] }", child: { schedule: "[n] -> L_1[{ S2[x1, x2] -> [(x2)]; S_1[x1, x2] -> [(x2)] }]", child: { sequence: [ { filter: "[n] -> { S_1[x1, x2] }" }, { filter: "[n] -> { S2[x1, x2] }" } ] } } }, { filter: "[n] -> { R[x1] }" } ] } } }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, x2] : x1 <= -1 + n and x2 >= 0 and x1 >= 0 }' + extent: '[n] -> { __pet_test_0[x1, x2] : x1 >= 0 and x1 <= -1 + n and x2 >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -38,7 +38,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { [S_1[x1, x2] -> [1]] : x1 <= -1 + n and x2 >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_1[x1, x2] -> [1]] : x1 >= 0 and x1 <= -1 + n and x2 >= 0 }' body: type: expression expr: @@ -70,7 +70,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, x2] -> [1]] : x1 <= -1 + n and x2 >= 0 and x1 >= 0 }' + domain: '[n] -> { [S2[x1, x2] -> [1]] : x1 >= 0 and x1 <= -1 + n and x2 >= 0 }' body: type: expression expr: diff --git a/tests/for_while_dec.scop b/tests/for_while_dec.scop index 228dcb0..96a652e 100644 --- a/tests/for_while_dec.scop +++ b/tests/for_while_dec.scop @@ -5,16 +5,16 @@ context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' schedule: '{ domain: "[n] -> { S2[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and x1 >= 0 and x1 <= -1 + n and x2 <= 9); S1[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and x1 >= 0 and x1 <= -1 + n and x2 <= - 9); R[x1] : x1 >= 0 and x1 <= -1 + n }", child: { schedule: "[n] -> L_0[{ S1[x1] - -> [(x1)]; R[x1] -> [(x1)]; S_1[x1, x2] -> [(x1)]; S2[x1, x2] -> [(x1)] }]", child: + 9); R[x1] : x1 >= 0 and x1 <= -1 + n }", child: { schedule: "[n] -> L_0[{ S2[x1, + x2] -> [(x1)]; S1[x1] -> [(x1)]; S_1[x1, x2] -> [(x1)]; R[x1] -> [(x1)] }]", child: { sequence: [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S2[x1, x2]; S_1[x1, - x2] }", child: { schedule: "[n] -> L_1[{ S_1[x1, x2] -> [(-x2)]; S2[x1, x2] -> [(-x2)] + x2] }", child: { schedule: "[n] -> L_1[{ S2[x1, x2] -> [(-x2)]; S_1[x1, x2] -> [(-x2)] }]", child: { sequence: [ { filter: "[n] -> { S_1[x1, x2] }" }, { filter: "[n] -> { S2[x1, x2] }" } ] } } }, { filter: "[n] -> { R[x1] }" } ] } } }' arrays: - context: '{ : }' extent: '[n] -> { __pet_test_0[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' + x1 >= 0 and x1 <= -1 + n and x2 <= 9) }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -41,7 +41,7 @@ statements: name: f - line: 13 domain: '[n] -> { [S_1[x1, x2] -> [1]] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' + x1 >= 0 and x1 <= -1 + n and x2 <= 9) }' body: type: expression expr: @@ -74,7 +74,7 @@ statements: write: 0 - line: 14 domain: '[n] -> { [S2[x1, x2] -> [1]] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' + x1 >= 0 and x1 <= -1 + n and x2 <= 9) }' body: type: expression expr: diff --git a/tests/for_while_inc.scop b/tests/for_while_inc.scop index d1b6ba9..3801125 100644 --- a/tests/for_while_inc.scop +++ b/tests/for_while_inc.scop @@ -6,16 +6,16 @@ schedule: '{ domain: "[n] -> { S2[x1, x2] : exists (e0 = floor((-1 + x2)/2): 2e0 -1 + x2 and x1 >= 0 and x1 <= -1 + n and x2 >= 9); S1[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1, x2] : exists (e0 = floor((-1 + x2)/2): 2e0 = -1 + x2 and x1 >= 0 and x1 <= -1 + n and x2 >= 9); R[x1] : x1 >= 0 and x1 <= -1 + n }", child: { schedule: - "[n] -> L_0[{ S1[x1] -> [(x1)]; R[x1] -> [(x1)]; S_1[x1, x2] -> [(x1)]; S2[x1, x2] + "[n] -> L_0[{ S2[x1, x2] -> [(x1)]; S1[x1] -> [(x1)]; S_1[x1, x2] -> [(x1)]; R[x1] -> [(x1)] }]", child: { sequence: [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] - -> { S2[x1, x2]; S_1[x1, x2] }", child: { schedule: "[n] -> L_1[{ S_1[x1, x2] -> - [(x2)]; S2[x1, x2] -> [(x2)] }]", child: { sequence: [ { filter: "[n] -> { S_1[x1, + -> { S2[x1, x2]; S_1[x1, x2] }", child: { schedule: "[n] -> L_1[{ S2[x1, x2] -> + [(x2)]; S_1[x1, x2] -> [(x2)] }]", child: { sequence: [ { filter: "[n] -> { S_1[x1, x2] }" }, { filter: "[n] -> { S2[x1, x2] }" } ] } } }, { filter: "[n] -> { R[x1] }" } ] } } }' arrays: - context: '{ : }' extent: '[n] -> { __pet_test_0[x1, x2] : exists (e0 = floor((-1 + x2)/2): 2e0 = - -1 + x2 and x1 <= -1 + n and x2 >= 9 and x1 >= 0) }' + -1 + x2 and x1 >= 0 and x1 <= -1 + n and x2 >= 9) }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -42,7 +42,7 @@ statements: name: f - line: 13 domain: '[n] -> { [S_1[x1, x2] -> [1]] : exists (e0 = floor((-1 + x2)/2): 2e0 = - -1 + x2 and x1 <= -1 + n and x2 >= 9 and x1 >= 0) }' + -1 + x2 and x1 >= 0 and x1 <= -1 + n and x2 >= 9) }' body: type: expression expr: @@ -75,7 +75,7 @@ statements: write: 0 - line: 14 domain: '[n] -> { [S2[x1, x2] -> [1]] : exists (e0 = floor((-1 + x2)/2): 2e0 = -1 - + x2 and x1 <= -1 + n and x2 >= 9 and x1 >= 0) }' + + x2 and x1 >= 0 and x1 <= -1 + n and x2 >= 9) }' body: type: expression expr: diff --git a/tests/for_while_inc2.scop b/tests/for_while_inc2.scop index 2815ee9..638bbc4 100644 --- a/tests/for_while_inc2.scop +++ b/tests/for_while_inc2.scop @@ -6,18 +6,18 @@ schedule: '{ domain: "[n] -> { S_6[x1] : x1 >= 0 and x1 <= -1 + n; S_2[x1, t] : >= 0 and x1 <= -1 + n and t >= 0; S2[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0; S1[x1] : x1 >= 0 and x1 <= -1 + n; S_5[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1] : x1 >= 0 and x1 <= -1 + n; R[x1] : x1 >= 0 and x1 <= -1 + n; S_4[x1, t] : x1 >= - 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S1[x1] -> [(x1)]; - S_4[x1, t] -> [(x1)]; R[x1] -> [(x1)]; S_6[x1] -> [(x1)]; S_5[x1] -> [(x1)]; S2[x1, - t] -> [(x1)]; S_2[x1, t] -> [(x1)]; S_1[x1] -> [(x1)] }]", child: { sequence: [ - { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_5[x1] }" }, { filter: "[n] + 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S_6[x1] -> [(x1)]; + S_2[x1, t] -> [(x1)]; S2[x1, t] -> [(x1)]; S1[x1] -> [(x1)]; S_5[x1] -> [(x1)]; + S_1[x1] -> [(x1)]; R[x1] -> [(x1)]; S_4[x1, t] -> [(x1)] }]", child: { sequence: + [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_5[x1] }" }, { filter: "[n] -> { S_1[x1] }" }, { filter: "[n] -> { S_2[x1, t]; S2[x1, t]; S_4[x1, t] }", child: - { schedule: "[n] -> L_1[{ S_4[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; S_2[x1, t] -> + { schedule: "[n] -> L_1[{ S_2[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; S_4[x1, t] -> [(t)] }]", child: { sequence: [ { filter: "[n] -> { S_2[x1, t] }" }, { filter: "[n] -> { S2[x1, t] }" }, { filter: "[n] -> { S_4[x1, t] }" } ] } } }, { filter: "[n] -> { S_6[x1] }" }, { filter: "[n] -> { R[x1] }" } ] } } }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -76,7 +76,7 @@ statements: - type: int value: 0 - line: 13 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -108,7 +108,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -135,7 +135,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: diff --git a/tests/for_while_inc3.scop b/tests/for_while_inc3.scop index 2832991..6e94241 100644 --- a/tests/for_while_inc3.scop +++ b/tests/for_while_inc3.scop @@ -6,18 +6,18 @@ schedule: '{ domain: "[n] -> { S_6[x1] : x1 >= 0 and x1 <= -1 + n; S_2[x1, t] : >= 0 and x1 <= -1 + n and t >= 0; S2[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0; S1[x1] : x1 >= 0 and x1 <= -1 + n; S_5[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1] : x1 >= 0 and x1 <= -1 + n; R[x1] : x1 >= 0 and x1 <= -1 + n; S_4[x1, t] : x1 >= - 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S1[x1] -> [(x1)]; - S_4[x1, t] -> [(x1)]; R[x1] -> [(x1)]; S_6[x1] -> [(x1)]; S_5[x1] -> [(x1)]; S2[x1, - t] -> [(x1)]; S_2[x1, t] -> [(x1)]; S_1[x1] -> [(x1)] }]", child: { sequence: [ - { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_5[x1] }" }, { filter: "[n] + 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S_6[x1] -> [(x1)]; + S_2[x1, t] -> [(x1)]; S2[x1, t] -> [(x1)]; S1[x1] -> [(x1)]; S_5[x1] -> [(x1)]; + S_1[x1] -> [(x1)]; R[x1] -> [(x1)]; S_4[x1, t] -> [(x1)] }]", child: { sequence: + [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_5[x1] }" }, { filter: "[n] -> { S_1[x1] }" }, { filter: "[n] -> { S_2[x1, t]; S2[x1, t]; S_4[x1, t] }", child: - { schedule: "[n] -> L_1[{ S_4[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; S_2[x1, t] -> + { schedule: "[n] -> L_1[{ S_2[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; S_4[x1, t] -> [(t)] }]", child: { sequence: [ { filter: "[n] -> { S_2[x1, t] }" }, { filter: "[n] -> { S2[x1, t] }" }, { filter: "[n] -> { S_4[x1, t] }" } ] } } }, { filter: "[n] -> { S_6[x1] }" }, { filter: "[n] -> { R[x1] }" } ] } } }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -76,7 +76,7 @@ statements: - type: int value: 0 - line: 13 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -108,7 +108,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -135,7 +135,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: diff --git a/tests/for_while_inc4.scop b/tests/for_while_inc4.scop index 29a8405..b3e4b05 100644 --- a/tests/for_while_inc4.scop +++ b/tests/for_while_inc4.scop @@ -5,17 +5,17 @@ context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' schedule: '{ domain: "[n] -> { S_2[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0; S2[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0; S1[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1] : x1 >= 0 and x1 <= -1 + n; R[x1] : x1 >= 0 and x1 <= -1 + n; S_4[x1, t] : x1 >= - 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S1[x1] -> [(x1)]; - S_4[x1, t] -> [(x1)]; R[x1] -> [(x1)]; S2[x1, t] -> [(x1)]; S_2[x1, t] -> [(x1)]; - S_1[x1] -> [(x1)] }]", child: { sequence: [ { filter: "[n] -> { S1[x1] }" }, { filter: - "[n] -> { S_1[x1] }" }, { filter: "[n] -> { S_2[x1, t]; S2[x1, t]; S_4[x1, t] }", - child: { schedule: "[n] -> L_1[{ S_4[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; S_2[x1, - t] -> [(t)] }]", child: { sequence: [ { filter: "[n] -> { S_2[x1, t] }" }, { filter: - "[n] -> { S2[x1, t] }" }, { filter: "[n] -> { S_4[x1, t] }" } ] } } }, { filter: - "[n] -> { R[x1] }" } ] } } }' + 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S_2[x1, t] -> + [(x1)]; S2[x1, t] -> [(x1)]; S1[x1] -> [(x1)]; S_1[x1] -> [(x1)]; R[x1] -> [(x1)]; + S_4[x1, t] -> [(x1)] }]", child: { sequence: [ { filter: "[n] -> { S1[x1] }" }, + { filter: "[n] -> { S_1[x1] }" }, { filter: "[n] -> { S_2[x1, t]; S2[x1, t]; S_4[x1, + t] }", child: { schedule: "[n] -> L_1[{ S_2[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; + S_4[x1, t] -> [(t)] }]", child: { sequence: [ { filter: "[n] -> { S_2[x1, t] }" + }, { filter: "[n] -> { S2[x1, t] }" }, { filter: "[n] -> { S_4[x1, t] }" } ] } } + }, { filter: "[n] -> { R[x1] }" } ] } } }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -60,7 +60,7 @@ statements: - type: int value: 0 - line: 14 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -92,7 +92,7 @@ statements: read: 1 write: 0 - line: 15 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -119,7 +119,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: diff --git a/tests/for_while_init.scop b/tests/for_while_init.scop index d3ab25e..4a1ce10 100644 --- a/tests/for_while_init.scop +++ b/tests/for_while_init.scop @@ -6,18 +6,18 @@ schedule: '{ domain: "[n] -> { S_6[x1] : x1 >= 0 and x1 <= -1 + n; S_2[x1, t] : >= 0 and x1 <= -1 + n and t >= 0; S2[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0; S1[x1] : x1 >= 0 and x1 <= -1 + n; S_5[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1] : x1 >= 0 and x1 <= -1 + n; R[x1] : x1 >= 0 and x1 <= -1 + n; S_4[x1, t] : x1 >= - 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S1[x1] -> [(x1)]; - S_4[x1, t] -> [(x1)]; R[x1] -> [(x1)]; S_6[x1] -> [(x1)]; S_5[x1] -> [(x1)]; S2[x1, - t] -> [(x1)]; S_2[x1, t] -> [(x1)]; S_1[x1] -> [(x1)] }]", child: { sequence: [ - { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_5[x1] }" }, { filter: "[n] + 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S_6[x1] -> [(x1)]; + S_2[x1, t] -> [(x1)]; S2[x1, t] -> [(x1)]; S1[x1] -> [(x1)]; S_5[x1] -> [(x1)]; + S_1[x1] -> [(x1)]; R[x1] -> [(x1)]; S_4[x1, t] -> [(x1)] }]", child: { sequence: + [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_5[x1] }" }, { filter: "[n] -> { S_1[x1] }" }, { filter: "[n] -> { S_2[x1, t]; S2[x1, t]; S_4[x1, t] }", child: - { schedule: "[n] -> L_1[{ S_4[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; S_2[x1, t] -> + { schedule: "[n] -> L_1[{ S_2[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; S_4[x1, t] -> [(t)] }]", child: { sequence: [ { filter: "[n] -> { S_2[x1, t] }" }, { filter: "[n] -> { S2[x1, t] }" }, { filter: "[n] -> { S_4[x1, t] }" } ] } } }, { filter: "[n] -> { S_6[x1] }" }, { filter: "[n] -> { R[x1] }" } ] } } }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -79,7 +79,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -111,7 +111,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -138,7 +138,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: diff --git a/tests/for_while_init2.scop b/tests/for_while_init2.scop index 13cc929..b51ae79 100644 --- a/tests/for_while_init2.scop +++ b/tests/for_while_init2.scop @@ -6,18 +6,18 @@ schedule: '{ domain: "[n] -> { S_6[x1] : x1 >= 0 and x1 <= -1 + n; S_2[x1, t] : >= 0 and x1 <= -1 + n and t >= 0; S2[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0; S1[x1] : x1 >= 0 and x1 <= -1 + n; S_5[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1] : x1 >= 0 and x1 <= -1 + n; R[x1] : x1 >= 0 and x1 <= -1 + n; S_4[x1, t] : x1 >= - 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S1[x1] -> [(x1)]; - S_4[x1, t] -> [(x1)]; R[x1] -> [(x1)]; S_6[x1] -> [(x1)]; S_5[x1] -> [(x1)]; S2[x1, - t] -> [(x1)]; S_2[x1, t] -> [(x1)]; S_1[x1] -> [(x1)] }]", child: { sequence: [ - { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_5[x1] }" }, { filter: "[n] + 0 and x1 <= -1 + n and t >= 0 }", child: { schedule: "[n] -> L_0[{ S_6[x1] -> [(x1)]; + S_2[x1, t] -> [(x1)]; S2[x1, t] -> [(x1)]; S1[x1] -> [(x1)]; S_5[x1] -> [(x1)]; + S_1[x1] -> [(x1)]; R[x1] -> [(x1)]; S_4[x1, t] -> [(x1)] }]", child: { sequence: + [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_5[x1] }" }, { filter: "[n] -> { S_1[x1] }" }, { filter: "[n] -> { S_2[x1, t]; S2[x1, t]; S_4[x1, t] }", child: - { schedule: "[n] -> L_1[{ S_4[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; S_2[x1, t] -> + { schedule: "[n] -> L_1[{ S_2[x1, t] -> [(t)]; S2[x1, t] -> [(t)]; S_4[x1, t] -> [(t)] }]", child: { sequence: [ { filter: "[n] -> { S_2[x1, t] }" }, { filter: "[n] -> { S2[x1, t] }" }, { filter: "[n] -> { S_4[x1, t] }" } ] } } }, { filter: "[n] -> { S_6[x1] }" }, { filter: "[n] -> { R[x1] }" } ] } } }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -79,7 +79,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -111,7 +111,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: @@ -138,7 +138,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 >= 0 and x1 <= -1 + n and t >= 0 }' body: type: expression expr: diff --git a/tests/for_while_init3.scop b/tests/for_while_init3.scop index d0dfab3..771caa1 100644 --- a/tests/for_while_init3.scop +++ b/tests/for_while_init3.scop @@ -7,16 +7,16 @@ schedule: '{ domain: "[n] -> { S_6[i] : i >= 0 and i <= -1 + n; S_2[i, t] : i >= i >= 0 and i <= -1 + n and t >= 0; S_1[i] : i >= 0 and i <= -1 + n; S_4[i, t] : i >= 0 and i <= -1 + n and t >= 0 }", child: { sequence: [ { filter: "[n] -> { S_0[] }" }, { filter: "[n] -> { S_6[i]; S_2[i, t]; S_5[i]; S_3[i, t]; S_1[i]; S_4[i, t] - }", child: { schedule: "[n] -> L_0[{ S_3[i, t] -> [(i)]; S_4[i, t] -> [(i)]; S_6[i] - -> [(i)]; S_5[i] -> [(i)]; S_2[i, t] -> [(i)]; S_1[i] -> [(i)] }]", child: { sequence: - [ { filter: "[n] -> { S_5[i] }" }, { filter: "[n] -> { S_1[i] }" }, { filter: "[n] - -> { S_2[i, t]; S_3[i, t]; S_4[i, t] }", child: { schedule: "[n] -> L_1[{ S_3[i, - t] -> [(t)]; S_4[i, t] -> [(t)]; S_2[i, t] -> [(t)] }]", child: { sequence: [ { - filter: "[n] -> { S_2[i, t] }" }, { filter: "[n] -> { S_3[i, t] }" }, { filter: + }", child: { schedule: "[n] -> L_0[{ S_6[i] -> [(i)]; S_2[i, t] -> [(i)]; S_5[i] + -> [(i)]; S_3[i, t] -> [(i)]; S_1[i] -> [(i)]; S_4[i, t] -> [(i)] }]", child: { + sequence: [ { filter: "[n] -> { S_5[i] }" }, { filter: "[n] -> { S_1[i] }" }, { + filter: "[n] -> { S_2[i, t]; S_3[i, t]; S_4[i, t] }", child: { schedule: "[n] -> + L_1[{ S_2[i, t] -> [(t)]; S_3[i, t] -> [(t)]; S_4[i, t] -> [(t)] }]", child: { sequence: + [ { filter: "[n] -> { S_2[i, t] }" }, { filter: "[n] -> { S_3[i, t] }" }, { filter: "[n] -> { S_4[i, t] }" } ] } } }, { filter: "[n] -> { S_6[i] }" } ] } } } ] } }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[i, t] : i <= -1 + n and t >= 0 and i >= 0 }' + extent: '[n] -> { __pet_test_0[i, t] : i >= 0 and i <= -1 + n and t >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -82,7 +82,7 @@ statements: read: 1 write: 0 - line: 8 - domain: '[n] -> { [S_2[i, t] -> [1]] : i <= -1 + n and t >= 0 and i >= 0 }' + domain: '[n] -> { [S_2[i, t] -> [1]] : i >= 0 and i <= -1 + n and t >= 0 }' body: type: expression expr: @@ -111,7 +111,7 @@ statements: read: 1 write: 0 - line: 9 - domain: '[n] -> { [S_3[i, t] -> [1]] : i <= -1 + n and t >= 0 and i >= 0 }' + domain: '[n] -> { [S_3[i, t] -> [1]] : i >= 0 and i <= -1 + n and t >= 0 }' body: type: expression expr: @@ -130,7 +130,7 @@ statements: read: 1 write: 0 - line: 8 - domain: '[n] -> { [S_4[i, t] -> [1]] : i <= -1 + n and t >= 0 and i >= 0 }' + domain: '[n] -> { [S_4[i, t] -> [1]] : i >= 0 and i <= -1 + n and t >= 0 }' body: type: expression expr: diff --git a/tests/for_while_overflow.scop b/tests/for_while_overflow.scop index 3e4f867..5a87354 100644 --- a/tests/for_while_overflow.scop +++ b/tests/for_while_overflow.scop @@ -57,8 +57,8 @@ statements: read: 1 write: 0 - line: 14 - domain: '[N] -> { [S_2[T, i] -> [1]] : i >= 0 and i <= -1 + 2N and N <= 1073741823 - and T >= 0 }' + domain: '[N] -> { [S_2[T, i] -> [1]] : N <= 1073741823 and T >= 0 and i >= 0 and + i <= -1 + 2N }' body: type: expression expr: diff --git a/tests/for_while_unsigned.scop b/tests/for_while_unsigned.scop index bc2352d..324432a 100644 --- a/tests/for_while_unsigned.scop +++ b/tests/for_while_unsigned.scop @@ -5,16 +5,16 @@ context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' schedule: '{ domain: "[n] -> { S2[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and x1 >= 0 and x1 <= -1 + n and x2 <= 9); S1[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and x1 >= 0 and x1 <= -1 + n and x2 <= - 9); R[x1] : x1 >= 0 and x1 <= -1 + n }", child: { schedule: "[n] -> L_0[{ S1[x1] - -> [(x1)]; R[x1] -> [(x1)]; S_1[x1, x2] -> [(x1)]; S2[x1, x2] -> [(x1)] }]", child: + 9); R[x1] : x1 >= 0 and x1 <= -1 + n }", child: { schedule: "[n] -> L_0[{ S2[x1, + x2] -> [(x1)]; S1[x1] -> [(x1)]; S_1[x1, x2] -> [(x1)]; R[x1] -> [(x1)] }]", child: { sequence: [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S2[x1, x2]; S_1[x1, - x2] }", child: { schedule: "[n] -> L_1[{ S_1[x1, x2] -> [(-x2)]; S2[x1, x2] -> [(-x2)] + x2] }", child: { schedule: "[n] -> L_1[{ S2[x1, x2] -> [(-x2)]; S_1[x1, x2] -> [(-x2)] }]", child: { sequence: [ { filter: "[n] -> { S_1[x1, x2] }" }, { filter: "[n] -> { S2[x1, x2] }" } ] } } }, { filter: "[n] -> { R[x1] }" } ] } } }' arrays: - context: '{ : }' extent: '[n] -> { __pet_test_0[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' + x1 >= 0 and x1 <= -1 + n and x2 <= 9) }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -41,7 +41,7 @@ statements: name: f - line: 13 domain: '[n] -> { [S_1[x1, x2] -> [1]] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' + x1 >= 0 and x1 <= -1 + n and x2 <= 9) }' body: type: expression expr: @@ -74,7 +74,7 @@ statements: write: 0 - line: 14 domain: '[n] -> { [S2[x1, x2] -> [1]] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' + x1 >= 0 and x1 <= -1 + n and x2 <= 9) }' body: type: expression expr: diff --git a/tests/for_while_unsigned2.scop b/tests/for_while_unsigned2.scop index 272ce09..9593357 100644 --- a/tests/for_while_unsigned2.scop +++ b/tests/for_while_unsigned2.scop @@ -7,7 +7,7 @@ schedule: '{ domain: "[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1, x2] : x1 >= 0 and x1 <= -1 + n; S2[x1, x2, x3] : exists (e0 = floor((x2)/256), e1 = floor((x2)/3): 3e1 = x2 and x1 >= 0 and x1 <= -1 + n and x2 <= 9 and x3 >= 0 and 256e0 >= -255 + x2 and 256e0 <= x2 - x3) }", child: { schedule: "[n] -> L_0[{ S1[x1] -> [(x1)]; - R[x1] -> [(x1)]; S_1[x1, x2] -> [(x1)]; S2[x1, x2, x3] -> [(x1)] }]", child: { sequence: + S_1[x1, x2] -> [(x1)]; R[x1] -> [(x1)]; S2[x1, x2, x3] -> [(x1)] }]", child: { sequence: [ { filter: "[n] -> { S1[x1] }" }, { filter: "[n] -> { S_1[x1, x2]; S2[x1, x2, x3] }", child: { schedule: "[n] -> L_1[{ S_1[x1, x2] -> [(-x2)]; S2[x1, x2, x3] -> [(-x2)] }]", child: { sequence: [ { filter: "[n] -> { S_1[x1, x2] }" }, { filter: "[n] -> @@ -16,7 +16,7 @@ schedule: '{ domain: "[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n; S_1[x1, x2] : arrays: - context: '{ : }' extent: '[n] -> { __pet_test_0[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' + x1 >= 0 and x1 <= -1 + n and x2 <= 9) }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -47,7 +47,7 @@ statements: name: f - line: 13 domain: '[n] -> { [S_1[x1, x2] -> [1]] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' + x1 >= 0 and x1 <= -1 + n and x2 <= 9) }' body: type: expression expr: @@ -80,8 +80,8 @@ statements: write: 0 - line: 15 domain: '[n] -> { [S2[x1, x2, x3] -> [1]] : exists (e0 = floor((x2)/256), e1 = floor((x2)/3): - 3e1 = x2 and x1 <= -1 + n and x2 <= 9 and x3 >= 0 and 256e0 <= x2 - x3 and x1 - >= 0 and 256e0 >= -255 + x2) }' + 3e1 = x2 and x1 >= 0 and x1 <= -1 + n and x2 <= 9 and x3 >= 0 and 256e0 <= x2 + - x3 and 256e0 >= -255 + x2) }' body: type: expression expr: diff --git a/tests/inc5.scop b/tests/inc5.scop index e55b7ce..d29adfb 100644 --- a/tests/inc5.scop +++ b/tests/inc5.scop @@ -4,8 +4,8 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' schedule: '{ domain: "{ S_3[t] : t >= 0; S_0[]; S_2[t] : t >= 0; S_4[t] : t >= 0; S_1[] }", child: { sequence: [ { filter: "{ S_0[] }" }, { filter: "{ S_1[] }" }, - { filter: "{ S_3[t]; S_2[t]; S_4[t] }", child: { schedule: "L_0[{ S_2[t] -> [(t)]; - S_3[t] -> [(t)]; S_4[t] -> [(t)] }]", child: { sequence: [ { filter: "{ S_2[t] }" + { filter: "{ S_3[t]; S_2[t]; S_4[t] }", child: { schedule: "L_0[{ S_4[t] -> [(t)]; + S_2[t] -> [(t)]; S_3[t] -> [(t)] }]", child: { sequence: [ { filter: "{ S_2[t] }" }, { filter: "{ S_3[t] }" }, { filter: "{ S_4[t] }" } ] } } } ] } }' arrays: - context: '{ : }' diff --git a/tests/independent1.scop b/tests/independent1.scop index 2580236..9722d45 100644 --- a/tests/independent1.scop +++ b/tests/independent1.scop @@ -7,16 +7,16 @@ schedule: '{ domain: "[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j >= 0 and schedule: "[n] -> L_1[{ S_0[i, j] -> [(j)] }]" } } }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { A[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { B[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 statements: - line: 7 - domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n + domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n }' body: type: expression diff --git a/tests/independent2.scop b/tests/independent2.scop index 0e85647..9df3756 100644 --- a/tests/independent2.scop +++ b/tests/independent2.scop @@ -11,12 +11,12 @@ arrays: element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { B[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 statements: - line: 7 - domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n + domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n }' body: type: expression diff --git a/tests/independent3.scop b/tests/independent3.scop index 7883858..d22fadd 100644 --- a/tests/independent3.scop +++ b/tests/independent3.scop @@ -5,10 +5,10 @@ context: '[n] -> { : n >= 0 and n <= 2147483647 }' schedule: '{ domain: "[n] -> { S_2[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n; S_0[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n; S_3[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n; S_1[i, j] : i >= 0 and i - <= -1 + n and j >= 0 and j <= -1 + n }", child: { schedule: "[n] -> L_0[{ S_3[i, - j] -> [(i)]; S_1[i, j] -> [(i)]; S_2[i, j] -> [(i)]; S_0[i, j] -> [(i)] }]", child: - { schedule: "[n] -> L_1[{ S_3[i, j] -> [(j)]; S_1[i, j] -> [(j)]; S_2[i, j] -> [(j)]; - S_0[i, j] -> [(j)] }]", child: { sequence: [ { filter: "[n] -> { S_0[i, j] }" }, + <= -1 + n and j >= 0 and j <= -1 + n }", child: { schedule: "[n] -> L_0[{ S_2[i, + j] -> [(i)]; S_0[i, j] -> [(i)]; S_3[i, j] -> [(i)]; S_1[i, j] -> [(i)] }]", child: + { schedule: "[n] -> L_1[{ S_2[i, j] -> [(j)]; S_0[i, j] -> [(j)]; S_3[i, j] -> [(j)]; + S_1[i, j] -> [(j)] }]", child: { sequence: [ { filter: "[n] -> { S_0[i, j] }" }, { filter: "[n] -> { S_1[i, j] }" }, { filter: "[n] -> { S_3[i, j] }" }, { filter: "[n] -> { S_2[i, j] }" } ] } } } }' arrays: @@ -18,16 +18,16 @@ arrays: element_size: 4 declared: 1 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { A[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { B[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 statements: - line: 7 - domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n + domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n }' body: type: expression @@ -41,7 +41,7 @@ statements: reference: __pet_ref_0 kill: 1 - line: 7 - domain: '[n] -> { S_1[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n + domain: '[n] -> { S_1[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n }' body: type: expression @@ -68,7 +68,7 @@ statements: read: 1 write: 0 - line: 8 - domain: '[n] -> { S_3[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n + domain: '[n] -> { S_3[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n }' body: type: expression @@ -93,7 +93,7 @@ statements: read: 1 write: 0 - line: 7 - domain: '[n] -> { S_2[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n + domain: '[n] -> { S_2[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n }' body: type: expression @@ -112,7 +112,7 @@ independences: : j'' >= 1 + j; S_0[i, j] -> S_2[i, j''] : j'' >= 1 + j; S_3[i, j] -> S_2[i, j''] : j'' >= 1 + j; S_1[i, j] -> S_0[i, j''] : j'' >= 1 + j; S_2[i, j] -> S_0[i, j''] : j'' >= 1 + j; S_0[i, j] -> S_0[i, j''] : j'' >= 1 + j; S_0[i, j] -> S_3[i, j''] - : j'' >= 1 + j; S_3[i, j] -> S_0[i, j''] : j'' >= 1 + j; S_1[i, j] -> S_2[i, j''] + : j'' >= 1 + j; S_1[i, j] -> S_2[i, j''] : j'' >= 1 + j; S_3[i, j] -> S_0[i, j''] : j'' >= 1 + j; S_3[i, j] -> S_3[i, j''] : j'' >= 1 + j; S_1[i, j] -> S_3[i, j''] : j'' >= 1 + j; S_1[i, j] -> S_1[i, j''] : j'' >= 1 + j; S_2[i, j] -> S_3[i, j''] : j'' >= 1 + j }' diff --git a/tests/independent4.scop b/tests/independent4.scop index e2c4b84..2e8f715 100644 --- a/tests/independent4.scop +++ b/tests/independent4.scop @@ -7,16 +7,16 @@ schedule: '{ domain: "[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j >= 0 and schedule: "[n] -> L_1[{ S_0[i, j] -> [(j)] }]" } } }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { A[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { B[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 statements: - line: 7 - domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n + domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n }' body: type: expression diff --git a/tests/inf.scop b/tests/inf.scop index 3aaae80..048c230 100644 --- a/tests/inf.scop +++ b/tests/inf.scop @@ -3,8 +3,8 @@ end: 207 indent: ' ' context: '[N] -> { : N >= 8 and N <= 16 }' schedule: '{ domain: "[N] -> { S_1[t, j] : t >= 0 and j >= 0 and j <= -1 + N; S_0[t, - j] : t >= 0 and j >= 0 and j <= -1 + N }", child: { schedule: "[N] -> L_0[{ S_0[t, - j] -> [(t)]; S_1[t, j] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_0[t, + j] : t >= 0 and j >= 0 and j <= -1 + N }", child: { schedule: "[N] -> L_0[{ S_1[t, + j] -> [(t)]; S_0[t, j] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_0[t, j] }", child: { schedule: "[N] -> L_1[{ S_0[t, j] -> [(j)] }]" } }, { filter: "[N] -> { S_1[t, j] }", child: { schedule: "[N] -> L_2[{ S_1[t, j] -> [(j)] }]" } } ] } } }' @@ -19,7 +19,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[N] -> { S_0[t, j] : j >= 0 and j <= -1 + N and t >= 0 }' + domain: '[N] -> { S_0[t, j] : t >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: @@ -34,7 +34,7 @@ statements: - type: int value: 0 - line: 14 - domain: '[N] -> { S_1[t, j] : j >= 0 and j <= -1 + N and t >= 0 }' + domain: '[N] -> { S_1[t, j] : t >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: diff --git a/tests/inf2.scop b/tests/inf2.scop index ed32661..edc6264 100644 --- a/tests/inf2.scop +++ b/tests/inf2.scop @@ -3,8 +3,8 @@ end: 208 indent: ' ' context: '[N] -> { : N >= 8 and N <= 16 }' schedule: '{ domain: "[N] -> { S_1[t, j] : t >= 0 and j >= 0 and j <= -1 + N; S_0[t, - j] : t >= 0 and j >= 0 and j <= -1 + N }", child: { schedule: "[N] -> L_0[{ S_0[t, - j] -> [(t)]; S_1[t, j] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_0[t, + j] : t >= 0 and j >= 0 and j <= -1 + N }", child: { schedule: "[N] -> L_0[{ S_1[t, + j] -> [(t)]; S_0[t, j] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_0[t, j] }", child: { schedule: "[N] -> L_1[{ S_0[t, j] -> [(j)] }]" } }, { filter: "[N] -> { S_1[t, j] }", child: { schedule: "[N] -> L_2[{ S_1[t, j] -> [(j)] }]" } } ] } } }' @@ -19,7 +19,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[N] -> { S_0[t, j] : j >= 0 and j <= -1 + N and t >= 0 }' + domain: '[N] -> { S_0[t, j] : t >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: @@ -34,7 +34,7 @@ statements: - type: int value: 0 - line: 14 - domain: '[N] -> { S_1[t, j] : j >= 0 and j <= -1 + N and t >= 0 }' + domain: '[N] -> { S_1[t, j] : t >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: diff --git a/tests/inf4.scop b/tests/inf4.scop index 57fb985..3715be8 100644 --- a/tests/inf4.scop +++ b/tests/inf4.scop @@ -3,8 +3,8 @@ end: 216 indent: ' ' context: '[N] -> { : N >= 8 and N <= 16 }' schedule: '{ domain: "[N] -> { S_1[i, j] : i >= 0 and j >= 0 and j <= -1 + N; S_0[i, - j] : i >= 0 and j >= 0 and j <= -1 + N }", child: { schedule: "[N] -> L_0[{ S_0[i, - j] -> [(i)]; S_1[i, j] -> [(i)] }]", child: { sequence: [ { filter: "[N] -> { S_0[i, + j] : i >= 0 and j >= 0 and j <= -1 + N }", child: { schedule: "[N] -> L_0[{ S_1[i, + j] -> [(i)]; S_0[i, j] -> [(i)] }]", child: { sequence: [ { filter: "[N] -> { S_0[i, j] }", child: { schedule: "[N] -> L_1[{ S_0[i, j] -> [(j)] }]" } }, { filter: "[N] -> { S_1[i, j] }", child: { schedule: "[N] -> L_2[{ S_1[i, j] -> [(j)] }]" } } ] } } }' @@ -19,7 +19,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[N] -> { S_0[i, j] : j >= 0 and j <= -1 + N and i >= 0 }' + domain: '[N] -> { S_0[i, j] : i >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: @@ -34,7 +34,7 @@ statements: - type: int value: 0 - line: 14 - domain: '[N] -> { S_1[i, j] : j >= 0 and j <= -1 + N and i >= 0 }' + domain: '[N] -> { S_1[i, j] : i >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: diff --git a/tests/kill.scop b/tests/kill.scop index 6d21afb..a673ca0 100644 --- a/tests/kill.scop +++ b/tests/kill.scop @@ -7,7 +7,7 @@ schedule: '{ domain: "[n] -> { S_6[i] : i >= 0 and i <= -1 + n; S_7[]; S_4[i] : i <= -1 + n; S_5[i] : i >= 0 and i <= -1 + n; S_1[i] : i >= 0 and i <= -1 + n }", child: { sequence: [ { filter: "[n] -> { S_0[] }" }, { filter: "[n] -> { S_6[i]; S_4[i]; S_2[i]; S_3[i]; S_5[i]; S_1[i] }", child: { schedule: "[n] -> L_0[{ S_6[i] - -> [(i)]; S_5[i] -> [(i)]; S_3[i] -> [(i)]; S_4[i] -> [(i)]; S_2[i] -> [(i)]; S_1[i] + -> [(i)]; S_4[i] -> [(i)]; S_2[i] -> [(i)]; S_3[i] -> [(i)]; S_5[i] -> [(i)]; S_1[i] -> [(i)] }]", child: { sequence: [ { filter: "[n] -> { S_1[i] }" }, { filter: "[n] -> { S_2[i] }" }, { filter: "[n] -> { S_3[i] }" }, { filter: "[n] -> { S_6[i]; S_4[i]; S_5[i] }", child: { set: [ { filter: "[n] -> { S_4[i] }" }, { filter: "[n] -> { @@ -27,7 +27,7 @@ arrays: element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { D[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + extent: '[n] -> { D[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 diff --git a/tests/loop5.scop b/tests/loop5.scop index bc093a1..76dc603 100644 --- a/tests/loop5.scop +++ b/tests/loop5.scop @@ -13,7 +13,7 @@ arrays: element_size: 4 statements: - line: 7 - domain: '[n, m] -> { S_0[i] : i <= m and i >= n }' + domain: '[n, m] -> { S_0[i] : i >= n and i <= m }' body: type: expression expr: diff --git a/tests/loop6.scop b/tests/loop6.scop index dc44783..a6d4cd4 100644 --- a/tests/loop6.scop +++ b/tests/loop6.scop @@ -11,7 +11,7 @@ arrays: element_size: 4 statements: - line: 8 - domain: '[n] -> { S_0[i] : i >= 0 and i <= n and i <= 2147483547 }' + domain: '[n] -> { S_0[i] : i <= 2147483547 and i >= 0 and i <= n }' body: type: expression expr: diff --git a/tests/loop7.scop b/tests/loop7.scop index 2eb42af..9b0ad1e 100644 --- a/tests/loop7.scop +++ b/tests/loop7.scop @@ -4,8 +4,8 @@ indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_3[t] : t >= 0; S_0[]; S_2[t] : t >= 0; S_4[t] : t >= 0; S_1[] }", child: { sequence: [ { filter: "{ S_0[] }" }, { filter: "{ S_1[] }" }, - { filter: "{ S_3[t]; S_2[t]; S_4[t] }", child: { schedule: "L_0[{ S_2[t] -> [(t)]; - S_3[t] -> [(t)]; S_4[t] -> [(t)] }]", child: { sequence: [ { filter: "{ S_2[t] }" + { filter: "{ S_3[t]; S_2[t]; S_4[t] }", child: { schedule: "L_0[{ S_4[t] -> [(t)]; + S_2[t] -> [(t)]; S_3[t] -> [(t)] }]", child: { sequence: [ { filter: "{ S_2[t] }" }, { filter: "{ S_3[t] }" }, { filter: "{ S_4[t] }" } ] } } } ] } }' arrays: - context: '{ : }' diff --git a/tests/matmul.scop b/tests/matmul.scop index 7b2c4df..4e299ec 100644 --- a/tests/matmul.scop +++ b/tests/matmul.scop @@ -12,15 +12,15 @@ schedule: '{ domain: "[M, N, K] -> { S_0[i, j] : i >= 0 and i <= -1 + M and j >= "[M, N, K] -> L_2[{ S_1[i, j, k] -> [(k)] }]" } } ] } } } }' arrays: - context: '[K] -> { : K >= 0 }' - extent: '[N, K, M] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + K and i0 >= 0 }' + extent: '[N, K, M] -> { A[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + K }' element_type: float element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, K, M] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' + extent: '[N, K, M] -> { B[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + N }' element_type: float element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, K, M] -> { C[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' + extent: '[N, K, M] -> { C[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + N }' element_type: float element_size: 4 live_out: 1 diff --git a/tests/max.scop b/tests/max.scop index fc767f9..6fc85c3 100644 --- a/tests/max.scop +++ b/tests/max.scop @@ -11,7 +11,7 @@ arrays: element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : i >= -10 + N and i >= 0 and i <= -1 + N }' + domain: '[N] -> { S_0[i] : i <= -1 + N and i >= -10 + N and i >= 0 }' body: type: expression expr: diff --git a/tests/min.scop b/tests/min.scop index 84b6f08..7ecb463 100644 --- a/tests/min.scop +++ b/tests/min.scop @@ -11,7 +11,7 @@ arrays: element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : i >= 0 and i <= -1 + N and i <= -11 + 2N }' + domain: '[N] -> { S_0[i] : i <= -11 + 2N and i >= 0 and i <= -1 + N }' body: type: expression expr: diff --git a/tests/min2.scop b/tests/min2.scop index 090bff8..6acb619 100644 --- a/tests/min2.scop +++ b/tests/min2.scop @@ -11,7 +11,7 @@ arrays: element_size: 4 statements: - line: 10 - domain: '[N] -> { S_0[i] : i >= 0 and i <= -1 + N and i <= -11 + 2N }' + domain: '[N] -> { S_0[i] : i <= -11 + 2N and i >= 0 and i <= -1 + N }' body: type: expression expr: diff --git a/tests/pencil_min.scop b/tests/pencil_min.scop index a5f2f9c..aa59816 100644 --- a/tests/pencil_min.scop +++ b/tests/pencil_min.scop @@ -19,7 +19,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n, m] -> { S_0[i] : i >= 0 and i <= -1 + m and i <= 9 }' + domain: '[n, m] -> { S_0[i] : i <= 9 and i >= 0 and i <= -1 + m }' body: type: expression expr: @@ -37,7 +37,7 @@ statements: read: 1 write: 0 - line: 15 - domain: '[n, m] -> { S_1[j] : j >= 0 and j <= -1 + n and j <= 9 }' + domain: '[n, m] -> { S_1[j] : j <= 9 and j >= 0 and j <= -1 + n }' body: type: expression expr: diff --git a/tests/piecewise.scop b/tests/piecewise.scop index dbbeff5..d5e491a 100644 --- a/tests/piecewise.scop +++ b/tests/piecewise.scop @@ -7,12 +7,12 @@ schedule: '{ domain: "[N] -> { S_0[i, j] : i >= 0 and j >= i and j <= -1 + N }", S_0[i, j] -> [(j)] }]" } } }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i, j] : j >= i and j <= -1 + N and i >= 0 }' + domain: '[N] -> { S_0[i, j] : i >= 0 and j >= i and j <= -1 + N }' body: type: expression expr: diff --git a/tests/piecewise2.scop b/tests/piecewise2.scop index 1169420..abd06c8 100644 --- a/tests/piecewise2.scop +++ b/tests/piecewise2.scop @@ -7,12 +7,12 @@ schedule: '{ domain: "[N] -> { S_0[i, j] : i >= 0 and j >= i and j <= -1 + N }", S_0[i, j] -> [(j)] }]" } } }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i, j] : j >= i and j <= -1 + N and i >= 0 }' + domain: '[N] -> { S_0[i, j] : i >= 0 and j >= i and j <= -1 + N }' body: type: expression expr: diff --git a/tests/propagate.scop b/tests/propagate.scop index 79d7e33..e6aca0b 100644 --- a/tests/propagate.scop +++ b/tests/propagate.scop @@ -3,13 +3,13 @@ end: 204 indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' schedule: '{ domain: "[N] -> { S_1[i, j] : i >= 0 and j >= i and j <= -1 + N; S_0[i, - j] : i >= 0 and j >= i and j <= -1 + N }", child: { schedule: "[N] -> L_0[{ S_0[i, - j] -> [(i)]; S_1[i, j] -> [(i)] }]", child: { schedule: "[N] -> L_1[{ S_0[i, j] - -> [(j)]; S_1[i, j] -> [(j)] }]", child: { sequence: [ { filter: "[N] -> { S_0[i, + j] : i >= 0 and j >= i and j <= -1 + N }", child: { schedule: "[N] -> L_0[{ S_1[i, + j] -> [(i)]; S_0[i, j] -> [(i)] }]", child: { schedule: "[N] -> L_1[{ S_1[i, j] + -> [(j)]; S_0[i, j] -> [(j)] }]", child: { sequence: [ { filter: "[N] -> { S_0[i, j] }" }, { filter: "[N] -> { S_1[i, j] }" } ] } } } }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0, i1] : i0 >= 0 and i1 >= 0 and i1 <= -1 + N }' element_type: int element_size: 4 - context: '{ : }' @@ -18,7 +18,7 @@ arrays: element_size: 4 statements: - line: 9 - domain: '[N] -> { S_0[i, j] : j >= i and j <= -1 + N and i >= 0 }' + domain: '[N] -> { S_0[i, j] : i >= 0 and j >= i and j <= -1 + N }' body: type: expression expr: @@ -59,7 +59,7 @@ statements: read: 1 write: 0 - line: 10 - domain: '[N] -> { S_1[i, j] : j >= i and j <= -1 + N and i >= 0 }' + domain: '[N] -> { S_1[i, j] : i >= 0 and j >= i and j <= -1 + N }' body: type: expression expr: diff --git a/tests/static.scop b/tests/static.scop index 80b4645..0a8d7f8 100644 --- a/tests/static.scop +++ b/tests/static.scop @@ -7,13 +7,13 @@ schedule: '{ domain: "[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j >= 0 and schedule: "[n] -> L_1[{ S_0[i, j] -> [(j)] }]" } } }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + extent: '[n] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 statements: - line: 6 - domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n + domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j >= 0 and j <= -1 + n }' body: type: expression diff --git a/tests/summary.scop b/tests/summary.scop index 581ed8a..fdfc50d 100644 --- a/tests/summary.scop +++ b/tests/summary.scop @@ -6,7 +6,7 @@ schedule: '{ domain: "[n] -> { S_0[i] : i >= 0 and i <= -1 + n }", child: { sche "[n] -> L_0[{ S_0[i] -> [(i)] }]" } }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + extent: '[n] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + n }' element_type: int element_size: 4 @@ -26,7 +26,7 @@ statements: write: 0 - type: access may_write: '[n] -> { S_0[i] -> A[i, o1] : exists (e0 = floor((-1 + o1)/2): - 2e0 = -1 + o1 and o1 >= 1 and o1 <= -1 + n) }' + 2e0 = -1 + o1 and o1 <= -1 + n and o1 >= 1) }' must_write: '[n] -> { }' index: '[n] -> { S_0[i] -> A[(i)] }' depth: 2 diff --git a/tests/ternary.scop b/tests/ternary.scop index 2cd9cab..301cf4b 100644 --- a/tests/ternary.scop +++ b/tests/ternary.scop @@ -3,7 +3,7 @@ end: 141 indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_0[i] : i >= 0 and i <= 99; S_1[i] : i >= 0 and i <= 99 }", - child: { schedule: "L_0[{ S_1[i] -> [(i)]; S_0[i] -> [(i)] }]", child: { sequence: + child: { schedule: "L_0[{ S_0[i] -> [(i)]; S_1[i] -> [(i)] }]", child: { sequence: [ { filter: "{ S_0[i] }" }, { filter: "{ S_1[i] }" } ] } } }' arrays: - context: '{ : }' diff --git a/tests/tobi2.scop b/tests/tobi2.scop index 95d2035..7b373d3 100644 --- a/tests/tobi2.scop +++ b/tests/tobi2.scop @@ -12,8 +12,8 @@ arrays: element_size: 4 statements: - line: 10 - domain: '[N] -> { S_0[i] : exists (e0 = floor((10 + N)/4294967296): 4294967296e0 - <= 9 + N - i and i <= 19 and i >= 0 and 4294967296e0 <= 10 + N and 4294967296e0 + domain: '[N] -> { S_0[i] : exists (e0 = floor((10 + N)/4294967296): i <= 19 and + i >= 0 and 4294967296e0 <= 9 + N - i and 4294967296e0 <= 10 + N and 4294967296e0 >= -4294967285 + N) }' body: type: expression diff --git a/tests/unsigned_break1.scop b/tests/unsigned_break1.scop index 4b17672..598362d 100644 --- a/tests/unsigned_break1.scop +++ b/tests/unsigned_break1.scop @@ -4,7 +4,7 @@ indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_0[k] : k <= 257 and k >= 252; S_1[k] : exists (e0 = floor((-1 + k)/256): k <= 257 and k >= 252 and 256e0 >= -256 + k and 256e0 <= -2 + k) }", - child: { schedule: "L_0[{ S_1[k] -> [(k)]; S_0[k] -> [(k)] }]", child: { sequence: + child: { schedule: "L_0[{ S_0[k] -> [(k)]; S_1[k] -> [(k)] }]", child: { sequence: [ { filter: "{ S_0[k] }" }, { filter: "{ S_1[k] }" } ] } } }' arrays: - context: '{ : }' diff --git a/tests/wdp.scop b/tests/wdp.scop index aac9341..3cd9ad0 100644 --- a/tests/wdp.scop +++ b/tests/wdp.scop @@ -10,8 +10,8 @@ schedule: '{ domain: "[N] -> { S_3[i] : i >= 0 and i <= -1 + N; S_4[i] : i >= 0 S_0[i] -> [(i)] }]" } }, { filter: "[N] -> { S_1[i] }", child: { schedule: "[N] -> L_1[{ S_1[i] -> [(i)] }]" } }, { filter: "[N] -> { S_2[i] }", child: { schedule: "[N] -> L_2[{ S_2[i] -> [(i)] }]" } }, { filter: "[N] -> { S_3[i]; S_4[i]; S_6[i]; - S_7[i]; S_5[i] }", child: { schedule: "[N] -> L_3[{ S_3[i] -> [(i)]; S_5[i] -> [(i)]; - S_7[i] -> [(i)]; S_6[i] -> [(i)]; S_4[i] -> [(i)] }]", child: { sequence: [ { filter: + S_7[i]; S_5[i] }", child: { schedule: "[N] -> L_3[{ S_3[i] -> [(i)]; S_4[i] -> [(i)]; + S_6[i] -> [(i)]; S_7[i] -> [(i)]; S_5[i] -> [(i)] }]", child: { sequence: [ { filter: "[N] -> { S_3[i] }" }, { filter: "[N] -> { S_4[i] }" }, { filter: "[N] -> { S_5[i] }" }, { filter: "[N] -> { S_6[i] }" }, { filter: "[N] -> { S_7[i] }" } ] } } } ] } }' diff --git a/tests/while.scop b/tests/while.scop index 35cf00a..430dcac 100644 --- a/tests/while.scop +++ b/tests/while.scop @@ -4,15 +4,15 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' schedule: '{ domain: "[n] -> { S2[x, t] : x >= 0 and x <= -1 + n and t >= 0; S1[x] : x >= 0 and x <= -1 + n; S_1[x, t] : x >= 0 and x <= -1 + n and t >= 0; R[x] : - x >= 0 and x <= -1 + n }", child: { schedule: "[n] -> L_0[{ S1[x] -> [(x)]; R[x] - -> [(x)]; S_1[x, t] -> [(x)]; S2[x, t] -> [(x)] }]", child: { sequence: [ { filter: + x >= 0 and x <= -1 + n }", child: { schedule: "[n] -> L_0[{ S2[x, t] -> [(x)]; S1[x] + -> [(x)]; S_1[x, t] -> [(x)]; R[x] -> [(x)] }]", child: { sequence: [ { filter: "[n] -> { S1[x] }" }, { filter: "[n] -> { S2[x, t]; S_1[x, t] }", child: { schedule: - "[n] -> L_1[{ S_1[x, t] -> [(t)]; S2[x, t] -> [(t)] }]", child: { sequence: [ { + "[n] -> L_1[{ S2[x, t] -> [(t)]; S_1[x, t] -> [(t)] }]", child: { sequence: [ { filter: "[n] -> { S_1[x, t] }" }, { filter: "[n] -> { S2[x, t] }" } ] } } }, { filter: "[n] -> { R[x] }" } ] } } }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x, t] : x <= -1 + n and t >= 0 and x >= 0 }' + extent: '[n] -> { __pet_test_0[x, t] : x >= 0 and x <= -1 + n and t >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -38,7 +38,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { [S_1[x, t] -> [1]] : x <= -1 + n and t >= 0 and x >= 0 }' + domain: '[n] -> { [S_1[x, t] -> [1]] : x >= 0 and x <= -1 + n and t >= 0 }' body: type: expression expr: @@ -70,7 +70,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x, t] -> [1]] : x <= -1 + n and t >= 0 and x >= 0 }' + domain: '[n] -> { [S2[x, t] -> [1]] : x >= 0 and x <= -1 + n and t >= 0 }' body: type: expression expr: diff --git a/tests/while_affine.scop b/tests/while_affine.scop index 2c9d733..aff1eb7 100644 --- a/tests/while_affine.scop +++ b/tests/while_affine.scop @@ -4,8 +4,8 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' schedule: '{ domain: "[N] -> { S_0[99, t, j] : t >= 0 and j >= 0 and j <= -1 + N; S_1[99, t, j] : t >= 0 and j >= 0 and j <= -1 + N }", child: { schedule: "[N] -> - L_0[{ S_1[i, t, j] -> [(i)]; S_0[i, t, j] -> [(i)] }]", child: { schedule: "[N] - -> L_1[{ S_1[i, t, j] -> [(t)]; S_0[i, t, j] -> [(t)] }]", child: { sequence: [ + L_0[{ S_0[i, t, j] -> [(i)]; S_1[i, t, j] -> [(i)] }]", child: { schedule: "[N] + -> L_1[{ S_0[i, t, j] -> [(t)]; S_1[i, t, j] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_0[i, t, j] }", child: { schedule: "[N] -> L_2[{ S_0[i, t, j] -> [(j)] }]" } }, { filter: "[N] -> { S_1[i, t, j] }", child: { schedule: "[N] -> L_3[{ S_1[i, t, j] -> [(j)] }]" } } ] } } } }' @@ -20,7 +20,7 @@ arrays: element_size: 4 statements: - line: 9 - domain: '[N] -> { S_0[99, t, j] : j >= 0 and j <= -1 + N and t >= 0 }' + domain: '[N] -> { S_0[99, t, j] : t >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: @@ -35,7 +35,7 @@ statements: - type: int value: 0 - line: 11 - domain: '[N] -> { S_1[99, t, j] : j >= 0 and j <= -1 + N and t >= 0 }' + domain: '[N] -> { S_1[99, t, j] : t >= 0 and j >= 0 and j <= -1 + N }' body: type: expression expr: diff --git a/tests/while_break.scop b/tests/while_break.scop index 5bcaa74..81396b7 100644 --- a/tests/while_break.scop +++ b/tests/while_break.scop @@ -7,16 +7,16 @@ schedule: '{ domain: "[N] -> { S_11[t] : t >= 0; S_3[t] : t >= 0; S_8[t] : t >= N >= 1; S_7[t] : N = 0 and t >= 0; S_1[t] : N = 0 and t >= 0; S_5[t] : N = 0 and t >= 0; S_5[0] : N <= -1 or N >= 1; S_9[t] : t >= 0; S_2[t] : t >= 0; S_0[t] : N = 0 and t >= 0; S_0[0] : N <= -1 or N >= 1 }", child: { sequence: [ { filter: "[N] - -> { S_1[t]; S_0[t] }", child: { schedule: "[N] -> L_0[{ S_0[t] -> [(t)]; S_1[t] + -> { S_1[t]; S_0[t] }", child: { schedule: "[N] -> L_0[{ S_1[t] -> [(t)]; S_0[t] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_0[t] }" }, { filter: "[N] -> { S_1[t] }" } ] } } }, { filter: "[N] -> { S_3[t]; S_4[t]; S_2[t] }", child: - { schedule: "L_1[{ S_2[t] -> [(t)]; S_3[t] -> [(t)]; S_4[t] -> [(t)] }]", child: + { schedule: "L_1[{ S_4[t] -> [(t)]; S_2[t] -> [(t)]; S_3[t] -> [(t)] }]", child: { sequence: [ { filter: "{ S_2[t] }" }, { filter: "{ S_3[t] }" }, { filter: "{ S_4[t] }" } ] } } }, { filter: "[N] -> { S_6[t]; S_7[t]; S_5[t] }", child: { schedule: - "[N] -> L_2[{ S_5[t] -> [(t)]; S_7[t] -> [(t)]; S_6[t] -> [(t)] }]", child: { sequence: + "[N] -> L_2[{ S_6[t] -> [(t)]; S_7[t] -> [(t)]; S_5[t] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_5[t] }" }, { filter: "[N] -> { S_6[t] }" }, { filter: "[N] -> { S_7[t] }" } ] } } }, { filter: "[N] -> { S_11[t]; S_8[t]; S_10[t]; S_9[t] }", - child: { schedule: "L_3[{ S_10[t] -> [(t)]; S_8[t] -> [(t)]; S_9[t] -> [(t)]; S_11[t] + child: { schedule: "L_3[{ S_9[t] -> [(t)]; S_10[t] -> [(t)]; S_8[t] -> [(t)]; S_11[t] -> [(t)] }]", child: { sequence: [ { filter: "{ S_8[t] }" }, { filter: "{ S_9[t] }" }, { filter: "{ S_10[t] }" }, { filter: "{ S_11[t] }" } ] } } } ] } }' arrays: diff --git a/tests/while_break2.scop b/tests/while_break2.scop index bf103b4..b890dd6 100644 --- a/tests/while_break2.scop +++ b/tests/while_break2.scop @@ -5,10 +5,10 @@ context: '[N] -> { : N <= 2147483647 and N >= -2147483648 }' schedule: '{ domain: "[N] -> { S_1[i, t] : N = 0 and i <= 9 and i >= 0 and t >= 0; S_1[0, t] : (N <= -1 and t >= 0) or (N >= 1 and t >= 0); S_0[i, t] : N = 0 and i <= 9 and i >= 0 and t >= 0; S_0[0, t] : (N <= -1 and t >= 0) or (N >= 1 and t >= - 0); S_2[i] : N = 0 and i <= 9 and i >= 0 }", child: { schedule: "[N] -> L_0[{ S_0[i, - t] -> [(i)]; S_2[i] -> [(i)]; S_1[i, t] -> [(i)] }]", child: { sequence: [ { filter: - "[N] -> { S_1[i, t]; S_0[i, t] }", child: { schedule: "[N] -> L_1[{ S_0[i, t] -> - [(t)]; S_1[i, t] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_0[i, t] + 0); S_2[i] : N = 0 and i <= 9 and i >= 0 }", child: { schedule: "[N] -> L_0[{ S_1[i, + t] -> [(i)]; S_0[i, t] -> [(i)]; S_2[i] -> [(i)] }]", child: { sequence: [ { filter: + "[N] -> { S_1[i, t]; S_0[i, t] }", child: { schedule: "[N] -> L_1[{ S_1[i, t] -> + [(t)]; S_0[i, t] -> [(t)] }]", child: { sequence: [ { filter: "[N] -> { S_0[i, t] }" }, { filter: "[N] -> { S_1[i, t] }" } ] } } }, { filter: "[N] -> { S_2[i] }" } ] } } }' arrays: diff --git a/tests/while_inc.scop b/tests/while_inc.scop index 3947971..067ca1f 100644 --- a/tests/while_inc.scop +++ b/tests/while_inc.scop @@ -4,7 +4,7 @@ indent: "\t" context: '{ : }' schedule: '{ domain: "{ S_3[t] : t >= 0; S_0[]; S_2[t] : t >= 0; S_1[t] : t >= 0 }", child: { sequence: [ { filter: "{ S_0[] }" }, { filter: "{ S_3[t]; S_2[t]; S_1[t] - }", child: { schedule: "L_0[{ S_2[t] -> [(t)]; S_1[t] -> [(t)]; S_3[t] -> [(t)] + }", child: { schedule: "L_0[{ S_2[t] -> [(t)]; S_3[t] -> [(t)]; S_1[t] -> [(t)] }]", child: { sequence: [ { filter: "{ S_1[t] }" }, { filter: "{ S_2[t] }" }, { filter: "{ S_3[t] }" } ] } } } ] } }' arrays: diff --git a/tests/while_overflow.scop b/tests/while_overflow.scop index 43d34ee..78cfb6a 100644 --- a/tests/while_overflow.scop +++ b/tests/while_overflow.scop @@ -57,8 +57,8 @@ statements: read: 1 write: 0 - line: 14 - domain: '[N] -> { [S_2[t, i] -> [1]] : i >= 0 and i <= -1 + 2N and N <= 1073741823 - and t >= 0 }' + domain: '[N] -> { [S_2[t, i] -> [1]] : N <= 1073741823 and t >= 0 and i >= 0 and + i <= -1 + 2N }' body: type: expression expr: diff --git a/tests/write.scop b/tests/write.scop index 1515d52..011fd06 100644 --- a/tests/write.scop +++ b/tests/write.scop @@ -5,7 +5,7 @@ context: '[n] -> { : n >= 0 and n <= 2147483647 }' schedule: '{ domain: "{ S_0[] }" }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + extent: '[n] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + n }' element_type: float element_size: 4 diff --git a/tests/write2.scop b/tests/write2.scop index a15c512..f2647f8 100644 --- a/tests/write2.scop +++ b/tests/write2.scop @@ -5,7 +5,7 @@ context: '[n] -> { : n >= 0 and n <= 2147483647 }' schedule: '{ domain: "{ S_0[] }" }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + extent: '[n] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + n }' element_type: float element_size: 4 -- 2.11.4.GIT