diff options
author | Tobias Grosser <tobias@grosser.es> | 2015-03-30 20:22:28 +0300 |
---|---|---|
committer | Tobias Grosser <tobias@grosser.es> | 2015-03-30 20:22:28 +0300 |
commit | 619190d5a7b7238775d35dabf7b4d16d742ad310 (patch) | |
tree | bd9dc6835cf42cf2748d2ebd577f6be5cf6e03e7 /polly/test | |
parent | f9b4775c78b806647b4db18b36719463dee3bafc (diff) |
Delinearization of expressions that contain array size parameters
This allows us to delinerize code such as:
A[][n]
for (i
for (j
A[i][n-j-1] = ...
which would previously have been delinearize to an access A[i+1][-j-1].
To recover the correct access we apply the piecewise expression:
{ A[i][j] -> A[i-1][i+N]: i < 0; A[i][j] -> A[i][i]: i >= 0}
This approach generalizes to higher dimensions.
llvm-svn: 233566
Diffstat (limited to 'polly/test')
6 files changed, 169 insertions, 14 deletions
diff --git a/polly/test/Isl/Ast/simple-run-time-condition.ll b/polly/test/Isl/Ast/simple-run-time-condition.ll index 7138f58d9ced..7dc07f9610f7 100644 --- a/polly/test/Isl/Ast/simple-run-time-condition.ll +++ b/polly/test/Isl/Ast/simple-run-time-condition.ll @@ -19,9 +19,9 @@ target triple = "x86_64-unknown-linux-gnu" ; cause any code to be executed are not generated. ; CHECK: if ( -; CHECK: ({{(q == 100 && o <= 0|o <= 0 && q == 100)}}) +; CHECK: (o >= 1 && q <= 0 && m + q >= 0) ; CHECK: || -; CHECK: ({{(q == 0 && o >= 1)|(o >= 1 && q == 0)}}) +; CHECK; (o <= 0 && m + q >= 100 && q <= 100) ; CHECK: ) ; CHECK: if (o >= 1) { diff --git a/polly/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll b/polly/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll index 0a02c71fc722..d692136a371d 100644 --- a/polly/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll +++ b/polly/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll @@ -11,17 +11,17 @@ target triple = "x86_64-unknown-linux-gnu" ; } ; CHECK: Assumed Context: -; CHECK: [m, o] -> { : m >= 150 and o >= 200 } -; CHECK: p0: %m -; CHECK: p1: %o +; CHECK: [o, m] -> { : m >= 150 and o >= 200 } +; CHECK: p0: %o +; CHECK: p1: %m ; CHECK: Statements { ; CHECK: Stmt_for_k ; CHECK: Domain := -; CHECK: [m, o] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= 99 and i1 >= 0 and i1 <= 149 and i2 >= 0 and i2 <= 199 }; +; CHECK: [o, m] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= 99 and i1 >= 0 and i1 <= 149 and i2 >= 0 and i2 <= 199 }; ; CHECK: Scattering := -; CHECK: [m, o] -> { Stmt_for_k[i0, i1, i2] -> [i0, i1, i2] }; +; CHECK: [o, m] -> { Stmt_for_k[i0, i1, i2] -> [i0, i1, i2] }; ; CHECK: MustWriteAccess := [Reduction Type: NONE] -; CHECK: [m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[i0, i1, i2] }; +; CHECK: [o, m] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[i0, i1, i2] }; define void @foo(i64 %n, i64 %m, i64 %o, double* %A) { entry: diff --git a/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll b/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll index 60284c3e7935..200904c0c822 100644 --- a/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll +++ b/polly/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll @@ -15,7 +15,7 @@ target triple = "x86_64-unknown-linux-gnu" ; (8 * %o)}<%for.j>,+,8}<%for.k> ; CHECK: Assumed Context: -; CHECK: [n, m, o, p, q, r] -> { : q = 0 and r = 0 } +; CHECK: [n, m, o, p, q, r] -> { : (q <= 0 and q >= 1 - m and r <= -1 and r >= 1 - o) or (r = 0 and q <= 0 and q >= -m) or (r = -o and q <= 1 and q >= 1 - m) } ; ; CHECK: p0: %n ; CHECK: p1: %m @@ -30,7 +30,8 @@ target triple = "x86_64-unknown-linux-gnu" ; CHECK: Scattering ; CHECK: [n, m, o, p, q, r] -> { Stmt_for_k[i0, i1, i2] -> [i0, i1, i2] }; ; CHECK: MustWriteAccess -; CHECK: [n, m, o, p, q, r] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[p + i0, q + i1, r + i2] }; +; CHECK: [n, m, o, p, q, r] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[-1 + p + i0, -1 + m + q + i1, o + r + i2] : i1 <= -q and i2 <= -1 - r; Stmt_for_k[i0, i1, i2] -> MemRef_A[p + i0, -1 + q + i1, o + r + i2] : i1 >= 1 - q and i2 <= -1 - r; Stmt_for_k[i0, i1, i2] -> MemRef_A[-1 + p + i0, m + q + i1, r + i2] : i1 <= -1 - q and i2 >= -r; Stmt_for_k[i0, i1, i2] -> MemRef_A[p + i0, q + i1, r + i2] : i1 >= -q and i2 >= -r }; + define void @foo(i64 %n, i64 %m, i64 %o, double* %A, i64 %p, i64 %q, i64 %r) { entry: diff --git a/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll b/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll index 886b091f1e76..a726d703b3da 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll @@ -14,14 +14,14 @@ ; CHECK: Assumed Context: ; CHECK: [n, m, o, p_3, p_4] -> { : -; CHECK-DAG: p_4 >= o -; CHECK-DAG: p_3 >= m +; CHECK-DAG: p_3 >= o +; CHECK-DAG: p_4 >= m ; CHECK: } ; CHECK: p0: %n ; CHECK: p1: %m ; CHECK: p2: %o -; CHECK: p3: (zext i32 %m to i64) -; CHECK: p4: (zext i32 %o to i64) +; CHECK: p3: (zext i32 %o to i64) +; CHECK: p4: (zext i32 %m to i64) ; CHECK-NOT: p5 ; CHECK: Domain diff --git a/polly/test/ScopInfo/multidim_param_in_subscript-2.ll b/polly/test/ScopInfo/multidim_param_in_subscript-2.ll new file mode 100644 index 000000000000..303d9130ac7a --- /dev/null +++ b/polly/test/ScopInfo/multidim_param_in_subscript-2.ll @@ -0,0 +1,88 @@ +; RUN: opt %loadPolly -polly-scops -analyze < %s | FileCheck %s +; +; void foo(long n, long m, float A[][n][m]) { +; for (long i = 0; i < 100; i++) +; for (long j = 0; j < n; j++) +; for (long k = 0; k < m; k++) +; A[i][j][k] += A[i][n - j - 1][m - k - 1]; +; } +; +; Verify that the parameter in the subscript expression is correctly +; recovered. +; +; CHECK: Assumed Context: +; CHECK-NEXT: [n, m] -> { : } +; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: [n, m] -> { Stmt_for_body6[i0, i1, i2] -> MemRef_A[i0, -1 + n - i1, -1 + m - i2] }; +; +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" + +define void @foo(i64 %n, i64 %m, float* %A) { +entry: + br label %for.cond + +for.cond: ; preds = %for.inc18, %entry + %i.0 = phi i64 [ 0, %entry ], [ %inc19, %for.inc18 ] + %exitcond = icmp ne i64 %i.0, 100 + br i1 %exitcond, label %for.body, label %for.end20 + +for.body: ; preds = %for.cond + br label %for.cond1 + +for.cond1: ; preds = %for.inc15, %for.body + %j.0 = phi i64 [ 0, %for.body ], [ %inc16, %for.inc15 ] + %cmp2 = icmp slt i64 %j.0, %n + br i1 %cmp2, label %for.body3, label %for.end17 + +for.body3: ; preds = %for.cond1 + br label %for.cond4 + +for.cond4: ; preds = %for.inc, %for.body3 + %k.0 = phi i64 [ 0, %for.body3 ], [ %inc, %for.inc ] + %cmp5 = icmp slt i64 %k.0, %m + br i1 %cmp5, label %for.body6, label %for.end + +for.body6: ; preds = %for.cond4 + %sub = sub nsw i64 %m, %k.0 + %sub7 = add nsw i64 %sub, -1 + %sub8 = sub nsw i64 %n, %j.0 + %sub9 = add nsw i64 %sub8, -1 + %tmp = mul nuw i64 %n, %m + %tmp1 = mul nsw i64 %i.0, %tmp + %tmp2 = mul nsw i64 %sub9, %m + %arrayidx.sum = add i64 %tmp1, %tmp2 + %arrayidx10.sum = add i64 %arrayidx.sum, %sub7 + %arrayidx11 = getelementptr inbounds float, float* %A, i64 %arrayidx10.sum + %tmp3 = load float, float* %arrayidx11, align 4 + %tmp4 = mul nuw i64 %n, %m + %tmp5 = mul nsw i64 %i.0, %tmp4 + %tmp6 = mul nsw i64 %j.0, %m + %arrayidx12.sum = add i64 %tmp5, %tmp6 + %arrayidx13.sum = add i64 %arrayidx12.sum, %k.0 + %arrayidx14 = getelementptr inbounds float, float* %A, i64 %arrayidx13.sum + %tmp7 = load float, float* %arrayidx14, align 4 + %add = fadd float %tmp7, %tmp3 + store float %add, float* %arrayidx14, align 4 + br label %for.inc + +for.inc: ; preds = %for.body6 + %inc = add nuw nsw i64 %k.0, 1 + br label %for.cond4 + +for.end: ; preds = %for.cond4 + br label %for.inc15 + +for.inc15: ; preds = %for.end + %inc16 = add nuw nsw i64 %j.0, 1 + br label %for.cond1 + +for.end17: ; preds = %for.cond1 + br label %for.inc18 + +for.inc18: ; preds = %for.end17 + %inc19 = add nuw nsw i64 %i.0, 1 + br label %for.cond + +for.end20: ; preds = %for.cond + ret void +} diff --git a/polly/test/ScopInfo/multidim_param_in_subscript.ll b/polly/test/ScopInfo/multidim_param_in_subscript.ll new file mode 100644 index 000000000000..dfa925011abd --- /dev/null +++ b/polly/test/ScopInfo/multidim_param_in_subscript.ll @@ -0,0 +1,66 @@ +; RUN: opt %loadPolly -polly-scops -analyze < %s | FileCheck %s +; +; +; void foo(long n, float A[][n]) { +; for (long i = 0; i < 100; i++) +; for (long j = 0; j < n; j++) +; A[i][j] += A[i][n - j - 1]; +; } +; +; Verify that the parameter in the subscript expression is correctly +; recovered. +; +; CHECK: Assumed Context: +; CHECK-NEXT: [n] -> { : } +; +; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: [n] -> { Stmt_for_body3[i0, i1] -> MemRef_A[i0, -1 + n - i1] }; +; +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" + +define void @foo(i64 %n, float* %A) { +entry: + br label %for.cond + +for.cond: ; preds = %for.inc8, %entry + %i.0 = phi i64 [ 0, %entry ], [ %inc9, %for.inc8 ] + %exitcond = icmp ne i64 %i.0, 100 + br i1 %exitcond, label %for.body, label %for.end10 + +for.body: ; preds = %for.cond + br label %for.cond1 + +for.cond1: ; preds = %for.inc, %for.body + %j.0 = phi i64 [ 0, %for.body ], [ %inc, %for.inc ] + %cmp2 = icmp slt i64 %j.0, %n + br i1 %cmp2, label %for.body3, label %for.end + +for.body3: ; preds = %for.cond1 + %sub = sub nsw i64 %n, %j.0 + %sub4 = add nsw i64 %sub, -1 + %tmp = mul nsw i64 %i.0, %n + %arrayidx.sum = add i64 %tmp, %sub4 + %arrayidx5 = getelementptr inbounds float, float* %A, i64 %arrayidx.sum + %tmp1 = load float, float* %arrayidx5, align 4 + %tmp2 = mul nsw i64 %i.0, %n + %arrayidx6.sum = add i64 %tmp2, %j.0 + %arrayidx7 = getelementptr inbounds float, float* %A, i64 %arrayidx6.sum + %tmp3 = load float, float* %arrayidx7, align 4 + %add = fadd float %tmp3, %tmp1 + store float %add, float* %arrayidx7, align 4 + br label %for.inc + +for.inc: ; preds = %for.body3 + %inc = add nuw nsw i64 %j.0, 1 + br label %for.cond1 + +for.end: ; preds = %for.cond1 + br label %for.inc8 + +for.inc8: ; preds = %for.end + %inc9 = add nuw nsw i64 %i.0, 1 + br label %for.cond + +for.end10: ; preds = %for.cond + ret void +} |