From ffffc7085f07d34c4fcccec975ce0367146dab04 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Sat, 12 Jul 2014 10:17:39 +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 | 26 ++++++------- tests/assume.scop | 8 ++-- tests/break.scop | 4 +- tests/break2.scop | 6 +-- tests/break3.scop | 12 +++--- tests/break4.scop | 74 ++++++++++++++++++------------------- tests/break5.scop | 11 ++++-- tests/call1.scop | 6 +-- tests/call2.scop | 6 +-- tests/call3.scop | 6 +-- tests/call5.scop | 2 +- tests/call6.scop | 2 +- tests/call_struct.scop | 4 +- tests/ceild.scop | 4 +- tests/conditional_assignment.scop | 22 +++++------ tests/conditional_assignment2.scop | 20 +++++----- tests/continue.scop | 2 +- tests/continue4.scop | 4 +- tests/cuervo.scop | 6 +-- tests/data_dependent.scop | 20 +++++----- tests/data_dependent2.scop | 4 +- tests/dec.scop | 4 +- tests/dec2.scop | 4 +- tests/dec3.scop | 4 +- tests/dec4.scop | 4 +- tests/decl.scop | 26 ++++++------- tests/decl4.scop | 14 +++---- tests/empty_domain.scop | 2 +- tests/encapsulate/for_while.scop | 10 ++--- tests/encapsulate/independent5.scop | 6 +-- tests/encapsulate/while.scop | 6 +-- tests/encapsulate/while_affine.scop | 8 ++-- tests/floord.scop | 4 +- tests/floord2.scop | 2 +- tests/for_while.scop | 10 ++--- tests/for_while_dec.scop | 10 ++--- tests/for_while_inc.scop | 10 ++--- tests/for_while_inc2.scop | 18 ++++----- tests/for_while_inc3.scop | 18 ++++----- tests/for_while_inc4.scop | 14 +++---- tests/for_while_init.scop | 18 ++++----- tests/for_while_init2.scop | 18 ++++----- tests/for_while_init3.scop | 14 +++---- tests/for_while_overflow.scop | 4 +- tests/for_while_unsigned.scop | 10 ++--- tests/for_while_unsigned2.scop | 12 +++--- tests/forward_substitution4.scop | 2 +- tests/generic_condition2.scop | 5 +-- tests/implicit_condition.scop | 4 +- tests/inc.scop | 4 +- tests/inc2.scop | 6 +-- tests/inc3.scop | 4 +- tests/inc4.scop | 4 +- tests/inc5.scop | 2 +- tests/independent1.scop | 6 +-- tests/independent2.scop | 4 +- tests/independent3.scop | 12 +++--- tests/independent4.scop | 6 +-- tests/inf.scop | 8 ++-- tests/inf2.scop | 8 ++-- tests/inf4.scop | 8 ++-- tests/iterator_declaration.scop | 4 +- tests/kill.scop | 18 ++++----- tests/loop2.scop | 2 +- tests/loop5.scop | 2 +- tests/loop6.scop | 4 +- tests/loop8.scop | 4 +- tests/matmul.scop | 14 +++---- tests/max.scop | 6 +-- tests/min.scop | 4 +- tests/min2.scop | 4 +- tests/mod.scop | 6 +-- tests/mod2.scop | 6 +-- tests/omega.scop | 4 +- tests/piecewise.scop | 4 +- tests/piecewise2.scop | 4 +- tests/propagate.scop | 6 +-- tests/quasi_affine.scop | 2 +- tests/static.scop | 6 +-- tests/struct2.scop | 2 +- tests/struct3.scop | 4 +- tests/struct4.scop | 2 +- tests/struct5.scop | 2 +- tests/struct8.scop | 2 +- tests/struct9.scop | 12 +++--- tests/summary.scop | 6 +-- tests/tobi1.scop | 4 +- tests/tobi2.scop | 4 +- tests/unsigned2.scop | 2 +- tests/unsigned_break1.scop | 4 +- tests/unsigned_break2.scop | 16 ++++---- tests/wdp.scop | 22 +++++------ tests/while.scop | 10 ++--- tests/while_affine.scop | 8 ++-- tests/while_break.scop | 8 ++-- tests/while_break2.scop | 23 ++++++------ tests/while_overflow.scop | 4 +- 97 files changed, 410 insertions(+), 407 deletions(-) diff --git a/tests/QR.scop b/tests/QR.scop index 12e48f9..2e83f39 100644 --- a/tests/QR.scop +++ b/tests/QR.scop @@ -1,17 +1,17 @@ start: 285 end: 840 indent: ' ' -context: '[K, N] -> { : N <= 16 and N >= 8 and K >= 100 and K <= 1000 }' +context: '[K, N] -> { : K >= 100 and N <= 16 and N >= 8 and K <= 1000 }' context_value: '[K, N] -> { : K = 256 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N, K] -> { R[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 <= -1 + N and i1 - >= 0 }' + extent: '[N, K] -> { R[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 and i0 <= + -1 + N }' element_type: int element_size: 4 - context: '[N, K] -> { : K >= 0 and N >= 0 }' - extent: '[N, K] -> { X[i0, i1] : i1 <= -1 + N and i1 >= 0 and i0 <= -1 + K and i0 - >= 0 }' + extent: '[N, K] -> { X[i0, i1] : i0 >= 0 and i0 <= -1 + K and i1 >= 0 and i1 <= + -1 + N }' element_type: int element_size: 4 - context: '{ : }' @@ -20,7 +20,7 @@ arrays: element_size: 4 statements: - line: 19 - domain: '[N, K] -> { S_0[j, i] : i >= j and j >= 0 and i <= -1 + N }' + domain: '[N, K] -> { S_0[j, i] : i >= j and i <= -1 + N and j >= 0 }' schedule: '[N] -> { S_0[j, i] -> [0, j, i] }' body: type: expression @@ -36,8 +36,8 @@ statements: - type: call name: Zero - line: 23 - domain: '[N, K] -> { S_1[k, j] : j <= -1 + N and j >= 0 and k <= -1 + K and k >= - 0 }' + domain: '[N, K] -> { S_1[k, j] : k >= 0 and k <= -1 + K and j >= 0 and j <= -1 + + N }' schedule: '[K, N] -> { S_1[k, j] -> [1, k, j] }' body: type: expression @@ -53,8 +53,8 @@ statements: - type: call name: ReadMatrix - line: 27 - domain: '[N, K] -> { S_2[k, j] : j <= -1 + N and j >= 0 and k <= -1 + K and k >= - 0 }' + domain: '[N, K] -> { S_2[k, j] : k >= 0 and k <= -1 + K and j >= 0 and j <= -1 + + N }' schedule: '[K, N] -> { S_2[k, j] -> [2, k, j, 0] }' body: type: expression @@ -97,8 +97,8 @@ statements: read: 0 write: 1 - line: 29 - domain: '[N, K] -> { S_3[k, j, i] : i >= 1 + j and j >= 0 and k <= -1 + K and k - >= 0 and i <= -1 + N }' + 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 }' schedule: '[K, N] -> { S_3[k, j, i] -> [2, k, j, 1, i] }' body: type: expression @@ -146,7 +146,7 @@ statements: read: 0 write: 1 - line: 34 - domain: '[N, K] -> { S_4[j, i] : i >= j and j >= 0 and i <= -1 + N }' + domain: '[N, K] -> { S_4[j, i] : i >= j and i <= -1 + N and j >= 0 }' schedule: '[N] -> { S_4[j, i] -> [3, j, i] }' body: type: expression diff --git a/tests/assume.scop b/tests/assume.scop index e4f8f04..9a980ca 100644 --- a/tests/assume.scop +++ b/tests/assume.scop @@ -1,11 +1,11 @@ start: 64 end: 206 indent: ' ' -context: '[S, n, m] -> { : m >= 1 + n and m <= 2147483648 - n and S >= 0 and S <= - 2147483647 and n >= -2147483648 and m <= 2147483647 }' +context: '[S, n, m] -> { : m >= 1 + n and m <= 2147483648 - n and S <= 2147483647 + and n >= -2147483648 and m <= 2147483647 and S >= 0 }' arrays: - context: '[S] -> { : S >= 0 }' - extent: '[S, n, m] -> { D[i0] : i0 <= -1 + S and i0 >= 0 }' + extent: '[S, n, m] -> { D[i0] : i0 >= 0 and i0 <= -1 + S }' element_type: int element_size: 4 statements: @@ -24,7 +24,7 @@ statements: read: 1 write: 0 - line: 6 - domain: '[S, n, m] -> { S_1[i] : i <= -1 + n and i >= 0 }' + domain: '[S, n, m] -> { S_1[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_1[i] -> [1, i, 0] }' body: type: expression diff --git a/tests/break.scop b/tests/break.scop index be036db..4a3bd86 100644 --- a/tests/break.scop +++ b/tests/break.scop @@ -9,7 +9,7 @@ arrays: element_size: 4 statements: - line: 8 - domain: '{ S_0[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 and j <= i }' + domain: '{ S_0[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 and j <= i }' schedule: '{ S_0[i, j] -> [0, i, j, 0] }' body: type: expression @@ -25,7 +25,7 @@ statements: - type: int value: 0 - line: 11 - domain: '{ S_1[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 and j <= -1 + i + domain: '{ S_1[i, j] : i <= 99 and i >= 0 and j <= 99 and j >= 0 and j <= -1 + i }' schedule: '{ S_1[i, j] -> [0, i, j, 2] }' body: diff --git a/tests/break2.scop b/tests/break2.scop index 0dd22f1..e5e8194 100644 --- a/tests/break2.scop +++ b/tests/break2.scop @@ -9,8 +9,8 @@ arrays: element_size: 4 statements: - line: 8 - domain: '{ S_0[i, j] : (i <= 99 and j >= 0 and j <= i) or (i <= 9 and i >= 0 and - j >= 1 + i and j <= 99) }' + 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) }' schedule: '{ S_0[i, j] -> [0, i, j, 0] }' body: type: expression @@ -26,7 +26,7 @@ statements: - type: int value: 0 - line: 13 - domain: '{ S_1[i, j] : i >= 10 and i <= 99 and j <= 99 and j >= 0 and j <= -1 + + domain: '{ S_1[i, j] : i <= 99 and i >= 10 and j <= 99 and j >= 0 and j <= -1 + i }' schedule: '{ S_1[i, j] -> [0, i, j, 3] }' body: diff --git a/tests/break3.scop b/tests/break3.scop index 718e3c9..ca7a65d 100644 --- a/tests/break3.scop +++ b/tests/break3.scop @@ -4,7 +4,7 @@ indent: "\t" context: '{ : }' arrays: - context: '{ : }' - extent: '{ __pet_test_0[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_0[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -15,7 +15,7 @@ arrays: element_size: 4 statements: - line: 10 - domain: '{ [S_0[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_0[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_0[i, j] -> [0, i, j, 0] }' body: type: expression @@ -37,7 +37,7 @@ statements: read: 1 write: 0 - line: 11 - domain: '{ [S_1[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_1[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_1[i, j] -> [0, i, j, 1, 0] }' body: type: expression @@ -59,7 +59,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '{ [S_2[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_2[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_2[i, j] -> [0, i, j, 2] }' body: type: expression @@ -93,5 +93,5 @@ statements: write: 0 implications: - satisfied: 0 - extension: '{ __pet_test_0[i, j] -> __pet_test_0[i, j''] : j'' <= j and i >= 0 and - i <= 99 and j'' >= 0 and j'' <= 99 }' + extension: '{ __pet_test_0[i, j] -> __pet_test_0[i, j''] : j'' <= j and i <= 99 + and i >= 0 and j'' <= 99 and j'' >= 0 }' diff --git a/tests/break4.scop b/tests/break4.scop index ff9d222..7489174 100644 --- a/tests/break4.scop +++ b/tests/break4.scop @@ -4,79 +4,79 @@ indent: "\t" context: '{ : }' arrays: - context: '{ : }' - extent: '{ __pet_test_0[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 81 }' + extent: '{ __pet_test_0[i, j] : i >= 0 and i <= 99 and j >= 81 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_1[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_1[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_2[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_2[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_3[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_3[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_4[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_4[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_5[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_5[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_6[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_6[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_7[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_7[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_8[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_8[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_9[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_9[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_10[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_10[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_11[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_11[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 - context: '{ : }' - extent: '{ __pet_test_12[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + extent: '{ __pet_test_12[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -87,7 +87,7 @@ arrays: element_size: 4 statements: - line: 10 - domain: '{ [S_0[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_0[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_0[i, j] -> [0, i, j, 0] }' body: type: expression @@ -109,7 +109,7 @@ statements: read: 1 write: 0 - line: 12 - domain: '{ [S_1[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 81 }' + domain: '{ [S_1[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 81 and j <= 99 }' schedule: '{ S_1[i, j] -> [0, i, j, 1, 0, 0, 0] }' body: type: expression @@ -131,7 +131,7 @@ statements: read: 1 write: 0 - line: -1 - domain: '{ [S_2[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_2[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_2[i, j] -> [0, i, j, 1, 1] }' body: type: expression @@ -170,7 +170,7 @@ statements: read: 1 write: 0 - line: 15 - domain: '{ [S_3[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_3[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_3[i, j] -> [0, i, j, 2, 0, 0] }' body: type: expression @@ -197,7 +197,7 @@ statements: read: 1 write: 0 - line: 16 - domain: '{ [S_4[i, j] -> [0, 0, 1]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 + domain: '{ [S_4[i, j] -> [0, 0, 1]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_4[i, j] -> [0, i, j, 2, 0, 1, 0, 0] }' body: @@ -230,8 +230,8 @@ statements: read: 1 write: 0 - line: 18 - domain: '{ [S_5[i, j] -> [0, 0, 1, 0]] : i >= 0 and i <= 99 and j <= 99 and j >= - 0 }' + domain: '{ [S_5[i, j] -> [0, 0, 1, 0]] : i >= 0 and i <= 99 and j >= 0 and j <= + 99 }' schedule: '{ S_5[i, j] -> [0, i, j, 2, 0, 1, 1] }' body: type: expression @@ -268,8 +268,8 @@ statements: read: 1 write: 0 - line: 19 - domain: '{ [S_6[i, j] -> [0, 0, 1, 0]] : i >= 0 and i <= 99 and j <= 99 and j >= - 0 }' + domain: '{ [S_6[i, j] -> [0, 0, 1, 0]] : i >= 0 and i <= 99 and j >= 0 and j <= + 99 }' schedule: '{ S_6[i, j] -> [0, i, j, 2, 0, 1, 2, 0, 0] }' body: type: expression @@ -306,8 +306,8 @@ statements: read: 1 write: 0 - line: 22 - domain: '{ [S_7[i, j] -> [0, 0, 1, 0, 0]] : i >= 0 and i <= 99 and j <= 99 and j - >= 0 }' + domain: '{ [S_7[i, j] -> [0, 0, 1, 0, 0]] : i >= 0 and i <= 99 and j >= 0 and j + <= 99 }' schedule: '{ S_7[i, j] -> [0, i, j, 2, 0, 1, 2, 0, 1] }' body: type: expression @@ -349,7 +349,7 @@ statements: read: 1 write: 0 - line: -1 - domain: '{ [S_8[i, j] -> [0, 0, 1]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 + domain: '{ [S_8[i, j] -> [0, 0, 1]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_8[i, j] -> [0, i, j, 2, 0, 1, 2, 1] }' body: @@ -405,8 +405,8 @@ statements: read: 1 write: 0 - line: 23 - domain: '{ [S_9[i, j] -> [0, 0, 1, 0]] : i >= 0 and i <= 99 and j <= 99 and j >= - 0 }' + domain: '{ [S_9[i, j] -> [0, 0, 1, 0]] : i >= 0 and i <= 99 and j >= 0 and j <= + 99 }' schedule: '{ S_9[i, j] -> [0, i, j, 2, 0, 1, 3] }' body: type: expression @@ -443,7 +443,7 @@ statements: read: 1 write: 0 - line: -1 - domain: '{ [S_10[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_10[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_10[i, j] -> [0, i, j, 2, 0, 2] }' body: type: expression @@ -493,7 +493,7 @@ statements: read: 1 write: 0 - line: -1 - domain: '{ [S_11[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_11[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_11[i, j] -> [0, i, j, 2, 0, 2] }' body: type: expression @@ -543,7 +543,7 @@ statements: read: 1 write: 0 - line: -1 - domain: '{ [S_12[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_12[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_12[i, j] -> [0, i, j, 2, 1] }' body: type: expression @@ -588,7 +588,7 @@ statements: read: 1 write: 0 - line: -1 - domain: '{ [S_13[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_13[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_13[i, j] -> [0, i, j, 2, 1] }' body: type: expression @@ -633,7 +633,7 @@ statements: read: 1 write: 0 - line: 25 - domain: '{ [S_14[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_14[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_14[i, j] -> [0, i, j, 3, 0, 0] }' body: type: expression @@ -660,7 +660,7 @@ statements: read: 1 write: 0 - line: -1 - domain: '{ [S_15[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_15[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_15[i, j] -> [0, i, j, 3, 1] }' body: type: expression @@ -705,7 +705,7 @@ statements: read: 1 write: 0 - line: -1 - domain: '{ [S_16[i, j] -> [0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_16[i, j] -> [0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_16[i, j] -> [0, i, j, 3, 1] }' body: type: expression @@ -750,7 +750,7 @@ statements: read: 1 write: 0 - line: 27 - domain: '{ [S_17[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ [S_17[i, j] -> [0, 0]] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_17[i, j] -> [0, i, j, 4] }' body: type: expression @@ -789,5 +789,5 @@ statements: write: 0 implications: - satisfied: 0 - extension: '{ __pet_test_12[i, j] -> __pet_test_12[i, j''] : j'' <= j and i >= 0 - and i <= 99 and j'' >= 0 and j'' <= 99 }' + extension: '{ __pet_test_12[i, j] -> __pet_test_12[i, j''] : j'' <= j and i <= 99 + and i >= 0 and j'' <= 99 and j'' >= 0 }' diff --git a/tests/break5.scop b/tests/break5.scop index c516e82..7cde8cb 100644 --- a/tests/break5.scop +++ b/tests/break5.scop @@ -9,8 +9,10 @@ arrays: element_size: 4 statements: - line: 8 - domain: '{ S_0[i, j] : (i <= 89 and j >= 0 and j <= i) or (i <= 9 and i >= 0 and - j >= 1 + i and j <= 99) or (i <= 99 and i >= 90 and j <= 150 - i and j >= 0) }' + domain: '{ S_0[i, j] : (i <= 89 and i >= 75 and j >= 0 and j <= i) or (i <= 9 and + i >= 0 and j <= 99 and j >= 0) or (i <= 60 and i >= 10 and j >= 0 and j <= i) + or (i <= 74 and i >= 61 and j >= 0 and j <= i) or (i <= 99 and i >= 90 and j <= + 150 - i and j >= 0) }' schedule: '{ S_0[i, j] -> [0, i, j, 0] }' body: type: expression @@ -26,8 +28,9 @@ statements: - type: int value: 0 - line: 17 - domain: '{ S_1[i, j] : (i <= 89 and i >= 10 and j <= 60 and j >= 0 and j <= -1 + - i) or (i <= 99 and i >= 90 and j <= 149 - i and j >= 0) }' + domain: '{ 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) }' schedule: '{ S_1[i, j] -> [0, i, j, 5] }' body: type: expression diff --git a/tests/call1.scop b/tests/call1.scop index 00c369f..7920fbb 100644 --- a/tests/call1.scop +++ b/tests/call1.scop @@ -5,7 +5,7 @@ context: '[n] -> { : exists (e0 = floor((n)/4): 4e0 = n and n >= 0 and n <= 214 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0] : i0 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { A[i0] : i0 >= 0 and i0 <= -1 + n }' element_type: int element_size: 4 statements: @@ -24,8 +24,8 @@ statements: read: 1 write: 0 - line: 12 - domain: '[n] -> { S_1[i] : exists (e0 = floor((i)/4): 4e0 = i and i <= -4 + n and - i >= 0) }' + domain: '[n] -> { S_1[i] : exists (e0 = floor((i)/4): 4e0 = i and i >= 0 and i <= + -4 + n) }' schedule: '[n] -> { S_1[i] -> [1, i] }' body: type: expression diff --git a/tests/call2.scop b/tests/call2.scop index 6c256b1..34f4876 100644 --- a/tests/call2.scop +++ b/tests/call2.scop @@ -4,13 +4,13 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= 0 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 <= -1 + n and i1 >= - 0 }' + extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + + n }' element_type: int element_size: 4 statements: - line: 15 - domain: '[n] -> { S_0[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_0[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/call3.scop b/tests/call3.scop index 7296844..5d8faae 100644 --- a/tests/call3.scop +++ b/tests/call3.scop @@ -5,7 +5,7 @@ context: '[n] -> { : exists (e0 = floor((n)/4): 4e0 = n and n >= 0 and n <= 214 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0] : i0 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { A[i0] : i0 >= 0 and i0 <= -1 + n }' element_type: int element_size: 4 statements: @@ -24,8 +24,8 @@ statements: read: 1 write: 0 - line: 12 - domain: '[n] -> { S_1[i] : exists (e0 = floor((i)/4): 4e0 = i and i <= -4 + n and - i >= 0) }' + domain: '[n] -> { S_1[i] : exists (e0 = floor((i)/4): 4e0 = i and i >= 0 and i <= + -4 + n) }' schedule: '[n] -> { S_1[i] -> [1, i] }' body: type: expression diff --git a/tests/call5.scop b/tests/call5.scop index eb970ef..8f13287 100644 --- a/tests/call5.scop +++ b/tests/call5.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n >= 4 and n <= 2147483647 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0] : i0 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { A[i0] : i0 >= 0 and i0 <= -1 + n }' element_type: int element_size: 4 statements: diff --git a/tests/call6.scop b/tests/call6.scop index 36195ac..17f2bcb 100644 --- a/tests/call6.scop +++ b/tests/call6.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n >= 4 and n <= 2147483647 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0] : i0 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { A[i0] : i0 >= 0 and i0 <= -1 + n }' element_type: int element_size: 4 statements: diff --git a/tests/call_struct.scop b/tests/call_struct.scop index 1f7497e..52fc3f7 100644 --- a/tests/call_struct.scop +++ b/tests/call_struct.scop @@ -71,10 +71,10 @@ statements: arguments: - type: access may_write: '{ S_1[i] -> s_c_f_a[s_c_f[s_c[s[1] -> c[2 + i]] -> f[o2]] -> - a[o3]] : o3 >= 0 and o3 <= 9 and o2 <= 9 and o2 >= 0; S_1[i] -> s_c_b[s_c[s[1] + a[o3]] : o3 >= 0 and o2 <= 9 and o2 >= 0 and o3 <= 9; S_1[i] -> s_c_b[s_c[s[1] -> c[3 + i]] -> b[]] }' must_write: '{ S_1[i] -> s_c_f_a[s_c_f[s_c[s[1] -> c[2 + i]] -> f[o2]] -> - a[o3]] : o3 >= 0 and o3 <= 9 and o2 <= 9 and o2 >= 0; S_1[i] -> s_c_b[s_c[s[1] + a[o3]] : o3 >= 0 and o2 <= 9 and o2 >= 0 and o3 <= 9; S_1[i] -> s_c_b[s_c[s[1] -> c[3 + i]] -> b[]] }' index: '{ S_1[i] -> s_c[s[(1)] -> c[(i)]] }' reference: __pet_ref_1 diff --git a/tests/ceild.scop b/tests/ceild.scop index 36448ca..4db66cc 100644 --- a/tests/ceild.scop +++ b/tests/ceild.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : 2i <= -2 + N and 3i >= N }' + domain: '[N] -> { S_0[i] : 3i >= N and 2i <= -2 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/conditional_assignment.scop b/tests/conditional_assignment.scop index 682b4c5..54d0f77 100644 --- a/tests/conditional_assignment.scop +++ b/tests/conditional_assignment.scop @@ -5,21 +5,21 @@ context: '[N, M] -> { : N >= 0 and M >= 0 and N <= 2147483647 and M <= 21474836 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N, M] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 >= 0 and i1 <= - 9 }' + extent: '[N, M] -> { A[i0, i1] : i1 <= 9 and i1 >= 0 and i0 >= 0 and i0 <= -1 + + N }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, M] -> { C[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N, M] -> { C[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 - context: '[M, N] -> { : N >= 0 and M >= 0 }' - extent: '[N, M] -> { in1[i0, i1] : i1 <= -1 + M and i1 >= 0 and i0 <= -1 + N and - i0 >= 0 }' + extent: '[N, M] -> { in1[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 >= 0 and i1 <= + -1 + M }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, M] -> { in2[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N, M] -> { in2[i0] : i0 >= 0 and i0 <= -1 + N }' value_bounds: '{ [i0] : i0 >= -1 and i0 <= 1 }' element_type: int element_size: 4 @@ -29,7 +29,7 @@ arrays: element_size: 4 statements: - line: 21 - domain: '[N, M] -> { S_0[i] : i <= -1 + N and i >= 0 }' + domain: '[N, M] -> { S_0[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_0[i] -> [0, i, 0] }' body: type: expression @@ -53,8 +53,8 @@ statements: - type: int value: 1 - line: 23 - domain: '[N, M] -> { S_1[i, j] : j <= -1 + M and j >= 0 and i <= -1 + N and i >= - 0 }' + domain: '[N, M] -> { S_1[i, j] : i >= 0 and i <= -1 + N and j >= 0 and j <= -1 + + M }' schedule: '[N, M] -> { S_1[i, j] -> [0, i, 1, j] }' body: type: expression @@ -84,7 +84,7 @@ statements: read: 1 write: 0 - line: 24 - domain: '[N, M] -> { S_2[i] : i <= -1 + N and i >= 0 }' + domain: '[N, M] -> { S_2[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_2[i] -> [0, i, 2] }' body: type: expression @@ -123,7 +123,7 @@ statements: - type: int value: 0 - line: 28 - domain: '[N, M] -> { S_4[i] : i <= -1 + N and i >= 0 }' + domain: '[N, M] -> { S_4[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_4[i] -> [2, i] }' body: type: expression diff --git a/tests/conditional_assignment2.scop b/tests/conditional_assignment2.scop index 6ed6ca2..1459501 100644 --- a/tests/conditional_assignment2.scop +++ b/tests/conditional_assignment2.scop @@ -5,17 +5,17 @@ context: '[M, N] -> { : N >= 0 and M >= 0 and M <= 2147483647 and N <= 21474836 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[M, N] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 >= 0 and i1 <= - 9 }' + extent: '[M, N] -> { A[i0, i1] : i1 <= 9 and i1 >= 0 and i0 >= 0 and i0 <= -1 + + N }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[M, N] -> { C[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[M, N] -> { C[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 - context: '[M, N] -> { : N >= 0 and M >= 0 }' - extent: '[M, N] -> { in1[i0, i1] : i1 <= -1 + M and i1 >= 0 and i0 <= -1 + N and - i0 >= 0 }' + extent: '[M, N] -> { in1[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 >= 0 and i1 <= + -1 + M }' element_type: int element_size: 4 - context: '{ : }' @@ -45,7 +45,7 @@ statements: - type: call name: g2 - line: 23 - domain: '[M, N] -> { S_1[i] : i <= -1 + N and i >= 0 }' + domain: '[M, N] -> { S_1[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_1[i] -> [1, i, 0] }' body: type: expression @@ -69,8 +69,8 @@ statements: - type: int value: 1 - line: 25 - domain: '[M, N] -> { S_2[i, j] : j <= -1 + M and j >= 0 and i <= -1 + N and i >= - 0 }' + domain: '[M, N] -> { S_2[i, j] : i >= 0 and i <= -1 + N and j >= 0 and j <= -1 + + M }' schedule: '[N, M] -> { S_2[i, j] -> [1, i, 1, j] }' body: type: expression @@ -100,7 +100,7 @@ statements: read: 1 write: 0 - line: 26 - domain: '[M, N] -> { S_3[i] : i <= -1 + N and i >= 0 }' + domain: '[M, N] -> { S_3[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_3[i] -> [1, i, 2] }' body: type: expression @@ -139,7 +139,7 @@ statements: - type: int value: 0 - line: 30 - domain: '[M, N] -> { S_5[i] : i <= -1 + N and i >= 0 }' + domain: '[M, N] -> { S_5[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_5[i] -> [3, i] }' body: type: expression diff --git a/tests/continue.scop b/tests/continue.scop index 2fb6926..0afd94e 100644 --- a/tests/continue.scop +++ b/tests/continue.scop @@ -9,7 +9,7 @@ arrays: element_size: 4 statements: - line: 8 - domain: '{ S_0[i, j] : i >= 0 and i <= 99 and j <= 99 and j >= 0 }' + domain: '{ S_0[i, j] : i >= 0 and i <= 99 and j >= 0 and j <= 99 }' schedule: '{ S_0[i, j] -> [0, i, j, 0] }' body: type: expression diff --git a/tests/continue4.scop b/tests/continue4.scop index 2b0990d..f70f63c 100644 --- a/tests/continue4.scop +++ b/tests/continue4.scop @@ -141,8 +141,8 @@ statements: - type: access may_read: '{ [S_4[i] -> [0]] -> [0] : i >= 58 or i <= 56; [S_4[57] -> [0]] -> [1] }' - index: '{ [S_4[i] -> [__pet_test_0]] -> [((1) : i = 57; (0) : i <= 56 or - i >= 58)] }' + index: '{ [S_4[i] -> [__pet_test_0]] -> [((1) : i = 57; (0) : i >= 58 or + i <= 56)] }' reference: __pet_ref_12 read: 1 write: 0 diff --git a/tests/cuervo.scop b/tests/cuervo.scop index 6a83c41..aa6183a 100644 --- a/tests/cuervo.scop +++ b/tests/cuervo.scop @@ -1,8 +1,8 @@ start: 52 end: 176 indent: "\t" -context: '[n, m] -> { : n <= 2147483647 and m <= 2147483647 - n and m >= -2147483648 - and n >= -2147483648 and m <= 2147483647 }' +context: '[n, m] -> { : n >= -2147483648 and m <= 2147483647 and m <= 2147483647 + - n and n <= 2147483647 and m >= -2147483648 }' arrays: - context: '{ : }' extent: '[n, m] -> { A[i0] : i0 >= 0 }' @@ -18,7 +18,7 @@ arrays: element_size: 4 statements: - line: 6 - domain: '[n, m] -> { S_0[i, j] : i >= 0 and j <= m and j >= 0 and i <= n }' + domain: '[n, m] -> { S_0[i, j] : j <= m and i >= 0 and i <= n and j >= 0 }' schedule: '[n, m] -> { S_0[i, j] -> [0, i, j] }' body: type: expression diff --git a/tests/data_dependent.scop b/tests/data_dependent.scop index eede9e3..ea6bd3f 100644 --- a/tests/data_dependent.scop +++ b/tests/data_dependent.scop @@ -4,21 +4,21 @@ indent: "\t" context: '[N, M] -> { : N <= 1000 and N >= 10 and M >= 10 and M <= 1000 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N, M] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 >= 0 and i1 <= - 9 }' + extent: '[N, M] -> { A[i0, i1] : i1 <= 9 and i1 >= 0 and i0 >= 0 and i0 <= -1 + + N }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, M] -> { C[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N, M] -> { C[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 - context: '[M, N] -> { : N >= 0 and M >= 0 }' - extent: '[N, M] -> { in1[i0, i1] : i1 <= -1 + M and i1 >= 0 and i0 <= -1 + N and - i0 >= 0 }' + extent: '[N, M] -> { in1[i0, i1] : i0 >= 0 and i0 <= -1 + N and i1 >= 0 and i1 <= + -1 + M }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, M] -> { in2[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N, M] -> { in2[i0] : i0 >= 0 and i0 <= -1 + N }' value_bounds: '{ [i0] : i0 >= -1 and i0 <= 1 }' element_type: int element_size: 4 @@ -28,7 +28,7 @@ arrays: element_size: 4 statements: - line: 23 - domain: '[N, M] -> { S_0[i] : i <= -1 + N and i >= 0 }' + domain: '[N, M] -> { S_0[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_0[i] -> [0, i, 0] }' body: type: expression @@ -52,8 +52,8 @@ statements: - type: int value: 1 - line: 25 - domain: '[N, M] -> { S_1[i, j] : j <= -1 + M and j >= 0 and i <= -1 + N and i >= - 0 }' + domain: '[N, M] -> { S_1[i, j] : i >= 0 and i <= -1 + N and j >= 0 and j <= -1 + + M }' schedule: '[N, M] -> { S_1[i, j] -> [0, i, 1, j] }' body: type: expression @@ -83,7 +83,7 @@ statements: read: 1 write: 0 - line: 26 - domain: '[N, M] -> { S_2[i] : i <= -1 + N and i >= 0 }' + domain: '[N, M] -> { S_2[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_2[i] -> [0, i, 2] }' body: type: expression diff --git a/tests/data_dependent2.scop b/tests/data_dependent2.scop index c32e64c..22d947c 100644 --- a/tests/data_dependent2.scop +++ b/tests/data_dependent2.scop @@ -59,7 +59,7 @@ statements: - type: int value: 4 - line: 14 - domain: '{ [S_2[i, j] -> [1]] : i >= 0 and i <= 9 and j <= 9 and j >= 0 }' + domain: '{ [S_2[i, j] -> [1]] : i >= 0 and i <= 9 and j >= 0 and j <= 9 }' schedule: '{ S_2[i, j] -> [1, i, 1, j, 0] }' body: type: expression @@ -97,7 +97,7 @@ statements: read: 1 write: 0 - line: 15 - domain: '{ [S_3[i, j] -> [1]] : i >= 0 and i <= 9 and j <= 9 and j >= 0 }' + domain: '{ [S_3[i, j] -> [1]] : i >= 0 and i <= 9 and j >= 0 and j <= 9 }' schedule: '{ S_3[i, j] -> [1, i, 1, j, 1] }' body: type: expression diff --git a/tests/dec.scop b/tests/dec.scop index f5df01a..8c4d7d9 100644 --- a/tests/dec.scop +++ b/tests/dec.scop @@ -1,10 +1,10 @@ start: 38 end: 109 indent: "\t" -context: '[N] -> { : N >= 0 and N <= 2147483647 }' +context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: diff --git a/tests/dec2.scop b/tests/dec2.scop index 27e9b4c..2864de1 100644 --- a/tests/dec2.scop +++ b/tests/dec2.scop @@ -1,10 +1,10 @@ start: 38 end: 112 indent: "\t" -context: '[N] -> { : N >= 0 and N <= 2147483647 }' +context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: diff --git a/tests/dec3.scop b/tests/dec3.scop index 8d73e32..295a6b6 100644 --- a/tests/dec3.scop +++ b/tests/dec3.scop @@ -1,10 +1,10 @@ start: 38 end: 113 indent: "\t" -context: '[N] -> { : N >= 0 and N <= 2147483647 }' +context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: diff --git a/tests/dec4.scop b/tests/dec4.scop index e3c2dda..a69abe2 100644 --- a/tests/dec4.scop +++ b/tests/dec4.scop @@ -1,10 +1,10 @@ start: 38 end: 112 indent: "\t" -context: '[N] -> { : N >= 0 and N <= 2147483647 }' +context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: diff --git a/tests/decl.scop b/tests/decl.scop index 9d6c640..612ca05 100644 --- a/tests/decl.scop +++ b/tests/decl.scop @@ -10,21 +10,21 @@ arrays: element_size: 4 declared: 1 - context: '[K] -> { : K >= 0 }' - extent: '[N, K, M] -> { A[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + K }' + extent: '[N, K, M] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + K and i0 >= 0 }' element_type: float element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, K, M] -> { B[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + N }' + extent: '[N, K, M] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' element_type: float element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, K, M] -> { C[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + N }' + extent: '[N, K, M] -> { C[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' element_type: float element_size: 4 statements: - line: 8 - domain: '[N, K, M] -> { S_0[i, j] : j <= -1 + N and j >= 0 and i <= -1 + M and i - >= 0 }' + domain: '[N, K, M] -> { S_0[i, j] : i >= 0 and i <= -1 + M and j >= 0 and j <= -1 + + N }' schedule: '[M, N] -> { S_0[i, j] -> [0, i, j, 0] }' body: type: expression @@ -40,8 +40,8 @@ statements: - type: int value: 0 - line: 10 - domain: '[N, K, M] -> { S_1[i, j, k] : k <= -1 + K and k >= 0 and j <= -1 + N and - j >= 0 and i <= -1 + M and i >= 0 }' + domain: '[N, K, M] -> { S_1[i, j, k] : i >= 0 and i <= -1 + M and j >= 0 and j <= + -1 + N and k >= 0 and k <= -1 + K }' schedule: '[M, N, K] -> { S_1[i, j, k] -> [0, i, j, 1, k, 0, 0] }' body: type: expression @@ -55,8 +55,8 @@ statements: reference: __pet_ref_1 kill: 1 - line: 10 - domain: '[N, K, M] -> { S_2[i, j, k] : k <= -1 + K and k >= 0 and j <= -1 + N and - j >= 0 and i <= -1 + M and i >= 0 }' + domain: '[N, K, M] -> { 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 }' schedule: '[M, N, K] -> { S_2[i, j, k] -> [0, i, j, 1, k, 0, 1] }' body: type: expression @@ -83,8 +83,8 @@ statements: read: 1 write: 0 - line: 11 - domain: '[N, K, M] -> { S_4[i, j, k] : k <= -1 + K and k >= 0 and j <= -1 + N and - j >= 0 and i <= -1 + M and i >= 0 }' + domain: '[N, K, M] -> { S_4[i, j, k] : i >= 0 and i <= -1 + M and j >= 0 and j <= + -1 + N and k >= 0 and k <= -1 + K }' schedule: '[M, N, K] -> { S_4[i, j, k] -> [0, i, j, 1, k, 1] }' body: type: expression @@ -103,8 +103,8 @@ statements: read: 1 write: 0 - line: 10 - domain: '[N, K, M] -> { S_3[i, j, k] : k <= -1 + K and k >= 0 and j <= -1 + N and - j >= 0 and i <= -1 + M and i >= 0 }' + domain: '[N, K, M] -> { 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 }' schedule: '[M, N, K] -> { S_3[i, j, k] -> [0, i, j, 1, k, 2] }' body: type: expression diff --git a/tests/decl4.scop b/tests/decl4.scop index 77733f0..5789041 100644 --- a/tests/decl4.scop +++ b/tests/decl4.scop @@ -4,13 +4,13 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { a[i0] : i0 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { a[i0] : i0 >= 0 and i0 <= -1 + n }' element_type: float element_size: 4 declared: 1 exposed: 1 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { b[i0] : i0 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { b[i0] : i0 >= 0 and i0 <= -1 + n }' element_type: float element_size: 4 declared: 1 @@ -25,13 +25,13 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_0[] -> a[o0] : o0 <= -1 + n and o0 >= 0 }' + killed: '[n] -> { S_0[] -> a[o0] : o0 >= 0 and o0 <= -1 + n }' index: '[n] -> { S_0[] -> a[] }' depth: 1 reference: __pet_ref_0 kill: 1 - line: 7 - domain: '[n] -> { S_1[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_1[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_1[i] -> [1, i, 0] }' body: type: expression @@ -40,13 +40,13 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_1[i] -> b[o0] : o0 >= 0 and o0 <= -1 + n }' + killed: '[n] -> { S_1[i] -> b[o0] : o0 <= -1 + n and o0 >= 0 }' index: '[n] -> { S_1[i] -> b[] }' depth: 1 reference: __pet_ref_1 kill: 1 - line: 7 - domain: '[n] -> { S_2[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_2[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_2[i] -> [1, i, 1] }' body: type: expression @@ -55,7 +55,7 @@ statements: operation: kill arguments: - type: access - killed: '[n] -> { S_2[i] -> b[o0] : o0 >= 0 and o0 <= -1 + n }' + killed: '[n] -> { S_2[i] -> b[o0] : o0 <= -1 + n and o0 >= 0 }' index: '[n] -> { S_2[i] -> b[] }' depth: 1 reference: __pet_ref_2 diff --git a/tests/empty_domain.scop b/tests/empty_domain.scop index 5314811..93e8f38 100644 --- a/tests/empty_domain.scop +++ b/tests/empty_domain.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: diff --git a/tests/encapsulate/for_while.scop b/tests/encapsulate/for_while.scop index a6af3f6..652df3d 100644 --- a/tests/encapsulate/for_while.scop +++ b/tests/encapsulate/for_while.scop @@ -14,7 +14,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -30,7 +30,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { S_4[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_4[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_4[x1] -> [0, x1, 1, 0] }' body: type: expression @@ -44,7 +44,7 @@ statements: reference: __pet_ref_1 kill: 1 - line: 13 - domain: '[n] -> { S_3[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_3[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_3[x1] -> [0, x1, 1, 1] }' body: type: for @@ -98,7 +98,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { S_5[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_5[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_5[x1] -> [0, x1, 1, 2] }' body: type: expression @@ -112,7 +112,7 @@ statements: reference: __pet_ref_7 kill: 1 - line: 16 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/encapsulate/independent5.scop b/tests/encapsulate/independent5.scop index 1abc143..55049f9 100644 --- a/tests/encapsulate/independent5.scop +++ b/tests/encapsulate/independent5.scop @@ -22,7 +22,7 @@ arrays: element_size: 4 statements: - line: 6 - domain: '[n] -> { S_7[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_7[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_7[i] -> [0, i, 0] }' body: type: expression @@ -36,7 +36,7 @@ statements: reference: __pet_ref_0 kill: 1 - line: 6 - domain: '[n] -> { S_6[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_6[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_6[i] -> [0, i, 1] }' body: type: for @@ -93,7 +93,7 @@ statements: read: 1 write: 0 - line: 6 - domain: '[n] -> { S_8[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_8[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_8[i] -> [0, i, 2] }' body: type: expression diff --git a/tests/encapsulate/while.scop b/tests/encapsulate/while.scop index f2bfcb1..23a77a7 100644 --- a/tests/encapsulate/while.scop +++ b/tests/encapsulate/while.scop @@ -9,7 +9,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x] : x <= -1 + n and x >= 0 }' + domain: '[n] -> { S1[x] : x >= 0 and x <= -1 + n }' schedule: '[n] -> { S1[x] -> [0, x, 0] }' body: type: expression @@ -25,7 +25,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { S_3[x] : x <= -1 + n and x >= 0 }' + domain: '[n] -> { S_3[x] : x >= 0 and x <= -1 + n }' schedule: '[n] -> { S_3[x] -> [0, x, 1] }' body: type: while @@ -66,7 +66,7 @@ statements: read: 1 write: 0 - line: 16 - domain: '[n] -> { R[x] : x <= -1 + n and x >= 0 }' + domain: '[n] -> { R[x] : x >= 0 and x <= -1 + n }' schedule: '[n] -> { R[x] -> [0, x, 2] }' body: type: expression diff --git a/tests/encapsulate/while_affine.scop b/tests/encapsulate/while_affine.scop index 8ebce9a..890f171 100644 --- a/tests/encapsulate/while_affine.scop +++ b/tests/encapsulate/while_affine.scop @@ -4,16 +4,16 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { b[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { b[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 9 - domain: '[N] -> { S_0[99, t, j] : j >= 0 and t >= 0 and j <= -1 + N }' + domain: '[N] -> { S_0[99, t, j] : j >= 0 and j <= -1 + N and t >= 0 }' schedule: '[N] -> { S_0[i, t, j] -> [0, i, t, 0, j] }' body: type: expression @@ -29,7 +29,7 @@ statements: - type: int value: 0 - line: 11 - domain: '[N] -> { S_1[99, t, j] : j >= 0 and t >= 0 and j <= -1 + N }' + domain: '[N] -> { S_1[99, t, j] : j >= 0 and j <= -1 + N and t >= 0 }' schedule: '[N] -> { S_1[i, t, j] -> [0, i, t, 1, j] }' body: type: expression diff --git a/tests/floord.scop b/tests/floord.scop index c3c8106..9e11f11 100644 --- a/tests/floord.scop +++ b/tests/floord.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : 2i <= -2 + N and i >= 0 }' + domain: '[N] -> { S_0[i] : i >= 0 and 2i <= -2 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/floord2.scop b/tests/floord2.scop index e736649..5c7587a 100644 --- a/tests/floord2.scop +++ b/tests/floord2.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: diff --git a/tests/for_while.scop b/tests/for_while.scop index ef931bc..ed116a7 100644 --- a/tests/for_while.scop +++ b/tests/for_while.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, x2] : x1 <= -1 + n and x1 >= 0 and x2 >= 0 }' + extent: '[n] -> { __pet_test_0[x1, x2] : x1 <= -1 + n and x2 >= 0 and x1 >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -15,7 +15,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -31,7 +31,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { [S_1[x1, x2] -> [1]] : x1 <= -1 + n and x1 >= 0 and x2 >= 0 }' + domain: '[n] -> { [S_1[x1, x2] -> [1]] : x1 <= -1 + n and x2 >= 0 and x1 >= 0 }' schedule: '[n] -> { S_1[x1, x2] -> [0, x1, 1, x2, 0] }' body: type: expression @@ -64,7 +64,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, x2] -> [1]] : x1 <= -1 + n and x1 >= 0 and x2 >= 0 }' + domain: '[n] -> { [S2[x1, x2] -> [1]] : x1 <= -1 + n and x2 >= 0 and x1 >= 0 }' schedule: '[n] -> { S2[x1, x2] -> [0, x1, 1, x2, 1, 0] }' body: type: expression @@ -92,7 +92,7 @@ statements: read: 1 write: 0 - line: 16 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/for_while_dec.scop b/tests/for_while_dec.scop index 27a30da..311fbec 100644 --- a/tests/for_while_dec.scop +++ b/tests/for_while_dec.scop @@ -5,7 +5,7 @@ context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' extent: '[n] -> { __pet_test_0[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x1 >= 0 and x2 <= 9) }' + x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -16,7 +16,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -33,7 +33,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 x1 >= 0 and x2 <= 9) }' + x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' schedule: '[n] -> { S_1[x1, x2] -> [0, x1, 1, -x2, 0] }' body: type: expression @@ -67,7 +67,7 @@ statements: write: 0 - line: 14 domain: '[n] -> { [S2[x1, x2] -> [1]] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x1 >= 0 and x2 <= 9) }' + x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' schedule: '[n] -> { S2[x1, x2] -> [0, x1, 1, -x2, 1, 0] }' body: type: expression @@ -95,7 +95,7 @@ statements: read: 1 write: 0 - line: 16 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/for_while_inc.scop b/tests/for_while_inc.scop index 1e1df34..3a3d8f2 100644 --- a/tests/for_while_inc.scop +++ b/tests/for_while_inc.scop @@ -5,7 +5,7 @@ context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' extent: '[n] -> { __pet_test_0[x1, x2] : exists (e0 = floor((-1 + x2)/2): 2e0 = - -1 + x2 and x1 <= -1 + n and x1 >= 0 and x2 >= 9) }' + -1 + x2 and x1 <= -1 + n and x2 >= 9 and x1 >= 0) }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -16,7 +16,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -33,7 +33,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 x1 >= 0 and x2 >= 9) }' + -1 + x2 and x1 <= -1 + n and x2 >= 9 and x1 >= 0) }' schedule: '[n] -> { S_1[x1, x2] -> [0, x1, 1, x2, 0] }' body: type: expression @@ -67,7 +67,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 x1 >= 0 and x2 >= 9) }' + + x2 and x1 <= -1 + n and x2 >= 9 and x1 >= 0) }' schedule: '[n] -> { S2[x1, x2] -> [0, x1, 1, x2, 1, 0] }' body: type: expression @@ -95,7 +95,7 @@ statements: read: 1 write: 0 - line: 16 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/for_while_inc2.scop b/tests/for_while_inc2.scop index 928efe7..ec672b4 100644 --- a/tests/for_while_inc2.scop +++ b/tests/for_while_inc2.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -20,7 +20,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -36,7 +36,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { S_5[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_5[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_5[x1] -> [0, x1, 1, 0] }' body: type: expression @@ -50,7 +50,7 @@ statements: reference: __pet_ref_1 kill: 1 - line: 13 - domain: '[n] -> { S_1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_1[x1] -> [0, x1, 1, 1] }' body: type: expression @@ -66,7 +66,7 @@ statements: - type: int value: 0 - line: 13 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_2[x1, t] -> [0, x1, 1, 2, t, 0] }' body: type: expression @@ -99,7 +99,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S2[x1, t] -> [0, x1, 1, 2, t, 1, 0] }' body: type: expression @@ -127,7 +127,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_4[x1, t] -> [0, x1, 1, 2, t, 2] }' body: type: expression @@ -152,7 +152,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { S_6[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_6[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_6[x1] -> [0, x1, 1, 3] }' body: type: expression @@ -166,7 +166,7 @@ statements: reference: __pet_ref_13 kill: 1 - line: 16 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/for_while_inc3.scop b/tests/for_while_inc3.scop index 39af9b6..6ad63bb 100644 --- a/tests/for_while_inc3.scop +++ b/tests/for_while_inc3.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -20,7 +20,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -36,7 +36,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { S_5[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_5[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_5[x1] -> [0, x1, 1, 0] }' body: type: expression @@ -50,7 +50,7 @@ statements: reference: __pet_ref_1 kill: 1 - line: 13 - domain: '[n] -> { S_1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_1[x1] -> [0, x1, 1, 1] }' body: type: expression @@ -66,7 +66,7 @@ statements: - type: int value: 0 - line: 13 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_2[x1, t] -> [0, x1, 1, 2, t, 0] }' body: type: expression @@ -99,7 +99,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S2[x1, t] -> [0, x1, 1, 2, t, 1, 0] }' body: type: expression @@ -127,7 +127,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_4[x1, t] -> [0, x1, 1, 2, t, 2] }' body: type: expression @@ -152,7 +152,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { S_6[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_6[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_6[x1] -> [0, x1, 1, 3] }' body: type: expression @@ -166,7 +166,7 @@ statements: reference: __pet_ref_13 kill: 1 - line: 16 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/for_while_inc4.scop b/tests/for_while_inc4.scop index 7a0ef28..57565f0 100644 --- a/tests/for_while_inc4.scop +++ b/tests/for_while_inc4.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -19,7 +19,7 @@ arrays: element_size: 4 statements: - line: 13 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -35,7 +35,7 @@ statements: - type: call name: f - line: 14 - domain: '[n] -> { S_1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_1[x1] -> [0, x1, 1, 0] }' body: type: expression @@ -51,7 +51,7 @@ statements: - type: int value: 0 - line: 14 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_2[x1, t] -> [0, x1, 1, 1, t, 0] }' body: type: expression @@ -84,7 +84,7 @@ statements: read: 1 write: 0 - line: 15 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S2[x1, t] -> [0, x1, 1, 1, t, 1, 0] }' body: type: expression @@ -112,7 +112,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_4[x1, t] -> [0, x1, 1, 1, t, 2] }' body: type: expression @@ -137,7 +137,7 @@ statements: read: 1 write: 0 - line: 17 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/for_while_init.scop b/tests/for_while_init.scop index 2fcdc8b..0a58ff2 100644 --- a/tests/for_while_init.scop +++ b/tests/for_while_init.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -20,7 +20,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -36,7 +36,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { S_5[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_5[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_5[x1] -> [0, x1, 1, 0] }' body: type: expression @@ -50,7 +50,7 @@ statements: reference: __pet_ref_1 kill: 1 - line: 13 - domain: '[n] -> { S_1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_1[x1] -> [0, x1, 1, 1] }' body: type: expression @@ -69,7 +69,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_2[x1, t] -> [0, x1, 1, 2, t, 0] }' body: type: expression @@ -102,7 +102,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S2[x1, t] -> [0, x1, 1, 2, t, 1, 0] }' body: type: expression @@ -130,7 +130,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_4[x1, t] -> [0, x1, 1, 2, t, 2] }' body: type: expression @@ -152,7 +152,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { S_6[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_6[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_6[x1] -> [0, x1, 1, 3] }' body: type: expression @@ -166,7 +166,7 @@ statements: reference: __pet_ref_13 kill: 1 - line: 16 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/for_while_init2.scop b/tests/for_while_init2.scop index 718229b..9d7c624 100644 --- a/tests/for_while_init2.scop +++ b/tests/for_while_init2.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + extent: '[n] -> { __pet_test_0[x1, t] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -20,7 +20,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -36,7 +36,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { S_5[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_5[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_5[x1] -> [0, x1, 1, 0] }' body: type: expression @@ -50,7 +50,7 @@ statements: reference: __pet_ref_1 kill: 1 - line: 13 - domain: '[n] -> { S_1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_1[x1] -> [0, x1, 1, 1] }' body: type: expression @@ -69,7 +69,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_2[x1, t] -> [0, x1, 1, 2, t, 0] }' body: type: expression @@ -102,7 +102,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S2[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S2[x1, t] -> [0, x1, 1, 2, t, 1, 0] }' body: type: expression @@ -130,7 +130,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and x1 >= 0 and t >= 0 }' + domain: '[n] -> { [S_4[x1, t] -> [1]] : x1 <= -1 + n and t >= 0 and x1 >= 0 }' schedule: '[n] -> { S_4[x1, t] -> [0, x1, 1, 2, t, 2] }' body: type: expression @@ -155,7 +155,7 @@ statements: read: 1 write: 0 - line: 13 - domain: '[n] -> { S_6[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S_6[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S_6[x1] -> [0, x1, 1, 3] }' body: type: expression @@ -169,7 +169,7 @@ statements: reference: __pet_ref_14 kill: 1 - line: 16 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/for_while_init3.scop b/tests/for_while_init3.scop index 2ac4453..edaaf52 100644 --- a/tests/for_while_init3.scop +++ b/tests/for_while_init3.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[i, t] : i <= -1 + n and i >= 0 and t >= 0 }' + extent: '[n] -> { __pet_test_0[i, t] : i <= -1 + n and t >= 0 and i >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -40,7 +40,7 @@ statements: - type: int value: 0 - line: 8 - domain: '[n] -> { S_5[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_5[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_5[i] -> [1, i, 0] }' body: type: expression @@ -54,7 +54,7 @@ statements: reference: __pet_ref_1 kill: 1 - line: 8 - domain: '[n] -> { S_1[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_1[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_1[i] -> [1, i, 1] }' body: type: expression @@ -73,7 +73,7 @@ statements: read: 1 write: 0 - line: 8 - domain: '[n] -> { [S_2[i, t] -> [1]] : i <= -1 + n and i >= 0 and t >= 0 }' + domain: '[n] -> { [S_2[i, t] -> [1]] : i <= -1 + n and t >= 0 and i >= 0 }' schedule: '[n] -> { S_2[i, t] -> [1, i, 2, t, 0] }' body: type: expression @@ -103,7 +103,7 @@ statements: read: 1 write: 0 - line: 9 - domain: '[n] -> { [S_3[i, t] -> [1]] : i <= -1 + n and i >= 0 and t >= 0 }' + domain: '[n] -> { [S_3[i, t] -> [1]] : i <= -1 + n and t >= 0 and i >= 0 }' schedule: '[n] -> { S_3[i, t] -> [1, i, 2, t, 1] }' body: type: expression @@ -123,7 +123,7 @@ statements: read: 1 write: 0 - line: 8 - domain: '[n] -> { [S_4[i, t] -> [1]] : i <= -1 + n and i >= 0 and t >= 0 }' + domain: '[n] -> { [S_4[i, t] -> [1]] : i <= -1 + n and t >= 0 and i >= 0 }' schedule: '[n] -> { S_4[i, t] -> [1, i, 2, t, 2] }' body: type: expression @@ -145,7 +145,7 @@ statements: read: 1 write: 0 - line: 8 - domain: '[n] -> { S_6[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_6[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_6[i] -> [1, i, 3] }' body: type: expression diff --git a/tests/for_while_overflow.scop b/tests/for_while_overflow.scop index e552072..05abbb3 100644 --- a/tests/for_while_overflow.scop +++ b/tests/for_while_overflow.scop @@ -53,8 +53,8 @@ statements: read: 1 write: 0 - line: 14 - domain: '[N] -> { [S_2[T, i] -> [1]] : T >= 0 and i >= 0 and N <= 1073741823 and - i <= -1 + 2N }' + domain: '[N] -> { [S_2[T, i] -> [1]] : i >= 0 and i <= -1 + 2N and N <= 1073741823 + and T >= 0 }' schedule: '[N] -> { S_2[T, i] -> [1, T, 1, 0, i] }' body: type: expression diff --git a/tests/for_while_unsigned.scop b/tests/for_while_unsigned.scop index 8411628..e1fbb0b 100644 --- a/tests/for_while_unsigned.scop +++ b/tests/for_while_unsigned.scop @@ -5,7 +5,7 @@ context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' extent: '[n] -> { __pet_test_0[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x1 >= 0 and x2 <= 9) }' + x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -16,7 +16,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -33,7 +33,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 x1 >= 0 and x2 <= 9) }' + x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' schedule: '[n] -> { S_1[x1, x2] -> [0, x1, 1, -x2, 0] }' body: type: expression @@ -67,7 +67,7 @@ statements: write: 0 - line: 14 domain: '[n] -> { [S2[x1, x2] -> [1]] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x1 >= 0 and x2 <= 9) }' + x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' schedule: '[n] -> { S2[x1, x2] -> [0, x1, 1, -x2, 1, 0] }' body: type: expression @@ -95,7 +95,7 @@ statements: read: 1 write: 0 - line: 16 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/for_while_unsigned2.scop b/tests/for_while_unsigned2.scop index 41c52ff..d4dee6e 100644 --- a/tests/for_while_unsigned2.scop +++ b/tests/for_while_unsigned2.scop @@ -5,7 +5,7 @@ context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' extent: '[n] -> { __pet_test_0[x1, x2] : exists (e0 = floor((x2)/3): 3e0 = x2 and - x1 <= -1 + n and x1 >= 0 and x2 <= 9) }' + x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -20,7 +20,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { S1[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { S1[x1] -> [0, x1, 0] }' body: type: expression @@ -37,7 +37,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 x1 >= 0 and x2 <= 9) }' + x1 <= -1 + n and x2 <= 9 and x1 >= 0) }' schedule: '[n] -> { S_1[x1, x2] -> [0, x1, 1, -x2, 0] }' body: type: expression @@ -71,8 +71,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 x3 >= 0 and x1 >= 0 and x1 <= -1 + n and x2 <= 9 and 256e0 <= x2 - - x3 and 256e0 <= x2 and 256e0 >= -255 + x2) }' + 3e1 = x2 and x1 <= -1 + n and x2 <= 9 and x3 >= 0 and 256e0 <= x2 - x3 and x1 + >= 0 and 256e0 >= -255 + x2) }' schedule: '[n] -> { S2[x1, x2, x3] -> [0, x1, 1, -x2, 1, 0, x3] }' body: type: expression @@ -109,7 +109,7 @@ statements: read: 1 write: 0 - line: 17 - domain: '[n] -> { R[x1] : x1 <= -1 + n and x1 >= 0 }' + domain: '[n] -> { R[x1] : x1 >= 0 and x1 <= -1 + n }' schedule: '[n] -> { R[x1] -> [0, x1, 2] }' body: type: expression diff --git a/tests/forward_substitution4.scop b/tests/forward_substitution4.scop index 1b08eeb..8161d6f 100644 --- a/tests/forward_substitution4.scop +++ b/tests/forward_substitution4.scop @@ -1,7 +1,7 @@ start: 36 end: 106 indent: "\t" -context: '[N] -> { : N <= 2147483647 and N >= -2147483648 }' +context: '[N] -> { : N >= -2147483648 and N <= 2147483647 }' arrays: - context: '{ : }' extent: '[N] -> { a[i0] : i0 <= 9 and i0 >= 0 }' diff --git a/tests/generic_condition2.scop b/tests/generic_condition2.scop index 266fd90..14cabda 100644 --- a/tests/generic_condition2.scop +++ b/tests/generic_condition2.scop @@ -9,9 +9,8 @@ arrays: element_size: 4 statements: - line: 9 - domain: '{ S_0[i, j] : exists (e0 = floor((2 + 4i)/5): i >= 0 and i <= 4 and j <= - 2147483645 and 5e0 <= 2 + 4i and j >= i and 5e0 <= 5i - j and 5e0 >= -2 + 4i) - }' + domain: '{ S_0[i, j] : exists (e0 = floor((2 + 4i)/5): i <= 4 and i >= 0 and 5e0 + <= 5i - j and 5e0 >= -2 + 4i and j >= i) }' schedule: '{ S_0[i, j] -> [0, i, j] }' body: type: expression diff --git a/tests/implicit_condition.scop b/tests/implicit_condition.scop index 79eff9b..a848c90 100644 --- a/tests/implicit_condition.scop +++ b/tests/implicit_condition.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 9 - domain: '[N] -> { S_0[i] : i <= -1 + N and i >= 1 }' + domain: '[N] -> { S_0[i] : i >= 1 and i <= -1 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/inc.scop b/tests/inc.scop index e5d275b..fc48284 100644 --- a/tests/inc.scop +++ b/tests/inc.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { S_0[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/inc2.scop b/tests/inc2.scop index 707296c..6e9cba4 100644 --- a/tests/inc2.scop +++ b/tests/inc2.scop @@ -4,13 +4,13 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : exists (e0 = floor((i)/3): 3e0 = i and i <= -1 + N and - i >= 0) }' + domain: '[N] -> { S_0[i] : exists (e0 = floor((i)/3): 3e0 = i and i >= 0 and i <= + -1 + N) }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/inc3.scop b/tests/inc3.scop index 3286692..492ed2a 100644 --- a/tests/inc3.scop +++ b/tests/inc3.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { S_0[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/inc4.scop b/tests/inc4.scop index 3b502c7..f43c923 100644 --- a/tests/inc4.scop +++ b/tests/inc4.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N <= 2147483548 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { S_0[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/inc5.scop b/tests/inc5.scop index 543ee99..9567338 100644 --- a/tests/inc5.scop +++ b/tests/inc5.scop @@ -10,7 +10,7 @@ arrays: element_size: 4 uniquely_defined: 1 - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 - context: '{ : }' diff --git a/tests/independent1.scop b/tests/independent1.scop index 4693112..64bf121 100644 --- a/tests/independent1.scop +++ b/tests/independent1.scop @@ -4,16 +4,16 @@ indent: "\t" context: '[n] -> { : n >= 0 and n <= 2147483647 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + n }' + extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + n }' + extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' element_type: int element_size: 4 statements: - line: 7 - domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j <= -1 + n and j >= 0 + domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_0[i, j] -> [0, i, j] }' body: diff --git a/tests/independent2.scop b/tests/independent2.scop index 17c4b78..d729b6b 100644 --- a/tests/independent2.scop +++ b/tests/independent2.scop @@ -8,12 +8,12 @@ arrays: element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + n }' + extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' element_type: int element_size: 4 statements: - line: 7 - domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j <= -1 + n and j >= 0 + domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_0[i, j] -> [0, i, j] }' body: diff --git a/tests/independent3.scop b/tests/independent3.scop index 3f045a1..4ec5b40 100644 --- a/tests/independent3.scop +++ b/tests/independent3.scop @@ -9,16 +9,16 @@ arrays: element_size: 4 declared: 1 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + n }' + extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + n }' + extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' element_type: int element_size: 4 statements: - line: 7 - domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j <= -1 + n and j >= 0 + domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_0[i, j] -> [0, i, j, 0, 0] }' body: @@ -33,7 +33,7 @@ statements: reference: __pet_ref_0 kill: 1 - line: 7 - domain: '[n] -> { S_1[i, j] : i >= 0 and i <= -1 + n and j <= -1 + n and j >= 0 + domain: '[n] -> { S_1[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_1[i, j] -> [0, i, j, 0, 1] }' body: @@ -61,7 +61,7 @@ statements: read: 1 write: 0 - line: 8 - domain: '[n] -> { S_3[i, j] : i >= 0 and i <= -1 + n and j <= -1 + n and j >= 0 + domain: '[n] -> { S_3[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_3[i, j] -> [0, i, j, 1] }' body: @@ -87,7 +87,7 @@ statements: read: 1 write: 0 - line: 7 - domain: '[n] -> { S_2[i, j] : i >= 0 and i <= -1 + n and j <= -1 + n and j >= 0 + domain: '[n] -> { S_2[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_2[i, j] -> [0, i, j, 2] }' body: diff --git a/tests/independent4.scop b/tests/independent4.scop index 489d04f..36b3751 100644 --- a/tests/independent4.scop +++ b/tests/independent4.scop @@ -4,16 +4,16 @@ indent: "\t" context: '[n] -> { : n >= 0 and n <= 2147483647 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + n }' + extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + n }' + extent: '[n] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 }' element_type: int element_size: 4 statements: - line: 7 - domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j <= -1 + n and j >= 0 + domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_0[i, j] -> [0, i, j] }' body: diff --git a/tests/inf.scop b/tests/inf.scop index cf4ab86..9fb59bc 100644 --- a/tests/inf.scop +++ b/tests/inf.scop @@ -4,16 +4,16 @@ indent: ' ' context: '[N] -> { : N >= 8 and N <= 16 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { b[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { b[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 12 - domain: '[N] -> { S_0[t, j] : j >= 0 and t >= 0 and j <= -1 + N }' + domain: '[N] -> { S_0[t, j] : j >= 0 and j <= -1 + N and t >= 0 }' schedule: '[N] -> { S_0[t, j] -> [0, t, 0, j] }' body: type: expression @@ -29,7 +29,7 @@ statements: - type: int value: 0 - line: 14 - domain: '[N] -> { S_1[t, j] : j >= 0 and t >= 0 and j <= -1 + N }' + domain: '[N] -> { S_1[t, j] : j >= 0 and j <= -1 + N and t >= 0 }' schedule: '[N] -> { S_1[t, j] -> [0, t, 1, j] }' body: type: expression diff --git a/tests/inf2.scop b/tests/inf2.scop index e35ad2c..6026f3b 100644 --- a/tests/inf2.scop +++ b/tests/inf2.scop @@ -4,16 +4,16 @@ indent: ' ' context: '[N] -> { : N >= 8 and N <= 16 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { b[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { b[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 12 - domain: '[N] -> { S_0[t, j] : j >= 0 and t >= 0 and j <= -1 + N }' + domain: '[N] -> { S_0[t, j] : j >= 0 and j <= -1 + N and t >= 0 }' schedule: '[N] -> { S_0[t, j] -> [0, t, 0, j] }' body: type: expression @@ -29,7 +29,7 @@ statements: - type: int value: 0 - line: 14 - domain: '[N] -> { S_1[t, j] : j >= 0 and t >= 0 and j <= -1 + N }' + domain: '[N] -> { S_1[t, j] : j >= 0 and j <= -1 + N and t >= 0 }' schedule: '[N] -> { S_1[t, j] -> [0, t, 1, j] }' body: type: expression diff --git a/tests/inf4.scop b/tests/inf4.scop index 2d70627..046cd82 100644 --- a/tests/inf4.scop +++ b/tests/inf4.scop @@ -4,16 +4,16 @@ indent: ' ' context: '[N] -> { : N >= 8 and N <= 16 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { b[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { b[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 12 - domain: '[N] -> { S_0[i, j] : j >= 0 and i >= 0 and j <= -1 + N }' + domain: '[N] -> { S_0[i, j] : j >= 0 and j <= -1 + N and i >= 0 }' schedule: '[N] -> { S_0[i, j] -> [0, i, 0, j] }' body: type: expression @@ -29,7 +29,7 @@ statements: - type: int value: 0 - line: 14 - domain: '[N] -> { S_1[i, j] : j >= 0 and i >= 0 and j <= -1 + N }' + domain: '[N] -> { S_1[i, j] : j >= 0 and j <= -1 + N and i >= 0 }' schedule: '[N] -> { S_1[i, j] -> [0, i, 1, j] }' body: type: expression diff --git a/tests/iterator_declaration.scop b/tests/iterator_declaration.scop index 756b000..21f1d15 100644 --- a/tests/iterator_declaration.scop +++ b/tests/iterator_declaration.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { S_0[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/kill.scop b/tests/kill.scop index 981c1c8..ecc0f64 100644 --- a/tests/kill.scop +++ b/tests/kill.scop @@ -8,7 +8,7 @@ arrays: element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { B[i0] : i0 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { B[i0] : i0 >= 0 and i0 <= -1 + n }' element_type: int element_size: 4 - context: '{ : }' @@ -16,8 +16,8 @@ arrays: element_type: int element_size: 4 - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { D[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 <= -1 + n and i1 >= - 0 }' + extent: '[n] -> { D[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + + n }' element_type: int element_size: 4 - context: '{ : }' @@ -41,7 +41,7 @@ statements: reference: __pet_ref_0 kill: 1 - line: 9 - domain: '[n] -> { S_1[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_1[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_1[i] -> [1, i, 0] }' body: type: expression @@ -60,7 +60,7 @@ statements: read: 1 write: 0 - line: 10 - domain: '[n] -> { S_2[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_2[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_2[i] -> [1, i, 1] }' body: type: expression @@ -79,7 +79,7 @@ statements: read: 1 write: 0 - line: 11 - domain: '[n] -> { S_3[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_3[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_3[i] -> [1, i, 2] }' body: type: expression @@ -98,7 +98,7 @@ statements: read: 1 write: 0 - line: 12 - domain: '[n] -> { S_4[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_4[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_4[i] -> [1, i, 3] }' body: type: expression @@ -112,7 +112,7 @@ statements: reference: __pet_ref_7 kill: 1 - line: 12 - domain: '[n] -> { S_5[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_5[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_5[i] -> [1, i, 3] }' body: type: expression @@ -126,7 +126,7 @@ statements: reference: __pet_ref_8 kill: 1 - line: 12 - domain: '[n] -> { S_6[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_6[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_6[i] -> [1, i, 3] }' body: type: expression diff --git a/tests/loop2.scop b/tests/loop2.scop index bdf6e02..349cfc9 100644 --- a/tests/loop2.scop +++ b/tests/loop2.scop @@ -9,7 +9,7 @@ arrays: element_size: 4 statements: - line: 9 - domain: '{ S_0[i] : (i <= 4 and i >= 0) or (i <= 9 and i >= 6) }' + domain: '{ S_0[i] : (i <= 9 and i >= 6) or (i <= 4 and i >= 0) }' schedule: '{ S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/loop5.scop b/tests/loop5.scop index 12c7adf..ea61bc4 100644 --- a/tests/loop5.scop +++ b/tests/loop5.scop @@ -1,7 +1,7 @@ start: 34 end: 110 indent: "\t" -context: '[n, m] -> { : m <= 2147483645 and n <= 2147483646 and m >= -2147483648 +context: '[n, m] -> { : m <= 2147483645 and m >= -2147483648 and n <= 2147483646 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/loop6.scop b/tests/loop6.scop index 9de9d2b..1b0a8f3 100644 --- a/tests/loop6.scop +++ b/tests/loop6.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[n] -> { : n >= 0 and n <= 2147483647 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { a[i0] : i0 <= -1 + n and i0 >= 0 }' + extent: '[n] -> { a[i0] : i0 >= 0 and i0 <= -1 + n }' element_type: int element_size: 4 statements: - line: 8 - domain: '[n] -> { S_0[i] : i >= 0 and i <= 2147483547 and i <= n }' + domain: '[n] -> { S_0[i] : i >= 0 and i <= n and i <= 2147483547 }' schedule: '[n] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/loop8.scop b/tests/loop8.scop index 3c89a4b..8bcdccb 100644 --- a/tests/loop8.scop +++ b/tests/loop8.scop @@ -1,10 +1,10 @@ start: 38 end: 109 indent: "\t" -context: '[N] -> { : N >= 1 and N <= 2147483647 }' +context: '[N] -> { : N <= 2147483647 and N >= 1 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: diff --git a/tests/matmul.scop b/tests/matmul.scop index e4a5316..917f71f 100644 --- a/tests/matmul.scop +++ b/tests/matmul.scop @@ -5,22 +5,22 @@ context: '[N, K, M] -> { : K >= 0 and N >= 0 and N <= 2147483647 and K <= 21474 and M <= 2147483647 and M >= -2147483648 }' arrays: - context: '[K] -> { : K >= 0 }' - extent: '[N, K, M] -> { A[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + K }' + extent: '[N, K, M] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + K and i0 >= 0 }' element_type: float element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, K, M] -> { B[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + N }' + extent: '[N, K, M] -> { B[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' element_type: float element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N, K, M] -> { C[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + N }' + extent: '[N, K, M] -> { C[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' element_type: float element_size: 4 live_out: 1 statements: - line: 9 - domain: '[N, K, M] -> { S_0[i, j] : j <= -1 + N and j >= 0 and i <= -1 + M and i - >= 0 }' + domain: '[N, K, M] -> { S_0[i, j] : i >= 0 and i <= -1 + M and j >= 0 and j <= -1 + + N }' schedule: '[M, N] -> { S_0[i, j] -> [0, i, j, 0] }' body: type: expression @@ -36,8 +36,8 @@ statements: - type: int value: 0 - line: 11 - domain: '[N, K, M] -> { S_1[i, j, k] : k <= -1 + K and k >= 0 and j <= -1 + N and - j >= 0 and i <= -1 + M and i >= 0 }' + domain: '[N, K, M] -> { S_1[i, j, k] : i >= 0 and i <= -1 + M and j >= 0 and j <= + -1 + N and k >= 0 and k <= -1 + K }' schedule: '[M, N, K] -> { S_1[i, j, k] -> [0, i, j, 1, k] }' body: type: expression diff --git a/tests/max.scop b/tests/max.scop index 7d0ef4e..f2f3175 100644 --- a/tests/max.scop +++ b/tests/max.scop @@ -1,15 +1,15 @@ start: 38 end: 117 indent: "\t" -context: '[N] -> { : N >= 0 and N <= 2147483647 }' +context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : i >= 0 and i >= -10 + N and i <= -1 + N }' + domain: '[N] -> { S_0[i] : i >= -10 + N and i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/min.scop b/tests/min.scop index 69ac1b5..ad820bb 100644 --- a/tests/min.scop +++ b/tests/min.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N <= 1073741823 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : i <= -1 + N and i >= 0 and i <= -11 + 2N }' + domain: '[N] -> { S_0[i] : i >= 0 and i <= -1 + N and i <= -11 + 2N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/min2.scop b/tests/min2.scop index df4efcf..693c4dc 100644 --- a/tests/min2.scop +++ b/tests/min2.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N <= 1073741823 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 10 - domain: '[N] -> { S_0[i] : i <= -1 + N and i >= 0 and i <= -11 + 2N }' + domain: '[N] -> { S_0[i] : i >= 0 and i <= -1 + N and i <= -11 + 2N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/mod.scop b/tests/mod.scop index d379fdc..e159256 100644 --- a/tests/mod.scop +++ b/tests/mod.scop @@ -4,13 +4,13 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 9 - domain: '[N] -> { S_0[i] : exists (e0 = floor((i)/2): 2e0 = i and i <= -1 + N and - i >= 0) }' + domain: '[N] -> { S_0[i] : exists (e0 = floor((i)/2): 2e0 = i and i >= 0 and i <= + -1 + N) }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/mod2.scop b/tests/mod2.scop index 656eff1..5f53756 100644 --- a/tests/mod2.scop +++ b/tests/mod2.scop @@ -4,13 +4,13 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 9 - domain: '[N] -> { S_0[i] : exists (e0 = floor((i)/2): 2e0 = i and i <= -1 + N and - i >= 0) }' + domain: '[N] -> { S_0[i] : exists (e0 = floor((i)/2): 2e0 = i and i >= 0 and i <= + -1 + N) }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/omega.scop b/tests/omega.scop index 80a8b65..74cf50b 100644 --- a/tests/omega.scop +++ b/tests/omega.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i] : 2i <= -2 + N and 3i >= N }' + domain: '[N] -> { S_0[i] : 3i >= N and 2i <= -2 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/piecewise.scop b/tests/piecewise.scop index b0a642a..6491e21 100644 --- a/tests/piecewise.scop +++ b/tests/piecewise.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + N }' + extent: '[N] -> { a[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i, j] : j >= i and i >= 0 and j <= -1 + N }' + domain: '[N] -> { S_0[i, j] : j >= i and j <= -1 + N and i >= 0 }' schedule: '[N] -> { S_0[i, j] -> [0, i, j] }' body: type: expression diff --git a/tests/piecewise2.scop b/tests/piecewise2.scop index 3a0e7cb..40a6aec 100644 --- a/tests/piecewise2.scop +++ b/tests/piecewise2.scop @@ -4,12 +4,12 @@ indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + N }' + extent: '[N] -> { a[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' element_type: int element_size: 4 statements: - line: 8 - domain: '[N] -> { S_0[i, j] : j >= i and i >= 0 and j <= -1 + N }' + domain: '[N] -> { S_0[i, j] : j >= i and j <= -1 + N and i >= 0 }' schedule: '[N] -> { S_0[i, j] -> [0, i, j] }' body: type: expression diff --git a/tests/propagate.scop b/tests/propagate.scop index be35643..637dad9 100644 --- a/tests/propagate.scop +++ b/tests/propagate.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0, i1] : i1 >= 0 and i0 >= 0 and i1 <= -1 + N }' + extent: '[N] -> { a[i0, i1] : i1 >= 0 and i1 <= -1 + N and i0 >= 0 }' element_type: int element_size: 4 - context: '{ : }' @@ -13,7 +13,7 @@ arrays: element_size: 4 statements: - line: 9 - domain: '[N] -> { S_0[i, j] : j >= i and i >= 0 and j <= -1 + N }' + domain: '[N] -> { S_0[i, j] : j >= i and j <= -1 + N and i >= 0 }' schedule: '[N] -> { S_0[i, j] -> [0, i, j, 0] }' body: type: expression @@ -55,7 +55,7 @@ statements: read: 1 write: 0 - line: 10 - domain: '[N] -> { S_1[i, j] : j >= i and i >= 0 and j <= -1 + N }' + domain: '[N] -> { S_1[i, j] : j >= i and j <= -1 + N and i >= 0 }' schedule: '[N] -> { S_1[i, j] -> [0, i, j, 1] }' body: type: expression diff --git a/tests/quasi_affine.scop b/tests/quasi_affine.scop index d52f59c..dc00e15 100644 --- a/tests/quasi_affine.scop +++ b/tests/quasi_affine.scop @@ -33,7 +33,7 @@ statements: read: 1 write: 0 - line: 16 - domain: '[N, in] -> { S_1[i] : i <= N and i >= 1 }' + domain: '[N, in] -> { S_1[i] : i >= 1 and i <= N }' schedule: '[N] -> { S_1[i] -> [0, 1, i, 0] }' body: type: expression diff --git a/tests/static.scop b/tests/static.scop index 8ac6390..7c9bd91 100644 --- a/tests/static.scop +++ b/tests/static.scop @@ -4,13 +4,13 @@ indent: "\t" context: '[n] -> { : n >= 0 and n <= 2147483647 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 <= -1 + n and i1 >= - 0 }' + extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + + n }' element_type: int element_size: 4 statements: - line: 6 - domain: '[n] -> { S_0[i, j] : i >= 0 and i <= -1 + n and j <= -1 + n and j >= 0 + domain: '[n] -> { S_0[i, j] : j >= 0 and j <= -1 + n and i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_0[i, j] -> [0, i, j] }' body: diff --git a/tests/struct2.scop b/tests/struct2.scop index 918e358..eafccdd 100644 --- a/tests/struct2.scop +++ b/tests/struct2.scop @@ -18,7 +18,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '{ S_0[i, j] : i >= 0 and i <= 9 and j <= 19 and j >= 0 }' + domain: '{ S_0[i, j] : i >= 0 and i <= 9 and j >= 0 and j <= 19 }' schedule: '{ S_0[i, j] -> [0, i, j] }' body: type: expression diff --git a/tests/struct3.scop b/tests/struct3.scop index 35fd377..3be1c4b 100644 --- a/tests/struct3.scop +++ b/tests/struct3.scop @@ -18,8 +18,8 @@ arrays: element_size: 4 statements: - line: 14 - domain: '{ S_0[i, j, k, l] : i >= 0 and i <= 9 and j <= 19 and j >= 0 and k <= 29 - and k >= 0 and l <= 39 and l >= 0 }' + domain: '{ S_0[i, j, k, l] : i >= 0 and i <= 9 and j >= 0 and j <= 19 and k >= 0 + and k <= 29 and l >= 0 and l <= 39 }' schedule: '{ S_0[i, j, k, l] -> [0, i, j, k, l] }' body: type: expression diff --git a/tests/struct4.scop b/tests/struct4.scop index 2797efd..66ee1d0 100644 --- a/tests/struct4.scop +++ b/tests/struct4.scop @@ -23,7 +23,7 @@ arrays: element_size: 4 statements: - line: 14 - domain: '{ S_0[i, j] : i >= 0 and i <= 9 and j <= 9 and j >= 0 }' + domain: '{ S_0[i, j] : i >= 0 and i <= 9 and j >= 0 and j <= 9 }' schedule: '{ S_0[i, j] -> [0, i, j] }' body: type: expression diff --git a/tests/struct5.scop b/tests/struct5.scop index 4f8a325..5f4f3f0 100644 --- a/tests/struct5.scop +++ b/tests/struct5.scop @@ -24,7 +24,7 @@ arrays: element_size: 4 statements: - line: 14 - domain: '{ S_0[i, j] : i >= 0 and i <= 9 and j <= 9 and j >= 0 }' + domain: '{ S_0[i, j] : i >= 0 and i <= 9 and j >= 0 and j <= 9 }' schedule: '{ S_0[i, j] -> [0, i, j] }' body: type: expression diff --git a/tests/struct8.scop b/tests/struct8.scop index 6fc2d4d..b097cff 100644 --- a/tests/struct8.scop +++ b/tests/struct8.scop @@ -28,7 +28,7 @@ arrays: element_size: 4 statements: - line: 17 - domain: '{ S_0[i, j] : i >= 0 and i <= 9 and j <= 9 and j >= 0 }' + domain: '{ S_0[i, j] : i >= 0 and i <= 9 and j >= 0 and j <= 9 }' schedule: '{ S_0[i, j] -> [0, i, j] }' body: type: expression diff --git a/tests/struct9.scop b/tests/struct9.scop index a0b6d38..57169f7 100644 --- a/tests/struct9.scop +++ b/tests/struct9.scop @@ -18,8 +18,8 @@ arrays: element_size: 4 statements: - line: 18 - domain: '{ S_0[i, j, k, l] : i >= 0 and i <= 9 and j <= 19 and j >= 0 and k <= 29 - and k >= 0 and l <= 39 and l >= 0 }' + domain: '{ S_0[i, j, k, l] : i >= 0 and i <= 9 and j >= 0 and j <= 19 and k >= 0 + and k <= 29 and l >= 0 and l <= 39 }' schedule: '{ S_0[i, j, k, l] -> [0, i, j, k, l, 0] }' body: type: expression @@ -33,8 +33,8 @@ statements: read: 1 write: 0 - line: 19 - domain: '{ S_1[i, j, k, l] : i >= 0 and i <= 9 and j <= 19 and j >= 0 and k <= 29 - and k >= 0 and l <= 39 and l >= 0 }' + domain: '{ S_1[i, j, k, l] : i >= 0 and i <= 9 and j >= 0 and j <= 19 and k >= 0 + and k <= 29 and l >= 0 and l <= 39 }' schedule: '{ S_1[i, j, k, l] -> [0, i, j, k, l, 1] }' body: type: expression @@ -49,8 +49,8 @@ statements: read: 0 write: 1 - line: 20 - domain: '{ S_2[i, j, k, l] : i >= 0 and i <= 9 and j <= 19 and j >= 0 and k <= 29 - and k >= 0 and l <= 39 and l >= 0 }' + domain: '{ S_2[i, j, k, l] : i >= 0 and i <= 9 and j >= 0 and j <= 19 and k >= 0 + and k <= 29 and l >= 0 and l <= 39 }' schedule: '{ S_2[i, j, k, l] -> [0, i, j, k, l, 2] }' body: type: expression diff --git a/tests/summary.scop b/tests/summary.scop index ecbcd7b..a0acc67 100644 --- a/tests/summary.scop +++ b/tests/summary.scop @@ -4,13 +4,13 @@ indent: "\t" context: '[n] -> { : n >= 0 and n <= 2147483647 }' arrays: - context: '[n] -> { : n >= 0 }' - extent: '[n] -> { A[i0, i1] : i0 >= 0 and i0 <= -1 + n and i1 <= -1 + n and i1 >= - 0 }' + extent: '[n] -> { A[i0, i1] : i1 >= 0 and i1 <= -1 + n and i0 >= 0 and i0 <= -1 + + n }' element_type: int element_size: 4 statements: - line: 24 - domain: '[n] -> { S_0[i] : i <= -1 + n and i >= 0 }' + domain: '[n] -> { S_0[i] : i >= 0 and i <= -1 + n }' schedule: '[n] -> { S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/tobi1.scop b/tests/tobi1.scop index 0edb3a1..4a22a59 100644 --- a/tests/tobi1.scop +++ b/tests/tobi1.scop @@ -9,8 +9,8 @@ arrays: element_size: 4 statements: - line: 8 - domain: '{ S_0[i] : exists (e0 = floor((i)/65): 65e0 = i and i >= 0 and i <= 1039) - }' + domain: '{ S_0[i] : exists (e0 = floor((i)/65): 65e0 = i and i <= 1039 and i >= + 0) }' schedule: '{ S_0[i] -> [0, i] }' body: type: expression diff --git a/tests/tobi2.scop b/tests/tobi2.scop index 542f183..1a92559 100644 --- a/tests/tobi2.scop +++ b/tests/tobi2.scop @@ -9,8 +9,8 @@ arrays: element_size: 4 statements: - line: 10 - domain: '[N] -> { S_0[i] : exists (e0 = floor((10 + N)/4294967296): i <= 19 and - 4294967296e0 <= 9 + N - i and i >= 0 and 4294967296e0 <= 10 + N and 4294967296e0 + 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 >= -4294967285 + N) }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: diff --git a/tests/unsigned2.scop b/tests/unsigned2.scop index a3484d8..ecbfb94 100644 --- a/tests/unsigned2.scop +++ b/tests/unsigned2.scop @@ -9,7 +9,7 @@ arrays: element_size: 4 statements: - line: 8 - domain: '{ S_0[k] : k >= 252 and k <= 261 }' + domain: '{ S_0[k] : k <= 261 and k >= 252 }' schedule: '{ S_0[k] -> [0, k] }' body: type: expression diff --git a/tests/unsigned_break1.scop b/tests/unsigned_break1.scop index 14d98c6..6f1242a 100644 --- a/tests/unsigned_break1.scop +++ b/tests/unsigned_break1.scop @@ -9,7 +9,7 @@ arrays: element_size: 4 statements: - line: 8 - domain: '{ S_0[k] : k >= 252 and k <= 257 }' + domain: '{ S_0[k] : k <= 257 and k >= 252 }' schedule: '{ S_0[k] -> [0, k, 0] }' body: type: expression @@ -25,7 +25,7 @@ statements: - type: int value: 5 - line: 11 - domain: '{ S_1[k] : exists (e0 = floor((-1 + k)/256): k >= 252 and k <= 257 and + domain: '{ S_1[k] : exists (e0 = floor((-1 + k)/256): k <= 257 and k >= 252 and 256e0 >= -256 + k and 256e0 <= -2 + k) }' schedule: '{ S_1[k] -> [0, k, 2] }' body: diff --git a/tests/unsigned_break2.scop b/tests/unsigned_break2.scop index 6b95e36..2a36273 100644 --- a/tests/unsigned_break2.scop +++ b/tests/unsigned_break2.scop @@ -4,7 +4,7 @@ indent: "\t" context: '{ : }' arrays: - context: '{ : }' - extent: '{ __pet_test_0[k] : k >= 252 and k <= 261 }' + extent: '{ __pet_test_0[k] : k <= 261 and k >= 252 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -15,9 +15,9 @@ arrays: element_size: 4 statements: - line: 11 - domain: '{ [S_0[k] -> [0]] : (exists (e0 = floor((k)/256): 256e0 = k and k <= 261 - and k >= 252)) or (exists (e0 = floor((k)/256): k <= 261 and k >= 252 and 256e0 - >= -255 + k and 256e0 <= -2 + k)) }' + domain: '{ [S_0[k] -> [0]] : (exists (e0 = floor((k)/256): k <= 261 and k >= 252 + and 256e0 >= -255 + k and 256e0 <= -2 + k)) or (exists (e0 = floor((k)/256): 256e0 + = k and k <= 261 and k >= 252)) }' schedule: '{ S_0[k] -> [0, k, 0] }' body: type: expression @@ -39,7 +39,7 @@ statements: read: 1 write: 0 - line: 12 - domain: '{ [S_1[k] -> [0]] : k >= 252 and k <= 261 }' + domain: '{ [S_1[k] -> [0]] : k <= 261 and k >= 252 }' schedule: '{ S_1[k] -> [0, k, 1, 0] }' body: type: expression @@ -61,7 +61,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '{ [S_2[k] -> [0]] : k >= 252 and k <= 261 }' + domain: '{ [S_2[k] -> [0]] : k <= 261 and k >= 252 }' schedule: '{ S_2[k] -> [0, k, 2] }' body: type: expression @@ -87,5 +87,5 @@ statements: write: 0 implications: - satisfied: 0 - extension: '{ __pet_test_0[k] -> __pet_test_0[k''] : k'' <= k and k'' >= 252 and - k'' <= 261 }' + extension: '{ __pet_test_0[k] -> __pet_test_0[k''] : k'' <= k and k'' <= 261 and + k'' >= 252 }' diff --git a/tests/wdp.scop b/tests/wdp.scop index eef9fc7..9b3dc30 100644 --- a/tests/wdp.scop +++ b/tests/wdp.scop @@ -4,30 +4,30 @@ indent: "\t" context: '[N] -> { : N >= 8 and N <= 16 }' arrays: - context: '{ : }' - extent: '[N] -> { __pet_test_0[i] : i <= -1 + N and i >= 0 }' + extent: '[N] -> { __pet_test_0[i] : i >= 0 and i <= -1 + N }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 uniquely_defined: 1 -- context: '[N] -> { : N >= -1 and N <= 2147483646 }' +- context: '[N] -> { : N <= 2147483646 and N >= -1 }' extent: '[N] -> { t[i0] : i0 <= N and i0 >= 0 }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { x[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { x[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 -- context: '[N] -> { : N >= -1 and N <= 2147483646 }' +- context: '[N] -> { : N <= 2147483646 and N >= -1 }' extent: '[N] -> { y[i0] : i0 <= N and i0 >= 0 }' element_type: int element_size: 4 -- context: '[N] -> { : N >= -2 and N <= 2147483645 }' +- context: '[N] -> { : N <= 2147483645 and N >= -2 }' extent: '[N] -> { z[i0] : i0 <= 1 + N and i0 >= 0 }' element_type: int element_size: 4 statements: - line: 19 - domain: '[N] -> { S_0[i] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { S_0[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_0[i] -> [0, i] }' body: type: expression @@ -84,7 +84,7 @@ statements: - type: call name: _Source_z - line: 29 - domain: '[N] -> { [S_3[i] -> [0]] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { [S_3[i] -> [0]] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_3[i] -> [3, i, 0] }' body: type: expression @@ -112,7 +112,7 @@ statements: read: 1 write: 0 - line: 30 - domain: '[N] -> { S_4[i] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { S_4[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_4[i] -> [3, i, 1, 0] }' body: type: expression @@ -144,7 +144,7 @@ statements: - type: int value: 100 - line: 31 - domain: '[N] -> { [S_5[i] -> [1]] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { [S_5[i] -> [1]] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_5[i] -> [3, i, 1, 1, 0] }' body: type: expression @@ -172,7 +172,7 @@ statements: read: 1 write: 0 - line: 32 - domain: '[N] -> { [S_6[i] -> [1]] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { [S_6[i] -> [1]] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_6[i] -> [3, i, 1, 1, 1] }' body: type: expression @@ -200,7 +200,7 @@ statements: read: 1 write: 0 - line: 34 - domain: '[N] -> { S_7[i] : i <= -1 + N and i >= 0 }' + domain: '[N] -> { S_7[i] : i >= 0 and i <= -1 + N }' schedule: '[N] -> { S_7[i] -> [3, i, 2] }' body: type: expression diff --git a/tests/while.scop b/tests/while.scop index d0f9bf1..f1a8c17 100644 --- a/tests/while.scop +++ b/tests/while.scop @@ -4,7 +4,7 @@ indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' - extent: '[n] -> { __pet_test_0[x, t] : x <= -1 + n and x >= 0 and t >= 0 }' + extent: '[n] -> { __pet_test_0[x, t] : x <= -1 + n and t >= 0 and x >= 0 }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -15,7 +15,7 @@ arrays: element_size: 4 statements: - line: 12 - domain: '[n] -> { S1[x] : x <= -1 + n and x >= 0 }' + domain: '[n] -> { S1[x] : x >= 0 and x <= -1 + n }' schedule: '[n] -> { S1[x] -> [0, x, 0] }' body: type: expression @@ -31,7 +31,7 @@ statements: - type: call name: f - line: 13 - domain: '[n] -> { [S_1[x, t] -> [1]] : x <= -1 + n and x >= 0 and t >= 0 }' + domain: '[n] -> { [S_1[x, t] -> [1]] : x <= -1 + n and t >= 0 and x >= 0 }' schedule: '[n] -> { S_1[x, t] -> [0, x, 1, t, 0] }' body: type: expression @@ -64,7 +64,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[n] -> { [S2[x, t] -> [1]] : x <= -1 + n and x >= 0 and t >= 0 }' + domain: '[n] -> { [S2[x, t] -> [1]] : x <= -1 + n and t >= 0 and x >= 0 }' schedule: '[n] -> { S2[x, t] -> [0, x, 1, t, 1, 0] }' body: type: expression @@ -92,7 +92,7 @@ statements: read: 1 write: 0 - line: 16 - domain: '[n] -> { R[x] : x <= -1 + n and x >= 0 }' + domain: '[n] -> { R[x] : x >= 0 and x <= -1 + n }' schedule: '[n] -> { R[x] -> [0, x, 2] }' body: type: expression diff --git a/tests/while_affine.scop b/tests/while_affine.scop index 8ebce9a..890f171 100644 --- a/tests/while_affine.scop +++ b/tests/while_affine.scop @@ -4,16 +4,16 @@ indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { a[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { a[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 - context: '[N] -> { : N >= 0 }' - extent: '[N] -> { b[i0] : i0 <= -1 + N and i0 >= 0 }' + extent: '[N] -> { b[i0] : i0 >= 0 and i0 <= -1 + N }' element_type: int element_size: 4 statements: - line: 9 - domain: '[N] -> { S_0[99, t, j] : j >= 0 and t >= 0 and j <= -1 + N }' + domain: '[N] -> { S_0[99, t, j] : j >= 0 and j <= -1 + N and t >= 0 }' schedule: '[N] -> { S_0[i, t, j] -> [0, i, t, 0, j] }' body: type: expression @@ -29,7 +29,7 @@ statements: - type: int value: 0 - line: 11 - domain: '[N] -> { S_1[99, t, j] : j >= 0 and t >= 0 and j <= -1 + N }' + domain: '[N] -> { S_1[99, t, j] : j >= 0 and j <= -1 + N and t >= 0 }' schedule: '[N] -> { S_1[i, t, j] -> [0, i, t, 1, j] }' body: type: expression diff --git a/tests/while_break.scop b/tests/while_break.scop index bdf4ea5..704c1e9 100644 --- a/tests/while_break.scop +++ b/tests/while_break.scop @@ -134,7 +134,7 @@ statements: - line: 21 domain: '[N] -> { [S_5[t] -> [1]] : N = 0 and t >= 0; [S_5[0] -> [1]] : N <= -1 or N >= 1 }' - schedule: '{ S_5[t] -> [2, t, 0] }' + schedule: '[N] -> { S_5[t] -> [2, t, 0] }' body: type: expression expr: @@ -150,15 +150,15 @@ statements: name: f arguments: - type: access - index: '[N] -> { S_5[t] -> __pet_test_1[((-1 + t) : (N = 0 and t >= 1) or (t = - 1 and N >= 1) or (t = 1 and N <= -1))] }' + index: '[N] -> { S_5[t] -> __pet_test_1[((-1 + t) : (t = 1 and N <= -1) or (t + = 1 and N >= 1) or (N = 0 and t >= 1))] }' reference: __pet_ref_8 read: 1 write: 0 - line: 22 domain: '[N] -> { [S_6[t] -> [1]] : N = 0 and t >= 0; [S_6[0] -> [1]] : N <= -1 or N >= 1 }' - schedule: '{ S_6[t] -> [2, t, 1, 0] }' + schedule: '[N] -> { S_6[t] -> [2, t, 1, 0] }' body: type: expression expr: diff --git a/tests/while_break2.scop b/tests/while_break2.scop index 3c4a13c..88402af 100644 --- a/tests/while_break2.scop +++ b/tests/while_break2.scop @@ -4,8 +4,8 @@ indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= -2147483648 }' arrays: - context: '{ : }' - extent: '[N] -> { __pet_test_0[i, t] : N = 0 and i <= 9 and i >= 1 and t >= 0; __pet_test_0[0, - t] : t >= 0 }' + extent: '[N] -> { __pet_test_0[i, t] : N = 0 and i <= 9 and i >= 0 and t >= 0; __pet_test_0[0, + t] : (N <= -1 and t >= 0) or (N >= 1 and t >= 0) }' value_bounds: '{ [i0] : i0 >= 0 and i0 <= 1 }' element_type: int element_size: 4 @@ -16,9 +16,9 @@ arrays: element_size: 4 statements: - line: 10 - domain: '[N] -> { [S_0[i, t] -> [1]] : N = 0 and i <= 9 and i >= 1 and t >= 0; [S_0[0, - t] -> [1]] : t >= 0 }' - schedule: '{ S_0[i, t] -> [0, i, 0, t, 0] }' + domain: '[N] -> { [S_0[i, t] -> [1]] : N = 0 and i <= 9 and i >= 0 and t >= 0; [S_0[0, + t] -> [1]] : (N <= -1 and t >= 0) or (N >= 1 and t >= 0) }' + schedule: '[N] -> { S_0[i, t] -> [0, i, 0, t, 0] }' body: type: expression expr: @@ -39,9 +39,9 @@ statements: read: 1 write: 0 - line: 11 - domain: '[N] -> { [S_1[i, t] -> [1]] : N = 0 and i <= 9 and i >= 1 and t >= 0; [S_1[0, - t] -> [1]] : t >= 0 }' - schedule: '{ S_1[i, t] -> [0, i, 0, t, 1] }' + domain: '[N] -> { [S_1[i, t] -> [1]] : N = 0 and i <= 9 and i >= 0 and t >= 0; [S_1[0, + t] -> [1]] : (N <= -1 and t >= 0) or (N >= 1 and t >= 0) }' + schedule: '[N] -> { S_1[i, t] -> [0, i, 0, t, 1] }' body: type: expression expr: @@ -62,7 +62,7 @@ statements: read: 1 write: 0 - line: 14 - domain: '[N] -> { S_2[i] : N = 0 and i <= 9 and i >= 1; S_2[0] : N = 0 }' + domain: '[N] -> { S_2[i] : N = 0 and i <= 9 and i >= 0 }' schedule: '[N] -> { S_2[i] -> [0, i, 2] }' body: type: expression @@ -80,5 +80,6 @@ statements: implications: - satisfied: 1 extension: '[N] -> { __pet_test_0[i, t] -> __pet_test_0[i, t''] : N = 0 and t'' - <= t and i >= 1 and i <= 9 and t'' >= 0; __pet_test_0[0, t] -> __pet_test_0[0, - t''] : t'' <= t and t'' >= 0 }' + <= t and i >= 0 and i <= 9 and t'' >= 0; __pet_test_0[0, t] -> __pet_test_0[0, + t''] : (N >= 1 and t'' >= 0 and t'' <= t) or (N <= -1 and t'' >= 0 and t'' <= + t) }' diff --git a/tests/while_overflow.scop b/tests/while_overflow.scop index 56e5391..be95283 100644 --- a/tests/while_overflow.scop +++ b/tests/while_overflow.scop @@ -53,8 +53,8 @@ statements: read: 1 write: 0 - line: 14 - domain: '[N] -> { [S_2[t, i] -> [1]] : t >= 0 and i >= 0 and N <= 1073741823 and - i <= -1 + 2N }' + domain: '[N] -> { [S_2[t, i] -> [1]] : i >= 0 and i <= -1 + 2N and N <= 1073741823 + and t >= 0 }' schedule: '[N] -> { S_2[t, i] -> [1, t, 1, 0, i] }' body: type: expression -- 2.11.4.GIT