[llvm-commits] [polly] r165036 - in /polly/trunk: include/polly/CodeGen/IslAst.h include/polly/LinkAllPasses.h include/polly/ScopInfo.h lib/CodeGen/CMakeLists.txt lib/CodeGen/IslAst.cpp lib/RegisterPasses.cpp
Tobias Grosser
grosser at fim.uni-passau.de
Tue Oct 2 12:50:38 PDT 2012
Author: grosser
Date: Tue Oct 2 14:50:38 2012
New Revision: 165036
URL: http://llvm.org/viewvc/llvm-project?rev=165036&view=rev
Log:
Add an ast pretty printer pass based on the isl code generator
Added:
polly/trunk/include/polly/CodeGen/IslAst.h
polly/trunk/lib/CodeGen/IslAst.cpp
Modified:
polly/trunk/include/polly/LinkAllPasses.h
polly/trunk/include/polly/ScopInfo.h
polly/trunk/lib/CodeGen/CMakeLists.txt
polly/trunk/lib/RegisterPasses.cpp
Added: polly/trunk/include/polly/CodeGen/IslAst.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/CodeGen/IslAst.h?rev=165036&view=auto
==============================================================================
--- polly/trunk/include/polly/CodeGen/IslAst.h (added)
+++ polly/trunk/include/polly/CodeGen/IslAst.h Tue Oct 2 14:50:38 2012
@@ -0,0 +1,75 @@
+//===- IslAst.h - Interface to the isl code generator-------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// The isl code generator interface takes a Scop and generates a isl_ast. This
+// ist_ast can either be returned directly or it can be pretty printed to
+// stdout.
+//
+// A typical isl_ast output looks like this:
+//
+// for (c2 = max(0, ceild(n + m, 2); c2 <= min(511, floord(5 * n, 3)); c2++) {
+// bb2(c2);
+// }
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef POLLY_ISL_AST_H
+#define POLLY_ISL_AST_H
+
+#include "polly/Config/config.h"
+
+#ifdef ISL_CODEGEN_FOUND
+
+#include "polly/ScopPass.h"
+
+struct clast_name;
+namespace llvm {
+ class raw_ostream;
+}
+
+struct isl_ast_node;
+struct isl_ast_build;
+struct isl_pw_multi_aff;
+
+namespace polly {
+ class Scop;
+ class IslAst;
+
+ struct IslAstUser {
+ struct isl_ast_build *Context;
+ struct isl_pw_multi_aff *PMA;
+ };
+
+ class IslAstInfo: public ScopPass {
+ Scop *S;
+ IslAst *Ast;
+
+ public:
+ static char ID;
+ IslAstInfo() : ScopPass(ID), Ast(NULL) {}
+
+ /// Print a source code representation of the program.
+ void pprint(llvm::raw_ostream &OS);
+
+ isl_ast_node *getAst();
+
+ bool runOnScop(Scop &S);
+ void printScop(llvm::raw_ostream &OS) const;
+ virtual void getAnalysisUsage(AnalysisUsage &AU) const;
+ virtual void releaseMemory();
+ };
+}
+
+namespace llvm {
+ class PassRegistry;
+ void initializeIslAstInfoPass(llvm::PassRegistry&);
+}
+
+#endif /* ISL_CODEGEN_FOUND */
+#endif /* POLLY_ISL_AST_H */
Modified: polly/trunk/include/polly/LinkAllPasses.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/LinkAllPasses.h?rev=165036&r1=165035&r2=165036&view=diff
==============================================================================
--- polly/trunk/include/polly/LinkAllPasses.h (original)
+++ polly/trunk/include/polly/LinkAllPasses.h Tue Oct 2 14:50:38 2012
@@ -48,6 +48,11 @@
llvm::Pass *createRegionSimplifyPass();
llvm::Pass *createScopDetectionPass();
llvm::Pass *createScopInfoPass();
+
+#ifdef ISL_CODEGEN_FOUND
+ llvm::Pass *createIslAstInfoPass();
+#endif
+
llvm::Pass *createIslScheduleOptimizerPass();
llvm::Pass *createTempScopInfoPass();
@@ -100,6 +105,9 @@
#ifdef PLUTO_FOUND
createPlutoOptimizerPass();
#endif
+#ifdef ISL_CODEGEN_FOUND
+ createIslAstInfoPass();
+#endif
createIslScheduleOptimizerPass();
createTempScopInfoPass();
@@ -127,6 +135,9 @@
void initializeIndependentBlocksPass(llvm::PassRegistry&);
void initializeJSONExporterPass(llvm::PassRegistry&);
void initializeJSONImporterPass(llvm::PassRegistry&);
+#ifdef ISL_CODEGEN_FOUND
+ void initializeIslAstInfoPass(llvm::PassRegistry&);
+#endif
void initializeIslScheduleOptimizerPass(llvm::PassRegistry&);
#ifdef PLUTO_FOUND
void initializePlutoOptimizerPass(llvm::PassRegistry&);
Modified: polly/trunk/include/polly/ScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopInfo.h?rev=165036&r1=165035&r2=165036&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopInfo.h (original)
+++ polly/trunk/include/polly/ScopInfo.h Tue Oct 2 14:50:38 2012
@@ -302,7 +302,7 @@
/// @brief Get the iteration domain of this ScopStmt.
///
/// @return The iteration domain of this ScopStmt.
- isl_set *getDomain() const;
+ __isl_give isl_set *getDomain() const;
/// @brief Get the space of the iteration domain
///
@@ -320,7 +320,7 @@
/// @brief Get the scattering function of this ScopStmt.
///
/// @return The scattering function of this ScopStmt.
- isl_map *getScattering() const;
+ __isl_give isl_map *getScattering() const;
void setScattering(isl_map *scattering);
/// @brief Get an isl string representing this scattering.
Modified: polly/trunk/lib/CodeGen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/CMakeLists.txt?rev=165036&r1=165035&r2=165036&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/CMakeLists.txt (original)
+++ polly/trunk/lib/CodeGen/CMakeLists.txt Tue Oct 2 14:50:38 2012
@@ -6,6 +6,7 @@
if (ISL_CODEGEN_FOUND)
set(ISL_CODEGEN_FILES
+ IslAst.cpp
IslCodeGeneration.cpp)
endif (ISL_CODEGEN_FOUND)
Added: polly/trunk/lib/CodeGen/IslAst.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslAst.cpp?rev=165036&view=auto
==============================================================================
--- polly/trunk/lib/CodeGen/IslAst.cpp (added)
+++ polly/trunk/lib/CodeGen/IslAst.cpp Tue Oct 2 14:50:38 2012
@@ -0,0 +1,213 @@
+//===- IslAst.cpp - isl code generator interface --------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// The isl code generator interface takes a Scop and generates a isl_ast. This
+// ist_ast can either be returned directly or it can be pretty printed to
+// stdout.
+//
+// A typical isl_ast output looks like this:
+//
+// for (c2 = max(0, ceild(n + m, 2); c2 <= min(511, floord(5 * n, 3)); c2++) {
+// bb2(c2);
+// }
+//
+//===----------------------------------------------------------------------===//
+
+#include "polly/CodeGen/IslAst.h"
+
+#ifdef ISL_CODEGEN_FOUND
+#include "polly/LinkAllPasses.h"
+#include "polly/ScopInfo.h"
+
+#define DEBUG_TYPE "polly-ast"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+
+#include "isl/union_map.h"
+#include "isl/list.h"
+#include "isl/ast.h"
+#include "isl/ast_build.h"
+#include "isl/set.h"
+#include "isl/map.h"
+#include "isl/aff.h"
+
+using namespace llvm;
+using namespace polly;
+
+static cl::opt<bool>
+UseContext("polly-ast-use-context", cl::desc("Use context"), cl::Hidden,
+ cl::init(false), cl::ZeroOrMore);
+
+namespace polly {
+class IslAst {
+public:
+ IslAst(Scop *Scop);
+
+ ~IslAst();
+
+ /// Print a source code representation of the program.
+ void pprint(llvm::raw_ostream &OS);
+
+ __isl_give isl_ast_node *getAst();
+
+private:
+ Scop *S;
+ isl_ast_node *Root;
+
+ __isl_give isl_union_map *getSchedule();
+};
+} // End namespace polly.
+
+
+static void IslAstUserFree(void *User)
+{
+ struct IslAstUser *UserStruct = (struct IslAstUser *) User;
+ isl_ast_build_free(UserStruct->Context);
+ isl_pw_multi_aff_free(UserStruct->PMA);
+ free(UserStruct);
+}
+
+static __isl_give isl_ast_node *AtEachDomain(__isl_keep isl_ast_node *Node,
+ __isl_keep isl_ast_build *Context, void *User)
+{
+ isl_map *Map;
+ struct IslAstUser *UserStruct;
+
+ UserStruct = (struct IslAstUser *) malloc(sizeof(struct IslAstUser));
+
+ Map = isl_map_from_union_map(isl_ast_build_get_schedule(Context));
+ UserStruct->PMA = isl_pw_multi_aff_from_map(isl_map_reverse(Map));
+ UserStruct->Context = isl_ast_build_copy(Context);
+
+ isl_id *Annotation = isl_id_alloc(isl_ast_node_get_ctx(Node), NULL,
+ UserStruct);
+ Annotation = isl_id_set_free_user(Annotation, &IslAstUserFree);
+ return isl_ast_node_set_annotation(Node, Annotation);
+}
+
+IslAst::IslAst(Scop *Scop) : S(Scop) {
+ isl_ctx *Ctx = S->getIslCtx();
+ isl_options_set_ast_build_atomic_upper_bound(Ctx, true);
+ isl_ast_build *Context;
+
+ if (UseContext)
+ Context = isl_ast_build_from_context(S->getContext());
+ else
+ Context = isl_ast_build_from_context(isl_set_universe(S->getParamSpace()));
+
+ Context = isl_ast_build_set_at_each_domain(Context, AtEachDomain, NULL);
+
+ isl_union_map *Schedule = getSchedule();
+
+ Function *F = Scop->getRegion().getEntry()->getParent();
+
+ DEBUG(dbgs() << ":: isl ast :: " << F->getName()
+ << " :: " << Scop->getRegion().getNameStr() << "\n");;
+ DEBUG(dbgs() << S->getContextStr() << "\n";
+ isl_union_map_dump(Schedule);
+ );
+
+ Root = isl_ast_build_ast_from_schedule(Context, Schedule);
+
+ isl_ast_build_free(Context);
+
+ DEBUG(pprint(dbgs()));
+}
+
+__isl_give isl_union_map *IslAst::getSchedule() {
+ isl_union_map *Schedule = isl_union_map_empty(S->getParamSpace());
+
+ for (Scop::iterator SI = S->begin(), SE = S->end(); SI != SE; ++SI) {
+ ScopStmt *Stmt = *SI;
+ isl_map *StmtSchedule = Stmt->getScattering();
+
+ StmtSchedule = isl_map_intersect_domain(StmtSchedule, Stmt->getDomain());
+ Schedule = isl_union_map_union(Schedule,
+ isl_union_map_from_map(StmtSchedule));
+ }
+
+ return Schedule;
+}
+
+IslAst::~IslAst() {
+ isl_ast_node_free(Root);
+}
+
+/// Print a C like representation of the program.
+void IslAst::pprint(llvm::raw_ostream &OS) {
+ isl_ast_node *Root;
+ isl_ast_print_options *Options = isl_ast_print_options_alloc(S->getIslCtx());
+ isl_printer *P = isl_printer_to_str(S->getIslCtx());
+ P = isl_printer_set_output_format(P, ISL_FORMAT_C);
+ Root = getAst();
+ P = isl_ast_node_print(Root, P, Options);
+ char *result = isl_printer_get_str(P);
+ OS << result << "\n";
+ isl_printer_free(P);
+ isl_ast_node_free(Root);
+ isl_ast_print_options_free(Options);
+}
+
+/// Create the isl_ast from this program.
+__isl_give isl_ast_node *IslAst::getAst() {
+ return isl_ast_node_copy(Root);
+}
+
+void IslAstInfo::pprint(llvm::raw_ostream &OS) {
+ Ast->pprint(OS);
+}
+
+void IslAstInfo::releaseMemory() {
+ if (Ast) {
+ delete Ast;
+ Ast = 0;
+ }
+}
+
+bool IslAstInfo::runOnScop(Scop &Scop) {
+ if (Ast)
+ delete Ast;
+
+ S = &Scop;
+
+ Ast = new IslAst(&Scop);
+
+ return false;
+}
+
+__isl_give isl_ast_node *IslAstInfo::getAst() {
+ return Ast->getAst();
+}
+
+void IslAstInfo::printScop(raw_ostream &OS) const {
+ Function *F = S->getRegion().getEntry()->getParent();
+
+ OS << "isl ast for function '" << F->getName() << "':\n";
+
+ Ast->pprint(OS);
+}
+
+void IslAstInfo::getAnalysisUsage(AnalysisUsage &AU) const {
+ // Get the Common analysis usage of ScopPasses.
+ ScopPass::getAnalysisUsage(AU);
+ AU.addRequired<ScopInfo>();
+}
+char IslAstInfo::ID = 0;
+
+INITIALIZE_PASS_BEGIN(IslAstInfo, "polly-ast",
+ "Generate an AST of the SCoP (isl)", false, false)
+INITIALIZE_PASS_DEPENDENCY(ScopInfo)
+INITIALIZE_PASS_END(IslAstInfo, "polly-ast",
+ "Generate an AST from the SCoP (isl)", false, false)
+
+Pass *polly::createIslAstInfoPass() {
+ return new IslAstInfo();
+}
+
+#endif // CLOOG_FOUND
Modified: polly/trunk/lib/RegisterPasses.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/RegisterPasses.cpp?rev=165036&r1=165035&r2=165036&view=diff
==============================================================================
--- polly/trunk/lib/RegisterPasses.cpp (original)
+++ polly/trunk/lib/RegisterPasses.cpp Tue Oct 2 14:50:38 2012
@@ -139,6 +139,9 @@
initializeIndependentBlocksPass(Registry);
initializeJSONExporterPass(Registry);
initializeJSONImporterPass(Registry);
+#ifdef ISL_CODEGEN_FOUND
+ initializeIslAstInfoPass(Registry);
+#endif
initializeIslScheduleOptimizerPass(Registry);
#ifdef SCOPLIB_FOUND
initializePoccPass(Registry);
More information about the llvm-commits
mailing list