diff options
author | Tobias Grosser <tobias@grosser.es> | 2013-10-29 21:05:49 +0000 |
---|---|---|
committer | Tobias Grosser <tobias@grosser.es> | 2013-10-29 21:05:49 +0000 |
commit | e86109f508ead7dabbc2b8d1aec9595260f9e926 (patch) | |
tree | c6a93d4669aab1960d6284da19a6c7981cbe8743 | |
parent | 87596662cd586cd1966f2377f63bd374d0b50861 (diff) | |
download | bcm5719-llvm-e86109f508ead7dabbc2b8d1aec9595260f9e926.tar.gz bcm5719-llvm-e86109f508ead7dabbc2b8d1aec9595260f9e926.zip |
ScopInfo: Add support for AssumedContext
When constructing a scop sometimes the exact representation of a statement or
condition would be very complex, but there is a common case which is a lot
simpler, but which is only valid under certain assumptions. The assumed context
records the assumptions taken during the construction of this scop and that need
to be code generated as a run-time test.
At the moment, we do not yet model any assumptions, but only added the
AssumedContext as well as the isl-ast generation support. As a next step,
this needs to be hooked up with the isl code generation.
if (1) /* run-time condition */
{ /* optimized code */ }
else
{ /* original code */ }
llvm-svn: 193652
-rwxr-xr-x | polly/include/polly/ScopInfo.h | 14 | ||||
-rw-r--r-- | polly/lib/Analysis/ScopInfo.cpp | 8 | ||||
-rw-r--r-- | polly/lib/CodeGen/IslAst.cpp | 46 | ||||
-rw-r--r-- | polly/test/Isl/Ast/run-time-condition.ll | 36 |
4 files changed, 100 insertions, 4 deletions
diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h index e0a1565b829..38157452987 100755 --- a/polly/include/polly/ScopInfo.h +++ b/polly/include/polly/ScopInfo.h @@ -445,6 +445,15 @@ class Scop { /// Constraints on parameters. isl_set *Context; + /// @brief The assumptions under which this scop was built. + /// + /// When constructing a scop sometimes the exact representation of a statement + /// or condition would be very complex, but there is a common case which is a + /// lot simpler, but which is only valid under certain assumptions. The + /// assumed context records the assumptions taken during the construction of + /// this scop and that need to be code generated as a run-time test. + isl_set *AssumedContext; + /// Create the static control part with a region, max loop depth of this /// region and parameters used in this region. Scop(TempScop &TempScop, LoopInfo &LI, ScalarEvolution &SE, isl_ctx *ctx); @@ -551,6 +560,11 @@ public: __isl_give isl_set *getContext() const; __isl_give isl_space *getParamSpace() const; + /// @brief Get the assumped context for this Scop. + /// + /// @return The assumed context of this Scop. + __isl_give isl_set *getAssumedContext() const; + /// @brief Get an isl string representing the context. std::string getContextStr() const; diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp index 672135cb494..99436e6622c 100644 --- a/polly/lib/Analysis/ScopInfo.cpp +++ b/polly/lib/Analysis/ScopInfo.cpp @@ -788,7 +788,8 @@ __isl_give isl_id *Scop::getIdForParam(const SCEV *Parameter) const { void Scop::buildContext() { isl_space *Space = isl_space_params_alloc(IslCtx, 0); - Context = isl_set_universe(Space); + Context = isl_set_universe(isl_space_copy(Space)); + AssumedContext = isl_set_universe(Space); } void Scop::addParameterBounds() { @@ -860,6 +861,7 @@ Scop::Scop(TempScop &tempScop, LoopInfo &LI, ScalarEvolution &ScalarEvolution, Scop::~Scop() { isl_set_free(Context); + isl_set_free(AssumedContext); // Free the statements; for (iterator I = begin(), E = end(); I != E; ++I) @@ -890,6 +892,10 @@ __isl_give isl_space *Scop::getParamSpace() const { return isl_set_get_space(this->Context); } +__isl_give isl_set *Scop::getAssumedContext() const { + return isl_set_copy(AssumedContext); +} + void Scop::printContext(raw_ostream &OS) const { OS << "Context:\n"; diff --git a/polly/lib/CodeGen/IslAst.cpp b/polly/lib/CodeGen/IslAst.cpp index 179916898fa..57f3ae67137 100644 --- a/polly/lib/CodeGen/IslAst.cpp +++ b/polly/lib/CodeGen/IslAst.cpp @@ -60,12 +60,15 @@ public: void pprint(llvm::raw_ostream &OS); __isl_give isl_ast_node *getAst(); + __isl_give isl_ast_expr *getRunCondition(); private: Scop *S; isl_ast_node *Root; + isl_ast_expr *RunCondition; __isl_give isl_union_map *getSchedule(); + void buildAssumedContext(__isl_keep isl_ast_build *Context); }; } // End namespace polly. @@ -312,6 +315,26 @@ static __isl_give isl_ast_node *AtEachDomain(__isl_take isl_ast_node *Node, return isl_ast_node_set_annotation(Node, Id); } +void IslAst::buildAssumedContext(__isl_keep isl_ast_build *Context) { + isl_aff *Zero = + isl_aff_zero_on_domain(isl_local_space_from_space(S->getParamSpace())); + isl_aff *One = + isl_aff_zero_on_domain(isl_local_space_from_space(S->getParamSpace())); + + One = isl_aff_add_constant_si(One, 1); + + isl_pw_aff *PwZero = isl_pw_aff_from_aff(Zero); + isl_pw_aff *PwOne = isl_pw_aff_from_aff(One); + + PwOne = isl_pw_aff_intersect_domain(PwOne, S->getAssumedContext()); + PwZero = isl_pw_aff_intersect_domain( + PwZero, isl_set_complement(S->getAssumedContext())); + + isl_pw_aff *Cond = isl_pw_aff_union_max(PwZero, PwOne); + + RunCondition = isl_ast_build_expr_from_pw_aff(Context, Cond); +} + IslAst::IslAst(Scop *Scop, Dependences &D) : S(Scop) { isl_ctx *Ctx = S->getIslCtx(); isl_options_set_ast_build_atomic_upper_bound(Ctx, true); @@ -345,6 +368,8 @@ IslAst::IslAst(Scop *Scop, Dependences &D) : S(Scop) { &BuildInfo); } + buildAssumedContext(Context); + Root = isl_ast_build_ast_from_schedule(Context, Schedule); isl_ast_build_free(Context); @@ -367,7 +392,10 @@ __isl_give isl_union_map *IslAst::getSchedule() { return Schedule; } -IslAst::~IslAst() { isl_ast_node_free(Root); } +IslAst::~IslAst() { + isl_ast_node_free(Root); + isl_ast_expr_free(RunCondition); +} /// Print a C like representation of the program. void IslAst::pprint(llvm::raw_ostream &OS) { @@ -379,16 +407,28 @@ void IslAst::pprint(llvm::raw_ostream &OS) { isl_printer *P = isl_printer_to_str(S->getIslCtx()); P = isl_printer_set_output_format(P, ISL_FORMAT_C); + + P = isl_printer_print_ast_expr(P, RunCondition); + char *result = isl_printer_get_str(P); + P = isl_printer_flush(P); + + OS << "\nif (" << result << ")\n\n"; + P = isl_printer_indent(P, 4); + Root = getAst(); P = isl_ast_node_print(Root, P, Options); - char *result = isl_printer_get_str(P); + result = isl_printer_get_str(P); OS << result << "\n"; + OS << "else\n"; + OS << " { /* original code */ }\n\n"; isl_printer_free(P); isl_ast_node_free(Root); } -/// Create the isl_ast from this program. __isl_give isl_ast_node *IslAst::getAst() { return isl_ast_node_copy(Root); } +__isl_give isl_ast_expr *IslAst::getRunCondition() { + return isl_ast_expr_copy(RunCondition); +} void IslAstInfo::pprint(llvm::raw_ostream &OS) { Ast->pprint(OS); } diff --git a/polly/test/Isl/Ast/run-time-condition.ll b/polly/test/Isl/Ast/run-time-condition.ll new file mode 100644 index 00000000000..8820932aa39 --- /dev/null +++ b/polly/test/Isl/Ast/run-time-condition.ll @@ -0,0 +1,36 @@ +; RUN: opt %loadPolly -basicaa -polly-ast -analyze < %s | FileCheck %s + +; for (i = 0; i < 1024; i++) +; A[i] = B[i]; + +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" + +define void @run-time-condition(i16* noalias %A, i16* noalias %B) { +entry: + br label %for.cond + +for.cond: ; preds = %for.body, %entry + %indvar = phi i64 [ 0, %entry ], [ %inc, %for.body ] + %cmp = icmp slt i64 %indvar, 1024 + br i1 %cmp, label %for.body, label %for.end + +for.body: ; preds = %for.cond + %arrayidx = getelementptr inbounds i16* %B, i64 0 + %load = load i16* %arrayidx + %add10 = add nsw i16 %load, 1 + %arrayidx13 = getelementptr inbounds i16* %A, i64 %indvar + store i16 %add10, i16* %arrayidx13, align 2 + %inc = add nsw i64 %indvar, 1 + br label %for.cond + +for.end: ; preds = %for.cond + ret void +} + +; CHECK: if (1) +; CHECK: for (int c1 = 0; c1 <= 1023; c1 += 1) +; CHECK: Stmt_for_body(c1); +; CHECK: else +; CHECK: { /* original code */ } + |