Commit 86862232 authored by Michael Kruse's avatar Michael Kruse
Browse files

Some cleanup

parent 7d370766

clang/include/clang/AST/OpenMPClause.h

+94 −94
Original line number Diff line number Diff line
@@ -792,6 +792,100 @@ public: 
  }

};



/// This represents the 'sizes' clause in the '#pragma omp tile' directive.

///

/// \code

/// #pragma omp tile sizes(5,5)

/// for (int i = 0; i < 64; ++i)

///   for (int j = 0; j < 64; ++j)

/// \endcode

class OMPSizesClause final

    : public OMPClause,

      private llvm::TrailingObjects<OMPSizesClause, Expr *> {

  friend class OMPClauseReader;

  friend class llvm::TrailingObjects<OMPSizesClause, Expr *>;



  /// Location of '('.

  SourceLocation LParenLoc;



  /// Number of tile sizes in the clause.

  unsigned NumSizes;



  /// Build an empty clause.

  explicit OMPSizesClause(int NumSizes)

      : OMPClause(llvm::omp::OMPC_sizes, SourceLocation(), SourceLocation()),

        NumSizes(NumSizes) {}



public:

  /// Build a 'sizes' AST node.

  ///

  /// \param C         Context of the AST.

  /// \param StartLoc  Location of the 'sizes' identifier.

  /// \param LParenLoc Location of '('.

  /// \param EndLoc    Location of ')'.

  /// \param Sizes     Content of the clause.

  static OMPSizesClause *Create(const ASTContext &C, SourceLocation StartLoc,

                                SourceLocation LParenLoc, SourceLocation EndLoc,

                                ArrayRef<Expr *> Sizes);



  /// Build an empty 'sizes' AST node for deserialization.

  ///

  /// \param C     Context of the AST.

  /// \param Sizes Number of items in the clause.

  static OMPSizesClause *CreateEmpty(const ASTContext &C, unsigned NumSizes);



  /// Sets the location of '('.

  void setLParenLoc(SourceLocation Loc) { LParenLoc = Loc; }



  /// Returns the location of '('.

  SourceLocation getLParenLoc() const { return LParenLoc; }



  /// Returns the number of list items.

  unsigned getNumSizes() const { return NumSizes; }



  /// Returns the tile size expressions.

  MutableArrayRef<Expr *> getSizesRefs() {

    return MutableArrayRef<Expr *>(static_cast<OMPSizesClause *>(this)

                                       ->template getTrailingObjects<Expr *>(),

                                   NumSizes);

  }

  ArrayRef<Expr *> getSizesRefs() const {

    return ArrayRef<Expr *>(static_cast<const OMPSizesClause *>(this)

                                ->template getTrailingObjects<Expr *>(),

                            NumSizes);

  }



  /// Sets the tile size expressions.

  void setSizesRefs(ArrayRef<Expr *> VL) {

    assert(VL.size() == NumSizes);

    std::copy(VL.begin(), VL.end(),

              static_cast<OMPSizesClause *>(this)

                  ->template getTrailingObjects<Expr *>());

  }



  child_range children() {

    MutableArrayRef<Expr *> Sizes = getSizesRefs();

    return child_range(reinterpret_cast<Stmt **>(Sizes.begin()),

                       reinterpret_cast<Stmt **>(Sizes.end()));

  }

  const_child_range children() const {

    ArrayRef<Expr *> Sizes = getSizesRefs();

    return const_child_range(reinterpret_cast<Stmt *const *>(Sizes.begin()),

                             reinterpret_cast<Stmt *const *>(Sizes.end()));

  }



  child_range used_children() {

    return child_range(child_iterator(), child_iterator());

  }

  const_child_range used_children() const {

    return const_child_range(const_child_iterator(), const_child_iterator());

  }



  static bool classof(const OMPClause *T) {

    return T->getClauseKind() == llvm::omp::OMPC_sizes;

  }

};



/// This represents 'collapse' clause in the '#pragma omp ...'

/// directive.

///
@@ -7533,100 +7627,6 @@ public: 
  }

};



/// This represents the 'sizes' clause in the '#pragma omp tile' directive.

///

/// \code

/// #pragma omp tile sizes(5,5)

/// for (int i = 0; i < 64; ++i)

///   for (int j = 0; j < 64; ++j)

/// \endcode

class OMPSizesClause final

    : public OMPClause,

      private llvm::TrailingObjects<OMPSizesClause, Expr *> {

  friend class OMPClauseReader;

  friend class llvm::TrailingObjects<OMPSizesClause, Expr *>;



  /// Location of '('.

  SourceLocation LParenLoc;



  /// Number of tile sizes in the clause.

  unsigned NumSizes;



  /// Build an empty clause.

  explicit OMPSizesClause(int NumSizes)

      : OMPClause(llvm::omp::OMPC_sizes, SourceLocation(), SourceLocation()),

        NumSizes(NumSizes) {}



public:

  /// Build a 'sizes' AST node.

  ///

  /// \param C         Context of the AST.

  /// \param StartLoc  Location of the 'sizes' identifier.

  /// \param LParenLoc Location of '('.

  /// \param EndLoc    Location of ')'.

  /// \param Sizes     Content of the clause.

  static OMPSizesClause *Create(const ASTContext &C, SourceLocation StartLoc,

                                SourceLocation LParenLoc, SourceLocation EndLoc,

                                ArrayRef<Expr *> Sizes);



  /// Build an empty 'sizes' AST node for deserialization.

  ///

  /// \param C     Context of the AST.

  /// \param Sizes Number of items in the clause.

  static OMPSizesClause *CreateEmpty(const ASTContext &C, unsigned NumSizes);



  /// Sets the location of '('.

  void setLParenLoc(SourceLocation Loc) { LParenLoc = Loc; }



  /// Returns the location of '('.

  SourceLocation getLParenLoc() const { return LParenLoc; }



  /// Returns the number of list items.

  unsigned getNumSizes() const { return NumSizes; }



  /// Returns the tile size expressions.

  MutableArrayRef<Expr *> getSizesRefs() {

    return MutableArrayRef<Expr *>(static_cast<OMPSizesClause *>(this)

                                       ->template getTrailingObjects<Expr *>(),

                                   NumSizes);

  }

  ArrayRef<Expr *> getSizesRefs() const {

    return ArrayRef<Expr *>(static_cast<const OMPSizesClause *>(this)

                                ->template getTrailingObjects<Expr *>(),

                            NumSizes);

  }



  /// Sets the tile size expressions.

  void setSizesRefs(ArrayRef<Expr *> VL) {

    assert(VL.size() == NumSizes);

    std::copy(VL.begin(), VL.end(),

              static_cast<OMPSizesClause *>(this)

                  ->template getTrailingObjects<Expr *>());

  }



  child_range children() {

    MutableArrayRef<Expr *> Sizes = getSizesRefs();

    return child_range(reinterpret_cast<Stmt **>(Sizes.begin()),

                       reinterpret_cast<Stmt **>(Sizes.end()));

  }

  const_child_range children() const {

    ArrayRef<Expr *> Sizes = getSizesRefs();

    return const_child_range(reinterpret_cast<Stmt *const *>(Sizes.begin()),

                             reinterpret_cast<Stmt *const *>(Sizes.end()));

  }



  child_range used_children() {

    return child_range(child_iterator(), child_iterator());

  }

  const_child_range used_children() const {

    return const_child_range(const_child_iterator(), const_child_iterator());

  }



  static bool classof(const OMPClause *T) {

    return T->getClauseKind() == llvm::omp::OMPC_sizes;

  }

};



/// This class implements a simple visitor for OMPClause

/// subclasses.

template<class ImplClass, template <typename> class Ptr, typename RetTy>

clang/include/clang/AST/RecursiveASTVisitor.h

+12 −12
Original line number Diff line number Diff line
@@ -15,16 +15,16 @@ 


#include "clang/AST/Attr.h"

#include "clang/AST/Decl.h"

#include "clang/AST/DeclarationName.h"

#include "clang/AST/DeclBase.h"

#include "clang/AST/DeclCXX.h"

#include "clang/AST/DeclFriend.h"

#include "clang/AST/DeclObjC.h"

#include "clang/AST/DeclOpenMP.h"

#include "clang/AST/DeclTemplate.h"

#include "clang/AST/DeclarationName.h"

#include "clang/AST/Expr.h"

#include "clang/AST/ExprCXX.h"

#include "clang/AST/ExprConcepts.h"

#include "clang/AST/ExprCXX.h"

#include "clang/AST/ExprObjC.h"

#include "clang/AST/ExprOpenMP.h"

#include "clang/AST/LambdaCapture.h"
@@ -2832,6 +2832,9 @@ DEF_TRAVERSE_STMT(OMPParallelDirective, 
DEF_TRAVERSE_STMT(OMPSimdDirective,

                  { TRY_TO(TraverseOMPExecutableDirective(S)); })



DEF_TRAVERSE_STMT(OMPTileDirective,

                  { TRY_TO(TraverseOMPExecutableDirective(S)); })



DEF_TRAVERSE_STMT(OMPForDirective,

                  { TRY_TO(TraverseOMPExecutableDirective(S)); })
@@ -2990,9 +2993,6 @@ DEF_TRAVERSE_STMT(OMPTargetTeamsDistributeParallelForSimdDirective, 
DEF_TRAVERSE_STMT(OMPTargetTeamsDistributeSimdDirective,

                  { TRY_TO(TraverseOMPExecutableDirective(S)); })



DEF_TRAVERSE_STMT(OMPTileDirective,

                  { TRY_TO(TraverseOMPExecutableDirective(S)); })



// OpenMP clauses.

template <typename Derived>

bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) {
@@ -3074,6 +3074,13 @@ bool RecursiveASTVisitor<Derived>::VisitOMPSimdlenClause(OMPSimdlenClause *C) { 
  return true;

}



template <typename Derived>

bool RecursiveASTVisitor<Derived>::VisitOMPSizesClause(OMPSizesClause *C) {

  for (Expr *E : C->getSizesRefs())

    TRY_TO(TraverseStmt(E));

  return true;

}



template <typename Derived>

bool

RecursiveASTVisitor<Derived>::VisitOMPCollapseClause(OMPCollapseClause *C) {
@@ -3565,13 +3572,6 @@ bool RecursiveASTVisitor<Derived>::VisitOMPOrderClause(OMPOrderClause *) { 
  return true;

}



template <typename Derived>

bool RecursiveASTVisitor<Derived>::VisitOMPSizesClause(OMPSizesClause *C) {

  for (Expr *E : C->getSizesRefs())

    TRY_TO(TraverseStmt(E));

  return true;

}



template <typename Derived>

bool RecursiveASTVisitor<Derived>::VisitOMPDetachClause(OMPDetachClause *C) {

  TRY_TO(TraverseStmt(C->getEventHandler()));

clang/include/clang/Basic/OpenMPKinds.def

+0 −7
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ 
#ifndef OPENMP_REDUCTION_MODIFIER

#define OPENMP_REDUCTION_MODIFIER(Name)

#endif

#ifndef OPENMP_TILE_CLAUSE

#  define OPENMP_TILE_CLAUSE(Name)

#endif



// Static attributes for 'schedule' clause.

OPENMP_SCHEDULE_KIND(static)
@@ -153,9 +150,6 @@ OPENMP_REDUCTION_MODIFIER(default) 
OPENMP_REDUCTION_MODIFIER(inscan)

OPENMP_REDUCTION_MODIFIER(task)



// Clauses allowed for directive 'omp tile'.

OPENMP_TILE_CLAUSE(sizes)



#undef OPENMP_REDUCTION_MODIFIER

#undef OPENMP_DEVICE_MODIFIER

#undef OPENMP_ORDER_KIND
@@ -174,4 +168,3 @@ OPENMP_TILE_CLAUSE(sizes) 
#undef OPENMP_DEFAULTMAP_KIND

#undef OPENMP_DEFAULTMAP_MODIFIER

#undef OPENMP_TILE_CLAUSE

clang/include/clang/Basic/OpenMPKinds.h

+0 −6
Original line number Diff line number Diff line
@@ -156,12 +156,6 @@ enum OpenMPOrderClauseKind { 
  OMPC_ORDER_unknown,

};



enum OpenMPTileClauseKind {

#define OPENMP_TILE_KIND(Name) OMPC_TILE_##Name,

#include "clang/Basic/OpenMPKinds.def"

  OMPC_TILE_unknown,

};



/// Scheduling data for loop-based OpenMP directives.

struct OpenMPScheduleTy final {

  OpenMPScheduleClauseKind Schedule = OMPC_SCHEDULE_unknown;

clang/include/clang/Basic/StmtNodes.td

+1 −1
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ def OMPExecutableDirective : StmtNode<Stmt, 1>; 
def OMPLoopDirective : StmtNode<OMPExecutableDirective, 1>;

def OMPParallelDirective : StmtNode<OMPExecutableDirective>;

def OMPSimdDirective : StmtNode<OMPLoopDirective>;

def OMPTileDirective : StmtNode<OMPLoopDirective>;

def OMPForDirective : StmtNode<OMPLoopDirective>;

def OMPForSimdDirective : StmtNode<OMPLoopDirective>;

def OMPSectionsDirective : StmtNode<OMPExecutableDirective>;
@@ -272,4 +273,3 @@ def OMPTargetTeamsDistributeDirective : StmtNode<OMPLoopDirective>; 
def OMPTargetTeamsDistributeParallelForDirective : StmtNode<OMPLoopDirective>;

def OMPTargetTeamsDistributeParallelForSimdDirective : StmtNode<OMPLoopDirective>;

def OMPTargetTeamsDistributeSimdDirective : StmtNode<OMPLoopDirective>;
 
def OMPTileDirective : StmtNode<OMPLoopDirective>;