Index: include/polly/ScopBuilder.h =================================================================== --- include/polly/ScopBuilder.h +++ include/polly/ScopBuilder.h @@ -228,8 +228,8 @@ /// access any memory and thus have no effect. void buildStmts(Region &SR); - /// Build the access functions for the basic block @p BB in or represented by - /// @p Stmt. + /// Build the access functions for the statement @p Stmt in or represented by + /// @p BB. /// /// @param Stmt Statement to add MemoryAccesses to. /// @param BB A basic block in @p R. Index: lib/Analysis/ScopBuilder.cpp =================================================================== --- lib/Analysis/ScopBuilder.cpp +++ lib/Analysis/ScopBuilder.cpp @@ -664,6 +664,12 @@ if (!isa(&Inst) && !isIgnoredIntrinsic(&Inst) && !canSynthesize(&Inst, *scop, &SE, L)) Instructions.push_back(&Inst); + if (Inst.getMetadata("polly_split_after")) { + Loop *SurroundingLoop = LI.getLoopFor(I->getNodeAs()); + scop->addScopStmt(I->getNodeAs(), SurroundingLoop, + Instructions); + Instructions.clear(); + } } Loop *SurroundingLoop = LI.getLoopFor(I->getNodeAs()); scop->addScopStmt(I->getNodeAs(), SurroundingLoop, @@ -684,7 +690,19 @@ if (isErrorBlock(BB, scop->getRegion(), LI, DT) && !IsExitBlock) return; + int Count = 0; + bool Split = false; for (Instruction &Inst : BB) { + if (Split) { + Split = false; + Count++; + } + if (Inst.getMetadata("polly_split_after")) + Split = true; + + if (Stmt && Stmt->isBlockStmt() && Stmt != scop->getStmtListFor(&BB)[Count]) + continue; + PHINode *PHI = dyn_cast(&Inst); if (PHI) buildPHIAccesses(Stmt, PHI, NonAffineSubRegion, IsExitBlock); Index: lib/Analysis/ScopInfo.cpp =================================================================== --- lib/Analysis/ScopInfo.cpp +++ lib/Analysis/ScopInfo.cpp @@ -1753,7 +1753,13 @@ : Parent(parent), InvalidDomain(nullptr), Domain(nullptr), BB(&bb), Build(nullptr), SurroundingLoop(SurroundingLoop), Instructions(Instructions) { - BaseName = getIslCompatibleName("Stmt", &bb, parent.getNextStmtIdx(), "", + int index = parent.getStmtListFor(&bb).size(); + std::string S; + if (index == 0) + S = ""; + else + S = std::to_string(index); + BaseName = getIslCompatibleName("Stmt", &bb, parent.getNextStmtIdx(), S, UseInstructionNames); } @@ -5034,8 +5040,6 @@ auto StmtMapIt = StmtMap.find(BB); if (StmtMapIt == StmtMap.end()) return {}; - assert(StmtMapIt->second.size() == 1 && - "Each statement corresponds to exactly one BB."); return StmtMapIt->second; } Index: test/Isl/CodeGen/stmt_split_no_dependence.ll =================================================================== --- /dev/null +++ test/Isl/CodeGen/stmt_split_no_dependence.ll @@ -0,0 +1,44 @@ +; RUN: opt %loadPolly -polly-codegen -S < %s | FileCheck %s +; +; CHECK: store i32 %8, i32* %scevgep, align 4, !alias.scope !1, !noalias !3 +; CHECK: store i32 %9, i32* %scevgep4, align 4, !alias.scope !4, !noalias !5 +; +; void func(int *A, int *B){ +; for (int i = 0; i < 1024; i+=1) { +; Stmt: +; A[i] = i; +; B[i] = i; +; } +; } +; +; Function Attrs: noinline nounwind uwtable +define void @func(i32* %A, i32* %B) #0 { +entry: + br label %for.cond + +for.cond: ; preds = %for.inc, %entry + %i.0 = phi i32 [ 0, %entry ], [ %add, %for.inc ] + %cmp = icmp slt i32 %i.0, 1024 + br i1 %cmp, label %for.body, label %for.end + +for.body: ; preds = %for.cond + br label %Stmt + +Stmt: ; preds = %for.body + %idxprom = sext i32 %i.0 to i64 + %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom + store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0 + %idxprom1 = sext i32 %i.0 to i64 + %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1 + store i32 %i.0, i32* %arrayidx2, align 4 + br label %for.inc + +for.inc: ; preds = %Stmt + %add = add nsw i32 %i.0, 1 + br label %for.cond + +for.end: ; preds = %for.cond + ret void +} + +!0 = !{!"polly_split_after"} Index: test/ScopInfo/statement.ll =================================================================== --- test/ScopInfo/statement.ll +++ test/ScopInfo/statement.ll @@ -7,11 +7,17 @@ ; B[i] = i; ; } ; } - -; CHECK: Instructions { -; CHECK-NEXT: store i32 %i.0, i32* %arrayidx, align 4 -; CHECK-NEXT: store i32 %i.0, i32* %arrayidx2, align 4 -; CHECK-NEXT: } +; +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT { Stmt_Stmt[i0] -> MemRef_A[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0 +; CHECK-NEXT: } +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt1[i0] -> MemRef_B[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx2, align 4 +; CHECK-NEXT: } ; Function Attrs: noinline nounwind uwtable define void @func(i32* %A, i32* %B) #0 { @@ -29,7 +35,7 @@ Stmt: ; preds = %for.body %idxprom = sext i32 %i.0 to i64 %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom - store i32 %i.0, i32* %arrayidx, align 4 + store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0 %idxprom1 = sext i32 %i.0 to i64 %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1 store i32 %i.0, i32* %arrayidx2, align 4 @@ -42,3 +48,5 @@ for.end: ; preds = %for.cond ret void } + +!0 = !{!"polly_split_after"} Index: test/ScopInfo/stmt_split_exit_of_region_stmt.ll =================================================================== --- /dev/null +++ test/ScopInfo/stmt_split_exit_of_region_stmt.ll @@ -0,0 +1,54 @@ +; RUN: opt %loadPolly -polly-scops -analyze -polly-print-instructions < %s | FileCheck %s +; +; CHECK: MayWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Region__TO__Stmt[i0] -> MemRef_C[0] }; +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt[i0] -> MemRef_A[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0 +; CHECK-NEXT: } +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt1[i0] -> MemRef_B[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx2, align 4 +; CHECK-NEXT: } +; +; Function Attrs: noinline nounwind uwtable +define void @func(i32* %A, i32* %B, double* %C) #0 { +entry: + br label %for.cond + +for.cond: ; preds = %for.inc, %entry + %i.0 = phi i32 [ 0, %entry ], [ %add, %for.inc ] + %cmp = icmp slt i32 %i.0, 1024 + br i1 %cmp, label %for.body, label %for.end + +for.body: ; preds = %for.cond + br label %Region + +Region: + %cond = fcmp oeq double 21.0, 21.0 + br i1 %cond, label %Region_true, label %Stmt + +Region_true: + store double 0.0, double* %C + br label %Stmt + +Stmt: + %idxprom = sext i32 %i.0 to i64 + %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom + store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0 + %idxprom1 = sext i32 %i.0 to i64 + %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1 + store i32 %i.0, i32* %arrayidx2, align 4 + br label %for.inc + +for.inc: ; preds = %Stmt + %add = add nsw i32 %i.0, 1 + br label %for.cond + +for.end: ; preds = %for.cond + ret void +} + +!0 = !{!"polly_split_after"} Index: test/ScopInfo/stmt_split_on_synthesizable.ll =================================================================== --- /dev/null +++ test/ScopInfo/stmt_split_on_synthesizable.ll @@ -0,0 +1,44 @@ +; RUN: opt %loadPolly -polly-scops -analyze -polly-print-instructions < %s | FileCheck %s +; +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt[i0] -> MemRef_A[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx, align 4 +; CHECK-NEXT: } +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt1[i0] -> MemRef_B[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx2, align 4 +; CHECK-NEXT: } +; +; Function Attrs: noinline nounwind uwtable +define void @func(i32* %A, i32* %B, double* %C) #0 { +entry: + br label %for.cond + +for.cond: ; preds = %for.inc, %entry + %i.0 = phi i32 [ 0, %entry ], [ %add, %for.inc ] + %cmp = icmp slt i32 %i.0, 1024 + br i1 %cmp, label %for.body, label %for.end + +for.body: ; preds = %for.cond + br label %Stmt + +Stmt: + %idxprom = sext i32 %i.0 to i64 + %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom + store i32 %i.0, i32* %arrayidx, align 4 + %idxprom1 = sext i32 %i.0 to i64, !polly_split_after !0 + %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1 + store i32 %i.0, i32* %arrayidx2, align 4 + br label %for.inc + +for.inc: ; preds = %Stmt + %add = add nsw i32 %i.0, 1 + br label %for.cond + +for.end: ; preds = %for.cond + ret void +} + +!0 = !{!"polly_split_after"} Index: test/ScopInfo/stmt_split_phi_in_beginning_bb.ll =================================================================== --- /dev/null +++ test/ScopInfo/stmt_split_phi_in_beginning_bb.ll @@ -0,0 +1,45 @@ +; RUN: opt %loadPolly -polly-scops -analyze -polly-print-instructions < %s | FileCheck %s +; +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt[i0] -> MemRef_A[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %phi, i32* %arrayidx, align 4, !polly_split_after !0 +; CHECK-NEXT: } +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt1[i0] -> MemRef_B[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx2, align 4 +; CHECK-NEXT: } +; +; Function Attrs: noinline nounwind uwtable +define void @func(i32* %A, i32* %B) #0 { +entry: + br label %for.cond + +for.cond: ; preds = %for.inc, %entry + %i.0 = phi i32 [ 0, %entry ], [ %add, %for.inc ] + %cmp = icmp slt i32 %i.0, 1024 + br i1 %cmp, label %for.body, label %for.end + +for.body: ; preds = %for.cond + br label %Stmt + +Stmt: + %phi = phi i32 [0, %for.body] + %idxprom = sext i32 %i.0 to i64 + %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom + store i32 %phi, i32* %arrayidx, align 4, !polly_split_after !0 + %idxprom1 = sext i32 %i.0 to i64 + %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1 + store i32 %i.0, i32* %arrayidx2, align 4 + br label %for.inc + +for.inc: ; preds = %Stmt + %add = add nsw i32 %i.0, 1 + br label %for.cond + +for.end: ; preds = %for.cond + ret void +} + +!0 = !{!"polly_split_after"} Index: test/ScopInfo/stmt_split_phi_in_stmt.ll =================================================================== --- /dev/null +++ test/ScopInfo/stmt_split_phi_in_stmt.ll @@ -0,0 +1,58 @@ +; RUN: opt %loadPolly -polly-scops -analyze -polly-print-instructions < %s | FileCheck %s +; +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt[i0] -> MemRef_A[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0 +; CHECK-NEXT: } +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt1[i0] -> MemRef_B[i0] }; +; CHECK-NEXT: MustWriteAccess := [Reduction Type: NONE] [Scalar: 1] +; CHECK-NEXT: { Stmt_Stmt1[i0] -> MemRef_phi__phi[] }; +; CHECK: Instructions { +; CHECK-NEXT: %d = fadd double 2.100000e+01, 2.100000e+01 +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx2, align 4 +; CHECK-NEXT: } +; CHECK: ReadAccess := [Reduction Type: NONE] [Scalar: 1] +; CHECK-NEXT: { Stmt_for_inc[i0] -> MemRef_phi__phi[] }; +; CHECK-NEXT: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_for_inc[i0] -> MemRef_C[0] }; +; CHECK: Instructions { +; CHECK-NEXT: %phi = phi double [ %d, %Stmt ] +; CHECK-NEXT: store double %phi, double* %C +; CHECK-NEXT: } +; +; Function Attrs: noinline nounwind uwtable +define void @func(i32* %A, i32* %B, double* %C) #0 { +entry: + br label %for.cond + +for.cond: ; preds = %for.inc, %entry + %i.0 = phi i32 [ 0, %entry ], [ %add, %for.inc ] + %cmp = icmp slt i32 %i.0, 1024 + br i1 %cmp, label %for.body, label %for.end + +for.body: ; preds = %for.cond + br label %Stmt + +Stmt: + %idxprom = sext i32 %i.0 to i64 + %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom + store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0 + %idxprom1 = sext i32 %i.0 to i64 + %d = fadd double 21.0, 21.0 + %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1 + store i32 %i.0, i32* %arrayidx2, align 4 + br label %for.inc + +for.inc: ; preds = %Stmt + %phi = phi double [%d, %Stmt] + store double %phi, double* %C + %add = add nsw i32 %i.0, 1 + br label %for.cond + +for.end: ; preds = %for.cond + ret void +} + +!0 = !{!"polly_split_after"} Index: test/ScopInfo/stmt_split_within_loop.ll =================================================================== --- /dev/null +++ test/ScopInfo/stmt_split_within_loop.ll @@ -0,0 +1,48 @@ +; RUN: opt %loadPolly -polly-scops -analyze -polly-print-instructions < %s | FileCheck %s +; +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt[i0, i1] -> MemRef_A[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0 +; CHECK-NEXT: } +; CHECK: MustWriteAccess := [Reduction Type: NONE] [Scalar: 0] +; CHECK-NEXT: { Stmt_Stmt1[i0, i1] -> MemRef_B[i0] }; +; CHECK: Instructions { +; CHECK-NEXT: store i32 %i.0, i32* %arrayidx2, align 4 +; CHECK-NEXT: %cond = icmp slt i32 %j, 512 +; CHECK-NEXT: } +; +; Function Attrs: noinline nounwind uwtable +define void @func(i32* %A, i32* %B, double* %C) #0 { +entry: + br label %for.cond + +for.cond: ; preds = %for.inc, %entry + %i.0 = phi i32 [ 0, %entry ], [ %add, %for.inc ] + %cmp = icmp slt i32 %i.0, 1024 + br i1 %cmp, label %for.body, label %for.end + +for.body: ; preds = %for.cond + br label %Stmt + +Stmt: + %j = phi i32 [ 0, %for.body ], [ %inc, %Stmt ] + %idxprom = sext i32 %i.0 to i64 + %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom + store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0 + %idxprom1 = sext i32 %i.0 to i64 + %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1 + store i32 %i.0, i32* %arrayidx2, align 4 + %inc = add nsw i32 %j, 1 + %cond = icmp slt i32 %j, 512 + br i1 %cond, label %Stmt, label %for.inc + +for.inc: ; preds = %Stmt + %add = add nsw i32 %i.0, 1 + br label %for.cond + +for.end: ; preds = %for.cond + ret void +} + +!0 = !{!"polly_split_after"}