[polly] r193652 - ScopInfo: Add support for AssumedContext
Tobias Grosser
tobias at grosser.es
Tue Oct 29 14:05:49 PDT 2013
Author: grosser
Date: Tue Oct 29 16:05:49 2013
New Revision: 193652
URL: http://llvm.org/viewvc/llvm-project?rev=193652&view=rev
Log:
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 */ }
Added:
polly/trunk/test/Isl/Ast/run-time-condition.ll
Modified:
polly/trunk/include/polly/ScopInfo.h
polly/trunk/lib/Analysis/ScopInfo.cpp
polly/trunk/lib/CodeGen/IslAst.cpp
Modified: polly/trunk/include/polly/ScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopInfo.h?rev=193652&r1=193651&r2=193652&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopInfo.h (original)
+++ polly/trunk/include/polly/ScopInfo.h Tue Oct 29 16:05:49 2013
@@ -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;
Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=193652&r1=193651&r2=193652&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Tue Oct 29 16:05:49 2013
@@ -788,7 +788,8 @@ __isl_give isl_id *Scop::getIdForParam(c
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
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::getParamSpac
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";
Modified: polly/trunk/lib/CodeGen/IslAst.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslAst.cpp?rev=193652&r1=193651&r2=193652&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslAst.cpp (original)
+++ polly/trunk/lib/CodeGen/IslAst.cpp Tue Oct 29 16:05:49 2013
@@ -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 *AtEachDo
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 &
&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::getSch
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 &O
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); }
Added: polly/trunk/test/Isl/Ast/run-time-condition.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/run-time-condition.ll?rev=193652&view=auto
==============================================================================
--- polly/trunk/test/Isl/Ast/run-time-condition.ll (added)
+++ polly/trunk/test/Isl/Ast/run-time-condition.ll Tue Oct 29 16:05:49 2013
@@ -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 */ }
+
More information about the llvm-commits
mailing list