[polly] r210179 - Adjust multidim test cases to not access out-of-bound memory
Tobias Grosser
tobias at grosser.es
Wed Jun 4 04:47:55 PDT 2014
Author: grosser
Date: Wed Jun 4 06:47:54 2014
New Revision: 210179
URL: http://llvm.org/viewvc/llvm-project?rev=210179&view=rev
Log:
Adjust multidim test cases to not access out-of-bound memory
We do this currently only for test cases where we have integer offsets that
clearly access array dimensions out-of-bound.
-; for (long i = 0; i < n; i++)
-; for (long j = 0; j < m; j++)
-; for (long k = 0; k < o; k++)
+; for (long i = 0; i < n - 3; i++)
+; for (long j = 4; j < m; j++)
+; for (long k = 0; k < o - 7; k++)
; A[i+3][j-4][k+7] = 1.0;
This will be helpful if we later want to simplify the access functions under the
assumption that they do not access memory out of bounds.
Modified:
polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll
polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll
polly/trunk/test/ScopInfo/multidim_nested_start_share_parameter.ll
Modified: polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll?rev=210179&r1=210178&r2=210179&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll Wed Jun 4 06:47:54 2014
@@ -1,12 +1,12 @@
-; RUN: opt %loadPolly -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-scops -analyze -polly-delinearize -polly-codegen-scev < %s | FileCheck %s
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
; void foo(long n, long m, long o, double A[n][m][o]) {
;
-; for (long i = 0; i < n; i++)
-; for (long j = 0; j < m; j++)
-; for (long k = 0; k < o; k++)
+; for (long i = 0; i < n-3; i++)
+; for (long j = 4; j < m; j++)
+; for (long k = 0; k < o-7; k++)
; A[i+3][j-4][k+7] = 1.0;
; }
@@ -16,11 +16,11 @@ target triple = "x86_64-unknown-linux-gn
; CHECK-NOT: p3
; CHECK: Domain
-; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + m and i2 >= 0 and i2 <= -1 + o };
+; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= -4 + n and i1 >= 0 and i1 <= -5 + m and i2 >= 0 and i2 <= -8 + o };
; CHECK: Scattering
; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] };
; CHECK: MustWriteAccess
-; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, -4 + i1, 7 + i2] };
+; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, i1, 7 + i2] };
define void @foo(i64 %n, i64 %m, i64 %o, double* %A) {
entry:
@@ -31,7 +31,7 @@ for.i:
br label %for.j
for.j:
- %j = phi i64 [ 0, %for.i ], [ %j.inc, %for.j.inc ]
+ %j = phi i64 [ 4, %for.i ], [ %j.inc, %for.j.inc ]
br label %for.k
for.k:
@@ -49,7 +49,8 @@ for.k:
for.k.inc:
%k.inc = add nsw i64 %k, 1
- %k.exitcond = icmp eq i64 %k.inc, %o
+ %osub = sub nsw i64 %o, 7
+ %k.exitcond = icmp eq i64 %k.inc, %osub
br i1 %k.exitcond, label %for.j.inc, label %for.k
for.j.inc:
@@ -59,7 +60,8 @@ for.j.inc:
for.i.inc:
%i.inc = add nsw i64 %i, 1
- %i.exitcond = icmp eq i64 %i.inc, %n
+ %nsub = sub nsw i64 %n, 3
+ %i.exitcond = icmp eq i64 %i.inc, %nsub
br i1 %i.exitcond, label %end, label %for.i
end:
Modified: polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll?rev=210179&r1=210178&r2=210179&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_nested_start_integer.ll Wed Jun 4 06:47:54 2014
@@ -1,30 +1,24 @@
-; RUN: opt %loadPolly -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-scops -analyze -polly-delinearize -polly-codegen-scev < %s | FileCheck %s
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
; void foo(long n, long m, long o, double A[n][m][o]) {
-; for (long i = 0; i < n; i++)
-; for (long j = 0; j < m; j++)
-; for (long k = 0; k < o; k++)
+; for (long i = 0; i < n - 3; i++)
+; for (long j = 4; j < m; j++)
+; for (long k = 0; k < o - 7; k++)
; A[i+3][j-4][k+7] = 1.0;
; }
;
-; Access function:
-;
-; {{{(56 + (8 * (-4 + (3 * %m)) * %o) + %A),+,(8 * %m * %o)}<%for.i>,+,
-; (8 * %o)}<%for.j>,+,8}<%for.k>
-;
; CHECK: p0: %n
; CHECK: p1: %m
; CHECK: p2: %o
; CHECK-NOT: p3
; CHECK: Domain
-; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= -1 + n and i1 >= 0 and i1 <= -1 + m and i2 >= 0 and i2 <= -1 + o };
+; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] : i0 >= 0 and i0 <= -4 + n and i1 >= 0 and i1 <= -5 + m and i2 >= 0 and i2 <= -8 + o };
; CHECK: Scattering
; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> scattering[0, i0, 0, i1, 0, i2, 0] };
; CHECK: MustWriteAccess
-; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, -4 + i1, 7 + i2] };
-
+; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, i1, 7 + i2] };
define void @foo(i64 %n, i64 %m, i64 %o, double* %A) {
entry:
@@ -35,7 +29,7 @@ for.i:
br label %for.j
for.j:
- %j = phi i64 [ 0, %for.i ], [ %j.inc, %for.j.inc ]
+ %j = phi i64 [ 4, %for.i ], [ %j.inc, %for.j.inc ]
br label %for.k
for.k:
@@ -53,7 +47,8 @@ for.k:
for.k.inc:
%k.inc = add nsw i64 %k, 1
- %k.exitcond = icmp eq i64 %k.inc, %o
+ %osub = sub nsw i64 %o, 7
+ %k.exitcond = icmp eq i64 %k.inc, %osub
br i1 %k.exitcond, label %for.j.inc, label %for.k
for.j.inc:
@@ -63,7 +58,8 @@ for.j.inc:
for.i.inc:
%i.inc = add nsw i64 %i, 1
- %i.exitcond = icmp eq i64 %i.inc, %n
+ %nsub = sub nsw i64 %n, 3
+ %i.exitcond = icmp eq i64 %i.inc, %nsub
br i1 %i.exitcond, label %end, label %for.i
end:
Modified: polly/trunk/test/ScopInfo/multidim_nested_start_share_parameter.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_nested_start_share_parameter.ll?rev=210179&r1=210178&r2=210179&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_nested_start_share_parameter.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_nested_start_share_parameter.ll Wed Jun 4 06:47:54 2014
@@ -1,32 +1,24 @@
-; RUN: opt %loadPolly -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-scops -analyze -polly-delinearize -polly-codegen-scev < %s | FileCheck %s
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
; void foo(long n, long m, long o, double A[n][m][o]) {
;
-; for (long i = 0; i < n; i++)
-; for (long j = 0; j < m; j++)
-; for (long k = 0; k < o; k++) {
+; for (long i = 0; i < n-13; i++)
+; for (long j = 14; j < m; j++)
+; for (long k = 0; k < o-17; k++) {
; A[i+3][j-4][k+7] = 1.0;
; A[i+13][j-14][k+17] = 11.0;
; }
; }
;
-; Access function:
-;
-; {{{(56 + (8 * (-4 + (3 * %m)) * %o) + %A),+,(8 * %m * %o)}<%for.i>,+,
-; (8 * %o)}<%for.j>,+,8}<%for.k>
-; {{{(136 + (8 * (-14 + (13 * %m)) * %o) + %A),+,(8 * %m * %o)}<%for.i>,+,
-; (8 * %o)}<%for.j>,+,8}<%for.k>
-;
; CHECK: p0: %n
; CHECK: p1: %m
; CHECK: p2: %o
; CHECK-NOT: p3
;
-; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, -4 + i1, 7 + i2] };
-; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[13 + i0, -14 + i1, 17 + i2] };
-
+; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[3 + i0, 10 + i1, 7 + i2] };
+; CHECK: [n, m, o] -> { Stmt_for_k[i0, i1, i2] -> MemRef_A[13 + i0, i1, 17 + i2] };
define void @foo(i64 %n, i64 %m, i64 %o, double* %A) {
entry:
@@ -37,7 +29,7 @@ for.i:
br label %for.j
for.j:
- %j = phi i64 [ 0, %for.i ], [ %j.inc, %for.j.inc ]
+ %j = phi i64 [ 14, %for.i ], [ %j.inc, %for.j.inc ]
br label %for.k
for.k:
@@ -67,7 +59,8 @@ for.k:
for.k.inc:
%k.inc = add nsw i64 %k, 1
- %k.exitcond = icmp eq i64 %k.inc, %o
+ %osub = sub nsw i64 %o, 17
+ %k.exitcond = icmp eq i64 %k.inc, %osub
br i1 %k.exitcond, label %for.j.inc, label %for.k
for.j.inc:
@@ -77,7 +70,8 @@ for.j.inc:
for.i.inc:
%i.inc = add nsw i64 %i, 1
- %i.exitcond = icmp eq i64 %i.inc, %n
+ %nsub = sub nsw i64 %n, 13
+ %i.exitcond = icmp eq i64 %i.inc, %nsub
br i1 %i.exitcond, label %end, label %for.i
end:
More information about the llvm-commits
mailing list