This patch removes the heuristic in
- Polly :: lib/Support/ScopHelper.cpp
The heuristic forces blocks that directly follow a loop header to not to be considered error blocks.
It was introduced in r249611 with the following commit message:
> This replaces the support for user defined error functions by a
> heuristic that tries to determine if a call to a non-pure function
> should be considered "an error". If so the block is assumed not to be
> executed at runtime. While treating all non-pure function calls as
> errors will allow a lot more regions to be analyzed, it will also
> cause us to dismiss a lot again due to an infeasible runtime context.
> This patch tries to limit that effect. A non-pure function call is
> considered an error if it is executed only in conditionally with
> regards to a cheap but simple heuristic.
In the code below `CCK_Abort2()` would be considered as an error block, but not `CCK_Abort1()` due to this heuristic.
```
for (int i = 0; i < n; i+=1) {
if (ErrorCondition1)
CCK_Abort1(); // No __attribute__((noreturn))
if (ErrorCondition2)
CCK_Abort2(); // No __attribute__((noreturn))
}
```
This does not seem useful. Checking error conditions in the beginning of some work is quite common. It causes a switch default-case to be not considered an error block in SPEC's cactuBSSN. The comment justifying the heuristic mentions a "load", which does not seem to be applicable here. It has been proposed to remove the heuristic.
In addition, the patch fixes the following test cases:
- Polly :: ScopDetect/mod_ref_read_pointer.ll
- Polly :: ScopInfo/max-loop-depth.ll
- Polly :: ScopInfo/mod_ref_access_pointee_arguments.ll
- Polly :: ScopInfo/mod_ref_read_pointee_arguments.ll
- Polly :: ScopInfo/mod_ref_read_pointer.ll
- Polly :: ScopInfo/mod_ref_read_pointers.ll
The test cases failed after removing the heuristic.
Differential Revision: https://reviews.llvm.org/D45274
Contributed-by: Lorenzo Chelini <l.chelini@icloud.com>
llvm-svn: 329548
60 lines
2.1 KiB
LLVM
60 lines
2.1 KiB
LLVM
; RUN: opt %loadPolly -basicaa -polly-scops -analyze -polly-allow-modref-calls \
|
|
; RUN: < %s | FileCheck %s
|
|
; RUN: opt %loadPolly -basicaa -polly-codegen -disable-output \
|
|
; RUN: -polly-allow-modref-calls < %s
|
|
;
|
|
; Check that the call to func will "read" not only the A array but also the
|
|
; B array. The reason is the readonly annotation of func.
|
|
;
|
|
; CHECK: Stmt_for_body
|
|
; CHECK-NEXT: Domain :=
|
|
; CHECK-NEXT: { Stmt_for_body[i0] : 0 <= i0 <= 1023 };
|
|
; CHECK-NEXT: Schedule :=
|
|
; CHECK-NEXT: { Stmt_for_body[i0] -> [i0] };
|
|
; CHECK-NEXT: ReadAccess := [Reduction Type: NONE]
|
|
; CHECK-NEXT: { Stmt_for_body[i0] -> MemRef_B[i0] };
|
|
; CHECK-NEXT: MustWriteAccess := [Reduction Type: NONE]
|
|
; CHECK-NEXT: { Stmt_for_body[i0] -> MemRef_A[2 + i0] };
|
|
; CHECK-DAG: ReadAccess := [Reduction Type: NONE]
|
|
; CHECK-DAG: { Stmt_for_body[i0] -> MemRef_B[o0] };
|
|
; CHECK-DAG: ReadAccess := [Reduction Type: NONE]
|
|
; CHECK-DAG: { Stmt_for_body[i0] -> MemRef_A[o0] };
|
|
;
|
|
; #pragma readonly
|
|
; int func(int *A);
|
|
;
|
|
; void jd(int *restrict A, int *restrict B) {
|
|
; for (int i = 0; i < 1024; i++)
|
|
; A[i + 2] = func(A) + B[i];
|
|
; }
|
|
;
|
|
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
|
|
|
|
define void @jd(i32* noalias %A, i32* noalias %B) {
|
|
entry:
|
|
br label %for.body
|
|
|
|
for.body: ; preds = %entry, %for.inc
|
|
%i = phi i64 [ 0, %entry ], [ %i.next, %for.inc ]
|
|
%call = call i32 @func(i32* %A)
|
|
%arrayidx = getelementptr inbounds i32, i32* %B, i64 %i
|
|
%tmp = load i32, i32* %arrayidx, align 4
|
|
%add = add nsw i32 %call, %tmp
|
|
%tmp1 = add nsw i64 %i, 2
|
|
%arrayidx1 = getelementptr inbounds i32, i32* %A, i64 %tmp1
|
|
store i32 %add, i32* %arrayidx1, align 4
|
|
br label %for.inc
|
|
|
|
for.inc: ; preds = %for.body
|
|
%i.next = add nuw nsw i64 %i, 1
|
|
%exitcond = icmp ne i64 %i.next, 1024
|
|
br i1 %exitcond, label %for.body, label %for.end
|
|
|
|
for.end: ; preds = %for.inc
|
|
ret void
|
|
}
|
|
|
|
declare i32 @func(i32*) #0
|
|
|
|
attributes #0 = { nounwind readonly }
|