[polly] r314663 - [ScopBuilder] Build escaping dependencies separately.
Michael Kruse via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 2 04:41:20 PDT 2017
Author: meinersbur
Date: Mon Oct 2 04:41:19 2017
New Revision: 314663
URL: http://llvm.org/viewvc/llvm-project?rev=314663&view=rev
Log:
[ScopBuilder] Build escaping dependencies separately.
Instructions that compute escaping values might be synthesizable and
therefore not contained in any ScopStmt. When buildAccessFunctions is
changed to only iterate over the instruction list of statement,
"free" instructions still need to be written. We do this after the
main MemoryAccesses have been created.
This can change the order in which MemoryAccesses are created, but has
otherwise no functional change.
Modified:
polly/trunk/lib/Analysis/ScopBuilder.cpp
polly/trunk/test/ScopInfo/multidim_2d_with_modref_call.ll
polly/trunk/test/ScopInfo/multidim_2d_with_modref_call_2.ll
polly/trunk/test/ScopInfo/multidim_fortran_2d_with_modref_call.ll
polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll
Modified: polly/trunk/lib/Analysis/ScopBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopBuilder.cpp?rev=314663&r1=314662&r2=314663&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopBuilder.cpp (original)
+++ polly/trunk/lib/Analysis/ScopBuilder.cpp Mon Oct 2 04:41:19 2017
@@ -657,6 +657,15 @@ void ScopBuilder::buildAccessFunctions()
for (BasicBlock *BB : R->blocks())
buildAccessFunctions(&Stmt, *BB, R);
}
+
+ // Build write accesses for values that are used after the SCoP.
+ // The instructions defining them might be synthesizable and therefore not
+ // contained in any statement, hence we iterate over the original instructions
+ // to identify all escaping values.
+ for (BasicBlock *BB : scop->getRegion().blocks()) {
+ for (Instruction &Inst : *BB)
+ buildEscapingDependences(&Inst);
+ }
}
bool ScopBuilder::shouldModelInst(Instruction *Inst, Loop *L) {
@@ -743,8 +752,6 @@ void ScopBuilder::buildAccessFunctions(S
// explicit data dependences.
if (!PHI && (!isa<TerminatorInst>(&Inst) || NonAffineSubRegion))
buildScalarDependences(Stmt, &Inst);
-
- buildEscapingDependences(&Inst);
}
}
Modified: polly/trunk/test/ScopInfo/multidim_2d_with_modref_call.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_2d_with_modref_call.ll?rev=314663&r1=314662&r2=314663&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_2d_with_modref_call.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_2d_with_modref_call.ll Mon Oct 2 04:41:19 2017
@@ -25,13 +25,13 @@
; CHECK-NEXT: p0: %tmp14
; CHECK-NEXT: p1: {0,+,(0 smax %tmp)}<%bb12>
; CHECK-NEXT: Arrays {
-; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: i64 MemRef_arg1[*]; // Element size 8
+; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: double MemRef_arg4[*]; // Element size 8
; CHECK-NEXT: }
; CHECK-NEXT: Arrays (Bounds as pw_affs) {
-; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: i64 MemRef_arg1[*]; // Element size 8
+; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: double MemRef_arg4[*]; // Element size 8
; CHECK-NEXT: }
; CHECK-NEXT: Alias Groups (0):
Modified: polly/trunk/test/ScopInfo/multidim_2d_with_modref_call_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_2d_with_modref_call_2.ll?rev=314663&r1=314662&r2=314663&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_2d_with_modref_call_2.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_2d_with_modref_call_2.ll Mon Oct 2 04:41:19 2017
@@ -25,13 +25,13 @@
; CHECK-NEXT: p0: %tmp14
; CHECK-NEXT: p1: {0,+,(0 smax %tmp)}<%bb12>
; CHECK-NEXT: Arrays {
-; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: i64 MemRef_arg1[*]; // Element size 8
+; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: [1000 x double]* MemRef_arg4[*]; // Element size 8
; CHECK-NEXT: }
; CHECK-NEXT: Arrays (Bounds as pw_affs) {
-; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: i64 MemRef_arg1[*]; // Element size 8
+; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: [1000 x double]* MemRef_arg4[*]; // Element size 8
; CHECK-NEXT: }
; CHECK-NEXT: Alias Groups (0):
Modified: polly/trunk/test/ScopInfo/multidim_fortran_2d_with_modref_call.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/multidim_fortran_2d_with_modref_call.ll?rev=314663&r1=314662&r2=314663&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/multidim_fortran_2d_with_modref_call.ll (original)
+++ polly/trunk/test/ScopInfo/multidim_fortran_2d_with_modref_call.ll Mon Oct 2 04:41:19 2017
@@ -25,13 +25,13 @@
; CHECK-NEXT: p0: %tmp14
; CHECK-NEXT: p1: {0,+,(0 smax %tmp)}<%bb12>
; CHECK-NEXT: Arrays {
-; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: i64 MemRef_arg1[*]; // Element size 8
+; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: double MemRef_arg4[*]; // Element size 8
; CHECK-NEXT: }
; CHECK-NEXT: Arrays (Bounds as pw_affs) {
-; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: i64 MemRef_arg1[*]; // Element size 8
+; CHECK-NEXT: i64 MemRef_tmp13; // Element size 8
; CHECK-NEXT: double MemRef_arg4[*]; // Element size 8
; CHECK-NEXT: }
; CHECK-NEXT: Alias Groups (0):
Modified: polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll?rev=314663&r1=314662&r2=314663&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll (original)
+++ polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll Mon Oct 2 04:41:19 2017
@@ -16,10 +16,10 @@
; CHECK-NEXT: [N, c] -> { Stmt_for_cond[i0] -> [i0, 0, 0, 0] : i0 <= N; Stmt_for_cond[0] -> [0, 0, 0, 0] : N < 0 };
; CHECK-NEXT: ReadAccess := [Reduction Type: NONE] [Scalar: 1]
; CHECK-NEXT: [N, c] -> { Stmt_for_cond[i0] -> MemRef_x_addr_0__phi[] };
-; CHECK-NEXT: MustWriteAccess := [Reduction Type: NONE] [Scalar: 1]
-; CHECK-NEXT: [N, c] -> { Stmt_for_cond[i0] -> MemRef_x_addr_0[] };
; CHECK-NEXT: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0]
; CHECK-NEXT: [N, c] -> { Stmt_for_cond[i0] -> MemRef_A[i0] };
+; CHECK-NEXT: MustWriteAccess := [Reduction Type: NONE] [Scalar: 1]
+; CHECK-NEXT: [N, c] -> { Stmt_for_cond[i0] -> MemRef_x_addr_0[] };
; CHECK-NEXT: Stmt_for_body
; CHECK-NEXT: Domain :=
; CHECK-NEXT: [N, c] -> { Stmt_for_body[i0] : 0 <= i0 < N };
More information about the llvm-commits
mailing list