[PATCH] [OPENMP] OMPExecutableDirective re-factoring
Alexander Musman
alexander.musman at gmail.com
Thu Mar 6 00:36:42 PST 2014
Hi rsmith, doug.gregor, ABataev, gribozavr, hfinkel, cbergstrom, fraggamuffin,
This patch is a simple re-factoring of OMPExecutableDirective. The change is to store the number of tail-allocated clauses and children and dynamically compute their locations.
http://llvm-reviews.chandlerc.com/D2977
Files:
include/clang/AST/StmtOpenMP.h
lib/AST/Stmt.cpp
Index: include/clang/AST/StmtOpenMP.h
===================================================================
--- include/clang/AST/StmtOpenMP.h
+++ include/clang/AST/StmtOpenMP.h
@@ -38,10 +38,22 @@
SourceLocation StartLoc;
/// \brief Ending location of the directive.
SourceLocation EndLoc;
- /// \brief Pointer to the list of clauses.
- llvm::MutableArrayRef<OMPClause *> Clauses;
- /// \brief Associated statement (if any) and expressions.
- llvm::MutableArrayRef<Stmt *> StmtAndExpressions;
+ /// \brief Numbers of clauses.
+ const unsigned NumClauses;
+ /// \brief Number of child expressions/stmts.
+ const unsigned NumChildren;
+ /// \brief Offset from this to the start of clauses.
+ /// There are NumClauses pointers to clauses, they are followed by
+ /// NumChildren pointers to child stmts/exprs (if the directive type
+ /// requires an associated stmt, then it has to be the first of them).
+ const unsigned ClausesOffset;
+
+ /// \brief Get the clauses storage.
+ llvm::MutableArrayRef<OMPClause *> getClauses() {
+ OMPClause **ClauseStorage = reinterpret_cast<OMPClause **>(
+ reinterpret_cast<char *>(this) + ClausesOffset);
+ return llvm::MutableArrayRef<OMPClause *>(ClauseStorage, NumClauses);
+ }
protected:
/// \brief Build instance of directive of class \a K.
@@ -54,15 +66,11 @@
template <typename T>
OMPExecutableDirective(const T *, StmtClass SC, OpenMPDirectiveKind K,
SourceLocation StartLoc, SourceLocation EndLoc,
- unsigned NumClauses, unsigned NumberOfExpressions)
+ unsigned NumClauses, unsigned NumChildren)
: Stmt(SC), Kind(K), StartLoc(StartLoc), EndLoc(EndLoc),
- Clauses(reinterpret_cast<OMPClause **>(
- reinterpret_cast<char *>(this) +
- llvm::RoundUpToAlignment(sizeof(T),
- llvm::alignOf<OMPClause *>())),
- NumClauses),
- StmtAndExpressions(reinterpret_cast<Stmt **>(Clauses.end()),
- NumberOfExpressions) {}
+ NumClauses(NumClauses), NumChildren(NumChildren),
+ ClausesOffset(llvm::RoundUpToAlignment(sizeof(T),
+ llvm::alignOf<OMPClause *>())) {}
/// \brief Sets the list of variables for this clause.
///
@@ -74,7 +82,7 @@
///
/// /param S Associated statement.
///
- void setAssociatedStmt(Stmt *S) { StmtAndExpressions[0] = S; }
+ void setAssociatedStmt(Stmt *S) { *child_begin() = S; }
public:
/// \brief Returns starting location of directive kind.
@@ -94,19 +102,16 @@
void setLocEnd(SourceLocation Loc) { EndLoc = Loc; }
/// \brief Get number of clauses.
- unsigned getNumClauses() const { return Clauses.size(); }
+ unsigned getNumClauses() const { return NumClauses; }
/// \brief Returns specified clause.
///
/// \param i Number of clause.
///
- OMPClause *getClause(unsigned i) const {
- assert(i < Clauses.size() && "index out of bound!");
- return Clauses[i];
- }
+ OMPClause *getClause(unsigned i) const { return clauses()[i]; }
/// \brief Returns statement associated with the directive.
- Stmt *getAssociatedStmt() const { return StmtAndExpressions[0]; }
+ Stmt *getAssociatedStmt() const { return const_cast<Stmt *>(*child_begin()); }
OpenMPDirectiveKind getDirectiveKind() const { return Kind; }
@@ -116,12 +121,19 @@
}
child_range children() {
- return child_range(StmtAndExpressions.begin(), StmtAndExpressions.end());
+ Stmt **ChildStorage = reinterpret_cast<Stmt **>(getClauses().end());
+ return child_range(ChildStorage, ChildStorage + NumChildren);
}
- ArrayRef<OMPClause *> clauses() { return Clauses; }
+ ArrayRef<OMPClause *> clauses() {
+ return ArrayRef<OMPClause *>(getClauses().begin(), NumClauses);
+ }
- ArrayRef<OMPClause *> clauses() const { return Clauses; }
+ ArrayRef<OMPClause *> clauses() const {
+ OMPClause *const *ClauseStorage = reinterpret_cast<OMPClause *const *>(
+ reinterpret_cast<const char *>(this) + ClausesOffset);
+ return ArrayRef<OMPClause *>(ClauseStorage, NumClauses);
+ }
};
/// \brief This represents '#pragma omp parallel' directive.
@@ -150,8 +162,8 @@
///
explicit OMPParallelDirective(unsigned NumClauses)
: OMPExecutableDirective(this, OMPParallelDirectiveClass, OMPD_parallel,
- SourceLocation(), SourceLocation(),
- NumClauses, 1) {}
+ SourceLocation(), SourceLocation(), NumClauses,
+ 1) {}
public:
/// \brief Creates directive with a list of \a Clauses.
@@ -172,8 +184,7 @@
/// \param NumClauses Number of clauses.
///
static OMPParallelDirective *CreateEmpty(const ASTContext &C,
- unsigned NumClauses,
- EmptyShell);
+ unsigned NumClauses, EmptyShell);
static bool classof(const Stmt *T) {
return T->getStmtClass() == OMPParallelDirectiveClass;
@@ -201,21 +212,22 @@
/// \param NumClauses Number of clauses.
///
OMPSimdDirective(SourceLocation StartLoc, SourceLocation EndLoc,
- unsigned CollapsedNum, unsigned NumClauses)
- : OMPExecutableDirective(this, OMPSimdDirectiveClass, OMPD_simd,
- StartLoc, EndLoc, NumClauses, 1),
- CollapsedNum(CollapsedNum) { }
+ unsigned CollapsedNum, unsigned NumClauses)
+ : OMPExecutableDirective(this, OMPSimdDirectiveClass, OMPD_simd, StartLoc,
+ EndLoc, NumClauses, 1),
+ CollapsedNum(CollapsedNum) {}
/// \brief Build an empty directive.
///
/// \param CollapsedNum Number of collapsed nested loops.
/// \param NumClauses Number of clauses.
///
explicit OMPSimdDirective(unsigned CollapsedNum, unsigned NumClauses)
- : OMPExecutableDirective(this, OMPSimdDirectiveClass, OMPD_simd,
- SourceLocation(), SourceLocation(),
- NumClauses, 1),
- CollapsedNum(CollapsedNum) { }
+ : OMPExecutableDirective(this, OMPSimdDirectiveClass, OMPD_simd,
+ SourceLocation(), SourceLocation(), NumClauses,
+ 1),
+ CollapsedNum(CollapsedNum) {}
+
public:
/// \brief Creates directive with a list of \a Clauses.
///
@@ -225,8 +237,7 @@
/// \param Clauses List of clauses.
/// \param AssociatedStmt Statement, associated with the directive.
///
- static OMPSimdDirective *Create(const ASTContext &C,
- SourceLocation StartLoc,
+ static OMPSimdDirective *Create(const ASTContext &C, SourceLocation StartLoc,
SourceLocation EndLoc,
ArrayRef<OMPClause *> Clauses,
Stmt *AssociatedStmt);
@@ -238,10 +249,8 @@
/// \param CollapsedNum Number of collapsed nested loops.
/// \param NumClauses Number of clauses.
///
- static OMPSimdDirective *CreateEmpty(const ASTContext &C,
- unsigned NumClauses,
- unsigned CollapsedNum,
- EmptyShell);
+ static OMPSimdDirective *CreateEmpty(const ASTContext &C, unsigned NumClauses,
+ unsigned CollapsedNum, EmptyShell);
unsigned getCollapsedNumber() const { return CollapsedNum; }
Index: lib/AST/Stmt.cpp
===================================================================
--- lib/AST/Stmt.cpp
+++ lib/AST/Stmt.cpp
@@ -1194,9 +1194,9 @@
}
void OMPExecutableDirective::setClauses(ArrayRef<OMPClause *> Clauses) {
- assert(Clauses.size() == this->Clauses.size() &&
+ assert(Clauses.size() == getNumClauses() &&
"Number of clauses is not the same as the preallocated buffer");
- std::copy(Clauses.begin(), Clauses.end(), this->Clauses.begin());
+ std::copy(Clauses.begin(), Clauses.end(), getClauses().begin());
}
OMPParallelDirective *OMPParallelDirective::Create(
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D2977.1.patch
Type: text/x-patch
Size: 8306 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140306/e373bded/attachment.bin>
More information about the cfe-commits
mailing list