Skip to content

Commit ff24e9a

Browse files
erichkeaneerichkeane
committed
[OpenACC] Implement 'default_async' sema
A fairly simple one, only valid on the 'set' construct, this clause takes an int expression. Most of the work was already done as a part of parsing, so this patch ends up being a lot of infrastructure.
1 parent 21c785d commit ff24e9a

21 files changed

+153
-52
lines changed

‎clang/include/clang/AST/OpenACCClause.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,19 @@ class OpenACCDeviceNumClause : public OpenACCClauseWithSingleIntExpr {
633633
SourceLocation EndLoc);
634634
};
635635

636+
class OpenACCDefaultAsyncClause : public OpenACCClauseWithSingleIntExpr {
637+
OpenACCDefaultAsyncClause(SourceLocation BeginLoc, SourceLocation LParenLoc,
638+
Expr *IntExpr, SourceLocation EndLoc);
639+
640+
public:
641+
static bool classof(const OpenACCClause *C) {
642+
return C->getClauseKind() == OpenACCClauseKind::DefaultAsync;
643+
}
644+
static OpenACCDefaultAsyncClause *
645+
Create(const ASTContext &C, SourceLocation BeginLoc, SourceLocation LParenLoc,
646+
Expr *IntExpr, SourceLocation EndLoc);
647+
};
648+
636649
/// Represents a 'collapse' clause on a 'loop' construct. This clause takes an
637650
/// integer constant expression 'N' that represents how deep to collapse the
638651
/// construct. It also takes an optional 'force' tag that permits intervening

‎clang/include/clang/Basic/OpenACCClauses.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ VISIT_CLAUSE(Create)
3838
CLAUSE_ALIAS(PCreate, Create, true)
3939
CLAUSE_ALIAS(PresentOrCreate, Create, true)
4040
VISIT_CLAUSE(Default)
41+
VISIT_CLAUSE(DefaultAsync)
4142
VISIT_CLAUSE(Delete)
4243
VISIT_CLAUSE(Detach)
4344
VISIT_CLAUSE(DeviceNum)

‎clang/include/clang/Sema/SemaOpenACC.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ class SemaOpenACC : public SemaBase {
297297
ClauseKind == OpenACCClauseKind::NumWorkers ||
298298
ClauseKind == OpenACCClauseKind::Async ||
299299
ClauseKind == OpenACCClauseKind::DeviceNum ||
300+
ClauseKind == OpenACCClauseKind::DefaultAsync ||
300301
ClauseKind == OpenACCClauseKind::Tile ||
301302
ClauseKind == OpenACCClauseKind::Worker ||
302303
ClauseKind == OpenACCClauseKind::Vector ||
@@ -349,6 +350,7 @@ class SemaOpenACC : public SemaBase {
349350
ClauseKind == OpenACCClauseKind::NumWorkers ||
350351
ClauseKind == OpenACCClauseKind::Async ||
351352
ClauseKind == OpenACCClauseKind::DeviceNum ||
353+
ClauseKind == OpenACCClauseKind::DefaultAsync ||
352354
ClauseKind == OpenACCClauseKind::Tile ||
353355
ClauseKind == OpenACCClauseKind::Gang ||
354356
ClauseKind == OpenACCClauseKind::Worker ||
@@ -486,6 +488,7 @@ class SemaOpenACC : public SemaBase {
486488
ClauseKind == OpenACCClauseKind::NumWorkers ||
487489
ClauseKind == OpenACCClauseKind::Async ||
488490
ClauseKind == OpenACCClauseKind::DeviceNum ||
491+
ClauseKind == OpenACCClauseKind::DefaultAsync ||
489492
ClauseKind == OpenACCClauseKind::Tile ||
490493
ClauseKind == OpenACCClauseKind::Worker ||
491494
ClauseKind == OpenACCClauseKind::Vector ||
@@ -498,6 +501,7 @@ class SemaOpenACC : public SemaBase {
498501
ClauseKind == OpenACCClauseKind::NumWorkers ||
499502
ClauseKind == OpenACCClauseKind::Async ||
500503
ClauseKind == OpenACCClauseKind::DeviceNum ||
504+
ClauseKind == OpenACCClauseKind::DefaultAsync ||
501505
ClauseKind == OpenACCClauseKind::Tile ||
502506
ClauseKind == OpenACCClauseKind::Worker ||
503507
ClauseKind == OpenACCClauseKind::Vector ||

‎clang/lib/AST/OpenACCClause.cpp‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ bool OpenACCClauseWithSingleIntExpr::classof(const OpenACCClause *C) {
4747
return OpenACCNumWorkersClause::classof(C) ||
4848
OpenACCVectorLengthClause::classof(C) ||
4949
OpenACCDeviceNumClause::classof(C) ||
50+
OpenACCDefaultAsyncClause::classof(C) ||
5051
OpenACCVectorClause::classof(C) || OpenACCWorkerClause::classof(C) ||
5152
OpenACCCollapseClause::classof(C) || OpenACCAsyncClause::classof(C);
5253
}
@@ -239,6 +240,27 @@ OpenACCDeviceNumClause *OpenACCDeviceNumClause::Create(const ASTContext &C,
239240
return new (Mem) OpenACCDeviceNumClause(BeginLoc, LParenLoc, IntExpr, EndLoc);
240241
}
241242

243+
OpenACCDefaultAsyncClause::OpenACCDefaultAsyncClause(SourceLocation BeginLoc,
244+
SourceLocation LParenLoc,
245+
Expr *IntExpr,
246+
SourceLocation EndLoc)
247+
: OpenACCClauseWithSingleIntExpr(OpenACCClauseKind::DefaultAsync, BeginLoc,
248+
LParenLoc, IntExpr, EndLoc) {
249+
assert((IntExpr->isInstantiationDependent() ||
250+
IntExpr->getType()->isIntegerType()) &&
251+
"default_async expression type not scalar/dependent");
252+
}
253+
254+
OpenACCDefaultAsyncClause *
255+
OpenACCDefaultAsyncClause::Create(const ASTContext &C, SourceLocation BeginLoc,
256+
SourceLocation LParenLoc, Expr *IntExpr,
257+
SourceLocation EndLoc) {
258+
void *Mem = C.Allocate(sizeof(OpenACCDefaultAsyncClause),
259+
alignof(OpenACCDefaultAsyncClause));
260+
return new (Mem)
261+
OpenACCDefaultAsyncClause(BeginLoc, LParenLoc, IntExpr, EndLoc);
262+
}
263+
242264
OpenACCWaitClause *OpenACCWaitClause::Create(
243265
const ASTContext &C, SourceLocation BeginLoc, SourceLocation LParenLoc,
244266
Expr *DevNumExpr, SourceLocation QueuesLoc, ArrayRef<Expr *> QueueIdExprs,
@@ -575,6 +597,13 @@ void OpenACCClausePrinter::VisitDeviceNumClause(
575597
OS << ")";
576598
}
577599

600+
void OpenACCClausePrinter::VisitDefaultAsyncClause(
601+
const OpenACCDefaultAsyncClause &C) {
602+
OS << "default_async(";
603+
printExpr(C.getIntExpr());
604+
OS << ")";
605+
}
606+
578607
void OpenACCClausePrinter::VisitAsyncClause(const OpenACCAsyncClause &C) {
579608
OS << "async";
580609
if (C.hasIntExpr()) {

‎clang/lib/AST/StmtProfile.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2650,6 +2650,11 @@ void OpenACCClauseProfiler::VisitDeviceNumClause(
26502650
Profiler.VisitStmt(Clause.getIntExpr());
26512651
}
26522652

2653+
void OpenACCClauseProfiler::VisitDefaultAsyncClause(
2654+
const OpenACCDefaultAsyncClause &Clause) {
2655+
Profiler.VisitStmt(Clause.getIntExpr());
2656+
}
2657+
26532658
void OpenACCClauseProfiler::VisitWorkerClause(
26542659
const OpenACCWorkerClause &Clause) {
26552660
if (Clause.hasIntExpr())

‎clang/lib/AST/TextNodeDumper.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ void TextNodeDumper::Visit(const OpenACCClause *C) {
414414
case OpenACCClauseKind::Detach:
415415
case OpenACCClauseKind::Delete:
416416
case OpenACCClauseKind::DeviceNum:
417+
case OpenACCClauseKind::DefaultAsync:
417418
case OpenACCClauseKind::DevicePtr:
418419
case OpenACCClauseKind::Finalize:
419420
case OpenACCClauseKind::FirstPrivate:

‎clang/lib/Parse/ParseOpenACC.cpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,13 +1082,7 @@ Parser::OpenACCClauseParseResult Parser::ParseOpenACCClauseParams(
10821082
return OpenACCCanContinue();
10831083
}
10841084

1085-
// TODO OpenACC: as we implement the 'rest' of the above, this 'if' should
1086-
// be removed leaving just the 'setIntExprDetails'.
1087-
if (ClauseKind == OpenACCClauseKind::NumWorkers ||
1088-
ClauseKind == OpenACCClauseKind::DeviceNum ||
1089-
ClauseKind == OpenACCClauseKind::VectorLength)
1090-
ParsedClause.setIntExprDetails(IntExpr.get());
1091-
1085+
ParsedClause.setIntExprDetails(IntExpr.get());
10921086
break;
10931087
}
10941088
case OpenACCClauseKind::DType:

‎clang/lib/Sema/SemaOpenACC.cpp‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,14 @@ bool doesClauseApplyToDirective(OpenACCDirectiveKind DirectiveKind,
463463
return false;
464464
}
465465
}
466+
case OpenACCClauseKind::DefaultAsync: {
467+
switch (DirectiveKind) {
468+
case OpenACCDirectiveKind::Set:
469+
return true;
470+
default:
471+
return false;
472+
}
473+
}
466474
}
467475

468476
default:
@@ -977,6 +985,20 @@ OpenACCClause *SemaOpenACCClauseVisitor::VisitDeviceNumClause(
977985
Clause.getEndLoc());
978986
}
979987

988+
OpenACCClause *SemaOpenACCClauseVisitor::VisitDefaultAsyncClause(
989+
SemaOpenACC::OpenACCParsedClause &Clause) {
990+
// OpenACC 3.3 2.14.3: Two instances of the same clause may not appear on the
991+
// same directive.
992+
if (checkAlreadyHasClauseOfKind(SemaRef, ExistingClauses, Clause))
993+
return nullptr;
994+
995+
assert(Clause.getNumIntExprs() == 1 &&
996+
"Invalid number of expressions for default_async");
997+
return OpenACCDefaultAsyncClause::Create(
998+
Ctx, Clause.getBeginLoc(), Clause.getLParenLoc(), Clause.getIntExprs()[0],
999+
Clause.getEndLoc());
1000+
}
1001+
9801002
OpenACCClause *SemaOpenACCClauseVisitor::VisitPrivateClause(
9811003
SemaOpenACC::OpenACCParsedClause &Clause) {
9821004
// ActOnVar ensured that everything is a valid variable reference, so there
@@ -3681,12 +3703,9 @@ bool SemaOpenACC::ActOnStartStmtDirective(
36813703
if (K == OpenACCDirectiveKind::Set &&
36823704
llvm::find_if(
36833705
Clauses,
3684-
llvm::IsaPred</*OpenACCDefaultAsyncClause,*/ // TODO: ERICH Need to
3685-
// implement.
3686-
// DefaultAsyncClause
3687-
// then enable this.
3688-
OpenACCDeviceNumClause, OpenACCDeviceTypeClause,
3689-
OpenACCIfClause>) == Clauses.end())
3706+
llvm::IsaPred<OpenACCDefaultAsyncClause, OpenACCDeviceNumClause,
3707+
OpenACCDeviceTypeClause, OpenACCIfClause>) ==
3708+
Clauses.end())
36903709
return Diag(StartLoc, diag::err_acc_construct_one_clause_of)
36913710
<< K
36923711
<< GetListOfClauses({OpenACCClauseKind::DefaultAsync,

‎clang/lib/Sema/TreeTransform.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11909,6 +11909,29 @@ void OpenACCClauseTransform<Derived>::VisitDeviceNumClause (
1190911909
ParsedClause.getEndLoc());
1191011910
}
1191111911

11912+
template <typename Derived>
11913+
void OpenACCClauseTransform<Derived>::VisitDefaultAsyncClause(
11914+
const OpenACCDefaultAsyncClause &C) {
11915+
Expr *IntExpr = const_cast<Expr *>(C.getIntExpr());
11916+
assert(IntExpr && "default_async clause constructed with invalid int expr");
11917+
11918+
ExprResult Res = Self.TransformExpr(IntExpr);
11919+
if (!Res.isUsable())
11920+
return;
11921+
11922+
Res = Self.getSema().OpenACC().ActOnIntExpr(OpenACCDirectiveKind::Invalid,
11923+
C.getClauseKind(),
11924+
C.getBeginLoc(), Res.get());
11925+
if (!Res.isUsable())
11926+
return;
11927+
11928+
ParsedClause.setIntExprDetails(Res.get());
11929+
NewClause = OpenACCDefaultAsyncClause::Create(
11930+
Self.getSema().getASTContext(), ParsedClause.getBeginLoc(),
11931+
ParsedClause.getLParenLoc(), ParsedClause.getIntExprs()[0],
11932+
ParsedClause.getEndLoc());
11933+
}
11934+
1191211935
template <typename Derived>
1191311936
void OpenACCClauseTransform<Derived>::VisitVectorLengthClause(
1191411937
const OpenACCVectorLengthClause &C) {

‎clang/lib/Serialization/ASTReader.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12412,6 +12412,12 @@ OpenACCClause *ASTRecordReader::readOpenACCClause() {
1241212412
return OpenACCDeviceNumClause::Create(getContext(), BeginLoc, LParenLoc,
1241312413
IntExpr, EndLoc);
1241412414
}
12415+
case OpenACCClauseKind::DefaultAsync: {
12416+
SourceLocation LParenLoc = readSourceLocation();
12417+
Expr *IntExpr = readSubExpr();
12418+
return OpenACCDefaultAsyncClause::Create(getContext(), BeginLoc, LParenLoc,
12419+
IntExpr, EndLoc);
12420+
}
1241512421
case OpenACCClauseKind::VectorLength: {
1241612422
SourceLocation LParenLoc = readSourceLocation();
1241712423
Expr *IntExpr = readSubExpr();
@@ -12601,7 +12607,6 @@ OpenACCClause *ASTRecordReader::readOpenACCClause() {
1260112607
case OpenACCClauseKind::Host:
1260212608
case OpenACCClauseKind::Link:
1260312609
case OpenACCClauseKind::Bind:
12604-
case OpenACCClauseKind::DefaultAsync:
1260512610
case OpenACCClauseKind::Invalid:
1260612611
llvm_unreachable("Clause serialization not yet implemented");
1260712612
}

0 commit comments

Comments
 (0)