[clang] bdf2555 - [OpenACC] Implement 'device_num' clause sema for 'init'/'shutdown'
via cfe-commits
cfe-commits at lists.llvm.org
Thu Dec 19 12:22:00 PST 2024
Author: erichkeane
Date: 2024-12-19T12:21:51-08:00
New Revision: bdf255530821201c9febf9fdb42b91082656dc94
URL: https://github.com/llvm/llvm-project/commit/bdf255530821201c9febf9fdb42b91082656dc94
DIFF: https://github.com/llvm/llvm-project/commit/bdf255530821201c9febf9fdb42b91082656dc94.diff
LOG: [OpenACC] Implement 'device_num' clause sema for 'init'/'shutdown'
This is a very simple sema implementation, and just required AST node
plus the existing diagnostics. This patch adds tests and adds the AST
node required, plus enables it for 'init' and 'shutdown' (only!)
Added:
Modified:
clang/include/clang/AST/OpenACCClause.h
clang/include/clang/Basic/OpenACCClauses.def
clang/include/clang/Sema/SemaOpenACC.h
clang/lib/AST/OpenACCClause.cpp
clang/lib/AST/StmtProfile.cpp
clang/lib/AST/TextNodeDumper.cpp
clang/lib/Parse/ParseOpenACC.cpp
clang/lib/Sema/SemaOpenACC.cpp
clang/lib/Sema/TreeTransform.h
clang/lib/Serialization/ASTReader.cpp
clang/lib/Serialization/ASTWriter.cpp
clang/test/AST/ast-print-openacc-init-construct.cpp
clang/test/AST/ast-print-openacc-shutdown-construct.cpp
clang/test/ParserOpenACC/parse-clauses.c
clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c
clang/test/SemaOpenACC/combined-construct-device_type-clause.c
clang/test/SemaOpenACC/compute-construct-device_type-clause.c
clang/test/SemaOpenACC/init-construct-ast.cpp
clang/test/SemaOpenACC/init-construct.cpp
clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c
clang/test/SemaOpenACC/loop-construct-device_type-clause.c
clang/test/SemaOpenACC/shutdown-construct-ast.cpp
clang/test/SemaOpenACC/shutdown-construct.cpp
clang/tools/libclang/CIndex.cpp
Removed:
################################################################################
diff --git a/clang/include/clang/AST/OpenACCClause.h b/clang/include/clang/AST/OpenACCClause.h
index 51db58d484a25f..b4747c68a1dfd8 100644
--- a/clang/include/clang/AST/OpenACCClause.h
+++ b/clang/include/clang/AST/OpenACCClause.h
@@ -619,6 +619,20 @@ class OpenACCAsyncClause : public OpenACCClauseWithSingleIntExpr {
SourceLocation EndLoc);
};
+class OpenACCDeviceNumClause : public OpenACCClauseWithSingleIntExpr {
+ OpenACCDeviceNumClause(SourceLocation BeginLoc, SourceLocation LParenLoc,
+ Expr *IntExpr, SourceLocation EndLoc);
+
+public:
+ static bool classof(const OpenACCClause *C) {
+ return C->getClauseKind() == OpenACCClauseKind::DeviceNum;
+ }
+ static OpenACCDeviceNumClause *Create(const ASTContext &C,
+ SourceLocation BeginLoc,
+ SourceLocation LParenLoc, Expr *IntExpr,
+ SourceLocation EndLoc);
+};
+
/// Represents a 'collapse' clause on a 'loop' construct. This clause takes an
/// integer constant expression 'N' that represents how deep to collapse the
/// construct. It also takes an optional 'force' tag that permits intervening
diff --git a/clang/include/clang/Basic/OpenACCClauses.def b/clang/include/clang/Basic/OpenACCClauses.def
index c7ffac391e2026..1b619bc0dfd4c1 100644
--- a/clang/include/clang/Basic/OpenACCClauses.def
+++ b/clang/include/clang/Basic/OpenACCClauses.def
@@ -40,6 +40,7 @@ CLAUSE_ALIAS(PresentOrCreate, Create, true)
VISIT_CLAUSE(Default)
VISIT_CLAUSE(Delete)
VISIT_CLAUSE(Detach)
+VISIT_CLAUSE(DeviceNum)
VISIT_CLAUSE(DevicePtr)
VISIT_CLAUSE(DeviceType)
CLAUSE_ALIAS(DType, DeviceType, false)
diff --git a/clang/include/clang/Sema/SemaOpenACC.h b/clang/include/clang/Sema/SemaOpenACC.h
index 04ab1ac429a2dd..addc33bf3c76bd 100644
--- a/clang/include/clang/Sema/SemaOpenACC.h
+++ b/clang/include/clang/Sema/SemaOpenACC.h
@@ -296,13 +296,15 @@ class SemaOpenACC : public SemaBase {
assert((ClauseKind == OpenACCClauseKind::NumGangs ||
ClauseKind == OpenACCClauseKind::NumWorkers ||
ClauseKind == OpenACCClauseKind::Async ||
+ ClauseKind == OpenACCClauseKind::DeviceNum ||
ClauseKind == OpenACCClauseKind::Tile ||
ClauseKind == OpenACCClauseKind::Worker ||
ClauseKind == OpenACCClauseKind::Vector ||
ClauseKind == OpenACCClauseKind::VectorLength) &&
"Parsed clause kind does not have a int exprs");
- // 'async' and 'wait' have an optional IntExpr, so be tolerant of that.
+ // 'async', 'worker', 'vector', and 'wait' have an optional IntExpr, so be
+ // tolerant of that.
if ((ClauseKind == OpenACCClauseKind::Async ||
ClauseKind == OpenACCClauseKind::Worker ||
ClauseKind == OpenACCClauseKind::Vector ||
@@ -346,6 +348,7 @@ class SemaOpenACC : public SemaBase {
assert((ClauseKind == OpenACCClauseKind::NumGangs ||
ClauseKind == OpenACCClauseKind::NumWorkers ||
ClauseKind == OpenACCClauseKind::Async ||
+ ClauseKind == OpenACCClauseKind::DeviceNum ||
ClauseKind == OpenACCClauseKind::Tile ||
ClauseKind == OpenACCClauseKind::Gang ||
ClauseKind == OpenACCClauseKind::Worker ||
@@ -482,6 +485,7 @@ class SemaOpenACC : public SemaBase {
assert((ClauseKind == OpenACCClauseKind::NumGangs ||
ClauseKind == OpenACCClauseKind::NumWorkers ||
ClauseKind == OpenACCClauseKind::Async ||
+ ClauseKind == OpenACCClauseKind::DeviceNum ||
ClauseKind == OpenACCClauseKind::Tile ||
ClauseKind == OpenACCClauseKind::Worker ||
ClauseKind == OpenACCClauseKind::Vector ||
@@ -493,6 +497,7 @@ class SemaOpenACC : public SemaBase {
assert((ClauseKind == OpenACCClauseKind::NumGangs ||
ClauseKind == OpenACCClauseKind::NumWorkers ||
ClauseKind == OpenACCClauseKind::Async ||
+ ClauseKind == OpenACCClauseKind::DeviceNum ||
ClauseKind == OpenACCClauseKind::Tile ||
ClauseKind == OpenACCClauseKind::Worker ||
ClauseKind == OpenACCClauseKind::Vector ||
diff --git a/clang/lib/AST/OpenACCClause.cpp b/clang/lib/AST/OpenACCClause.cpp
index fbc9f6d15fa7bf..d69fab5cc413cf 100644
--- a/clang/lib/AST/OpenACCClause.cpp
+++ b/clang/lib/AST/OpenACCClause.cpp
@@ -46,6 +46,7 @@ bool OpenACCClauseWithCondition::classof(const OpenACCClause *C) {
bool OpenACCClauseWithSingleIntExpr::classof(const OpenACCClause *C) {
return OpenACCNumWorkersClause::classof(C) ||
OpenACCVectorLengthClause::classof(C) ||
+ OpenACCDeviceNumClause::classof(C) ||
OpenACCVectorClause::classof(C) || OpenACCWorkerClause::classof(C) ||
OpenACCCollapseClause::classof(C) || OpenACCAsyncClause::classof(C);
}
@@ -218,6 +219,26 @@ OpenACCAsyncClause *OpenACCAsyncClause::Create(const ASTContext &C,
return new (Mem) OpenACCAsyncClause(BeginLoc, LParenLoc, IntExpr, EndLoc);
}
+OpenACCDeviceNumClause::OpenACCDeviceNumClause(SourceLocation BeginLoc,
+ SourceLocation LParenLoc, Expr *IntExpr,
+ SourceLocation EndLoc)
+ : OpenACCClauseWithSingleIntExpr(OpenACCClauseKind::DeviceNum, BeginLoc,
+ LParenLoc, IntExpr, EndLoc) {
+ assert((IntExpr->isInstantiationDependent() ||
+ IntExpr->getType()->isIntegerType()) &&
+ "device_num expression type not scalar/dependent");
+}
+
+OpenACCDeviceNumClause *OpenACCDeviceNumClause::Create(const ASTContext &C,
+ SourceLocation BeginLoc,
+ SourceLocation LParenLoc,
+ Expr *IntExpr,
+ SourceLocation EndLoc) {
+ void *Mem =
+ C.Allocate(sizeof(OpenACCDeviceNumClause), alignof(OpenACCDeviceNumClause));
+ return new (Mem) OpenACCDeviceNumClause(BeginLoc, LParenLoc, IntExpr, EndLoc);
+}
+
OpenACCWaitClause *OpenACCWaitClause::Create(
const ASTContext &C, SourceLocation BeginLoc, SourceLocation LParenLoc,
Expr *DevNumExpr, SourceLocation QueuesLoc, ArrayRef<Expr *> QueueIdExprs,
@@ -547,6 +568,13 @@ void OpenACCClausePrinter::VisitVectorLengthClause(
OS << ")";
}
+void OpenACCClausePrinter::VisitDeviceNumClause(
+ const OpenACCDeviceNumClause &C) {
+ OS << "device_num(";
+ printExpr(C.getIntExpr());
+ OS << ")";
+}
+
void OpenACCClausePrinter::VisitAsyncClause(const OpenACCAsyncClause &C) {
OS << "async";
if (C.hasIntExpr()) {
diff --git a/clang/lib/AST/StmtProfile.cpp b/clang/lib/AST/StmtProfile.cpp
index 4c4ecd791c48f2..27313f9ae12752 100644
--- a/clang/lib/AST/StmtProfile.cpp
+++ b/clang/lib/AST/StmtProfile.cpp
@@ -2645,6 +2645,11 @@ void OpenACCClauseProfiler::VisitAsyncClause(const OpenACCAsyncClause &Clause) {
Profiler.VisitStmt(Clause.getIntExpr());
}
+void OpenACCClauseProfiler::VisitDeviceNumClause(
+ const OpenACCDeviceNumClause &Clause) {
+ Profiler.VisitStmt(Clause.getIntExpr());
+}
+
void OpenACCClauseProfiler::VisitWorkerClause(
const OpenACCWorkerClause &Clause) {
if (Clause.hasIntExpr())
diff --git a/clang/lib/AST/TextNodeDumper.cpp b/clang/lib/AST/TextNodeDumper.cpp
index f9cbdf6916dcb1..018147e68aba60 100644
--- a/clang/lib/AST/TextNodeDumper.cpp
+++ b/clang/lib/AST/TextNodeDumper.cpp
@@ -413,6 +413,7 @@ void TextNodeDumper::Visit(const OpenACCClause *C) {
case OpenACCClauseKind::Independent:
case OpenACCClauseKind::Detach:
case OpenACCClauseKind::Delete:
+ case OpenACCClauseKind::DeviceNum:
case OpenACCClauseKind::DevicePtr:
case OpenACCClauseKind::Finalize:
case OpenACCClauseKind::FirstPrivate:
diff --git a/clang/lib/Parse/ParseOpenACC.cpp b/clang/lib/Parse/ParseOpenACC.cpp
index 31ec0c7c1d718d..ede409096548c2 100644
--- a/clang/lib/Parse/ParseOpenACC.cpp
+++ b/clang/lib/Parse/ParseOpenACC.cpp
@@ -1085,6 +1085,7 @@ Parser::OpenACCClauseParseResult Parser::ParseOpenACCClauseParams(
// TODO OpenACC: as we implement the 'rest' of the above, this 'if' should
// be removed leaving just the 'setIntExprDetails'.
if (ClauseKind == OpenACCClauseKind::NumWorkers ||
+ ClauseKind == OpenACCClauseKind::DeviceNum ||
ClauseKind == OpenACCClauseKind::VectorLength)
ParsedClause.setIntExprDetails(IntExpr.get());
diff --git a/clang/lib/Sema/SemaOpenACC.cpp b/clang/lib/Sema/SemaOpenACC.cpp
index 618c0f62576402..42bbdf1f3f9fa9 100644
--- a/clang/lib/Sema/SemaOpenACC.cpp
+++ b/clang/lib/Sema/SemaOpenACC.cpp
@@ -444,6 +444,17 @@ bool doesClauseApplyToDirective(OpenACCDirectiveKind DirectiveKind,
}
}
+ case OpenACCClauseKind::DeviceNum: {
+ switch (DirectiveKind) {
+ case OpenACCDirectiveKind::Init:
+ case OpenACCDirectiveKind::Shutdown:
+ case OpenACCDirectiveKind::Set:
+ return true;
+ default:
+ return false;
+ }
+ }
+
case OpenACCClauseKind::UseDevice: {
switch (DirectiveKind) {
case OpenACCDirectiveKind::HostData:
@@ -945,6 +956,20 @@ OpenACCClause *SemaOpenACCClauseVisitor::VisitAsyncClause(
Clause.getEndLoc());
}
+OpenACCClause *SemaOpenACCClauseVisitor::VisitDeviceNumClause(
+ SemaOpenACC::OpenACCParsedClause &Clause) {
+ // Restrictions only properly implemented on certain constructs, so skip/treat
+ // as unimplemented in those cases.
+ if (!isDirectiveKindImplemented(Clause.getDirectiveKind()))
+ return isNotImplemented();
+
+ assert(Clause.getNumIntExprs() == 1 &&
+ "Invalid number of expressions for device_num");
+ return OpenACCDeviceNumClause::Create(
+ Ctx, Clause.getBeginLoc(), Clause.getLParenLoc(), Clause.getIntExprs()[0],
+ Clause.getEndLoc());
+}
+
OpenACCClause *SemaOpenACCClauseVisitor::VisitPrivateClause(
SemaOpenACC::OpenACCParsedClause &Clause) {
// ActOnVar ensured that everything is a valid variable reference, so there
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 686132dbc5f5d4..5d43d98ce49e46 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -11877,6 +11877,29 @@ void OpenACCClauseTransform<Derived>::VisitNumWorkersClause(
ParsedClause.getEndLoc());
}
+template <typename Derived>
+void OpenACCClauseTransform<Derived>::VisitDeviceNumClause (
+ const OpenACCDeviceNumClause &C) {
+ Expr *IntExpr = const_cast<Expr *>(C.getIntExpr());
+ assert(IntExpr && "device_num clause constructed with invalid int expr");
+
+ ExprResult Res = Self.TransformExpr(IntExpr);
+ if (!Res.isUsable())
+ return;
+
+ Res = Self.getSema().OpenACC().ActOnIntExpr(OpenACCDirectiveKind::Invalid,
+ C.getClauseKind(),
+ C.getBeginLoc(), Res.get());
+ if (!Res.isUsable())
+ return;
+
+ ParsedClause.setIntExprDetails(Res.get());
+ NewClause = OpenACCDeviceNumClause::Create(
+ Self.getSema().getASTContext(), ParsedClause.getBeginLoc(),
+ ParsedClause.getLParenLoc(), ParsedClause.getIntExprs()[0],
+ ParsedClause.getEndLoc());
+}
+
template <typename Derived>
void OpenACCClauseTransform<Derived>::VisitVectorLengthClause(
const OpenACCVectorLengthClause &C) {
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 21f6b2ecc58c4f..15160b0751f83b 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -12405,6 +12405,12 @@ OpenACCClause *ASTRecordReader::readOpenACCClause() {
return OpenACCNumWorkersClause::Create(getContext(), BeginLoc, LParenLoc,
IntExpr, EndLoc);
}
+ case OpenACCClauseKind::DeviceNum: {
+ SourceLocation LParenLoc = readSourceLocation();
+ Expr *IntExpr = readSubExpr();
+ return OpenACCDeviceNumClause::Create(getContext(), BeginLoc, LParenLoc,
+ IntExpr, EndLoc);
+ }
case OpenACCClauseKind::VectorLength: {
SourceLocation LParenLoc = readSourceLocation();
Expr *IntExpr = readSubExpr();
@@ -12594,7 +12600,6 @@ OpenACCClause *ASTRecordReader::readOpenACCClause() {
case OpenACCClauseKind::Host:
case OpenACCClauseKind::Link:
case OpenACCClauseKind::Bind:
- case OpenACCClauseKind::DeviceNum:
case OpenACCClauseKind::DefaultAsync:
case OpenACCClauseKind::Invalid:
llvm_unreachable("Clause serialization not yet implemented");
diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
index 6db2262a7952ec..4a6027943072c0 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -8326,6 +8326,12 @@ void ASTRecordWriter::writeOpenACCClause(const OpenACCClause *C) {
AddStmt(E);
return;
}
+ case OpenACCClauseKind::DeviceNum: {
+ const auto *DNC = cast<OpenACCDeviceNumClause>(C);
+ writeSourceLocation(DNC->getLParenLoc());
+ AddStmt(const_cast<Expr*>(DNC->getIntExpr()));
+ return;
+ }
case OpenACCClauseKind::NumWorkers: {
const auto *NWC = cast<OpenACCNumWorkersClause>(C);
writeSourceLocation(NWC->getLParenLoc());
@@ -8522,7 +8528,6 @@ void ASTRecordWriter::writeOpenACCClause(const OpenACCClause *C) {
case OpenACCClauseKind::Host:
case OpenACCClauseKind::Link:
case OpenACCClauseKind::Bind:
- case OpenACCClauseKind::DeviceNum:
case OpenACCClauseKind::DefaultAsync:
case OpenACCClauseKind::Invalid:
llvm_unreachable("Clause serialization not yet implemented");
diff --git a/clang/test/AST/ast-print-openacc-init-construct.cpp b/clang/test/AST/ast-print-openacc-init-construct.cpp
index 8bee2d84118f55..0cfcbc99ab145d 100644
--- a/clang/test/AST/ast-print-openacc-init-construct.cpp
+++ b/clang/test/AST/ast-print-openacc-init-construct.cpp
@@ -3,10 +3,9 @@
unsigned Int;
void uses() {
-// CHECK: #pragma acc init device_type(*) if(Int == 5)
+// CHECK: #pragma acc init device_type(*) device_num(Int) if(Int == 5)
#pragma acc init device_type(*) device_num(Int) if (Int == 5)
-// CHECK: #pragma acc init device_type(*)
-// CHECK-NOT: device_num(Int)
+// CHECK: #pragma acc init device_type(*) device_num(Int)
#pragma acc init device_type(*) device_num(Int)
// CHECK: #pragma acc init device_type(*) if(Int == 5)
#pragma acc init device_type(*) if (Int == 5)
diff --git a/clang/test/AST/ast-print-openacc-shutdown-construct.cpp b/clang/test/AST/ast-print-openacc-shutdown-construct.cpp
index c1da69dd82a237..4e2529658d418a 100644
--- a/clang/test/AST/ast-print-openacc-shutdown-construct.cpp
+++ b/clang/test/AST/ast-print-openacc-shutdown-construct.cpp
@@ -3,10 +3,9 @@
unsigned Int;
void uses() {
-// CHECK: #pragma acc shutdown device_type(*) if(Int == 5)
+// CHECK: #pragma acc shutdown device_type(*) device_num(Int) if(Int == 5)
#pragma acc shutdown device_type(*) device_num(Int) if (Int == 5)
-// CHECK: #pragma acc shutdown device_type(*)
-// CHECK-NOT: device_num(Int)
+// CHECK: #pragma acc shutdown device_type(*) device_num(Int)
#pragma acc shutdown device_type(*) device_num(Int)
// CHECK: #pragma acc shutdown device_type(*) if(Int == 5)
#pragma acc shutdown device_type(*) if (Int == 5)
diff --git a/clang/test/ParserOpenACC/parse-clauses.c b/clang/test/ParserOpenACC/parse-clauses.c
index 7bd8edcee3db84..8a404a5a1987d4 100644
--- a/clang/test/ParserOpenACC/parse-clauses.c
+++ b/clang/test/ParserOpenACC/parse-clauses.c
@@ -816,10 +816,8 @@ void IntExprParsing() {
// expected-note at +1{{to match this '('}}
#pragma acc init device_num(5, 4)
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented, clause ignored}}
#pragma acc init device_num(5)
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented, clause ignored}}
#pragma acc init device_num(returns_int())
// expected-error at +2{{expected '('}}
diff --git a/clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c b/clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c
index a71d25ce61bed4..f37c1d7e729280 100644
--- a/clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c
+++ b/clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c
@@ -134,7 +134,7 @@ void uses() {
for(unsigned i = 0; i < 5; ++i);
#pragma acc parallel loop auto num_workers(1)
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'parallel loop' directive}}
#pragma acc parallel loop auto device_num(1)
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -251,7 +251,7 @@ void uses() {
for(unsigned i = 0; i < 5; ++i);
#pragma acc parallel loop num_workers(1) auto
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'parallel loop' directive}}
#pragma acc parallel loop device_num(1) auto
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -369,7 +369,7 @@ void uses() {
for(unsigned i = 0; i < 5; ++i);
#pragma acc parallel loop independent num_workers(1)
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'parallel loop' directive}}
#pragma acc parallel loop independent device_num(1)
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -486,7 +486,7 @@ void uses() {
for(unsigned i = 0; i < 5; ++i);
#pragma acc parallel loop num_workers(1) independent
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'parallel loop' directive}}
#pragma acc parallel loop device_num(1) independent
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -612,7 +612,7 @@ void uses() {
for(unsigned i = 0; i < 5; ++i);
#pragma acc parallel loop seq num_workers(1)
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'parallel loop' directive}}
#pragma acc parallel loop seq device_num(1)
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -735,7 +735,7 @@ void uses() {
for(unsigned i = 0; i < 5; ++i);
#pragma acc parallel loop num_workers(1) seq
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'parallel loop' directive}}
#pragma acc parallel loop device_num(1) seq
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
diff --git a/clang/test/SemaOpenACC/combined-construct-device_type-clause.c b/clang/test/SemaOpenACC/combined-construct-device_type-clause.c
index 40339941f51a9c..50612c2a4685e5 100644
--- a/clang/test/SemaOpenACC/combined-construct-device_type-clause.c
+++ b/clang/test/SemaOpenACC/combined-construct-device_type-clause.c
@@ -190,8 +190,7 @@ void uses() {
for(int i = 0; i < 5; ++i);
#pragma acc parallel loop device_type(*) num_workers(1)
for(int i = 0; i < 5; ++i);
- // expected-error at +2{{OpenACC clause 'device_num' may not follow a 'device_type' clause in a 'serial loop' construct}}
- // expected-note at +1{{previous clause is here}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'serial loop' directive}}
#pragma acc serial loop device_type(*) device_num(1)
for(int i = 0; i < 5; ++i);
// expected-error at +2{{OpenACC clause 'default_async' may not follow a 'device_type' clause in a 'serial loop' construct}}
diff --git a/clang/test/SemaOpenACC/compute-construct-device_type-clause.c b/clang/test/SemaOpenACC/compute-construct-device_type-clause.c
index c1a77abf5c3f12..bbad68c425f3eb 100644
--- a/clang/test/SemaOpenACC/compute-construct-device_type-clause.c
+++ b/clang/test/SemaOpenACC/compute-construct-device_type-clause.c
@@ -195,8 +195,7 @@ void uses() {
while(1);
#pragma acc kernels device_type(*) num_workers(1)
while(1);
- // expected-error at +2{{OpenACC clause 'device_num' may not follow a 'device_type' clause in a 'kernels' construct}}
- // expected-note at +1{{previous clause is here}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'kernels' directive}}
#pragma acc kernels device_type(*) device_num(1)
while(1);
// expected-error at +2{{OpenACC clause 'default_async' may not follow a 'device_type' clause in a 'kernels' construct}}
diff --git a/clang/test/SemaOpenACC/init-construct-ast.cpp b/clang/test/SemaOpenACC/init-construct-ast.cpp
index 793a4829d14b3f..7c7d07a450d517 100644
--- a/clang/test/SemaOpenACC/init-construct-ast.cpp
+++ b/clang/test/SemaOpenACC/init-construct-ast.cpp
@@ -28,6 +28,10 @@ void NormalFunc() {
// CHECK-NEXT: DeclRefExpr{{.*}}'some_long' 'long ()'
#pragma acc init device_num(some_int())
// CHECK-NEXT: OpenACCInitConstruct{{.*}}init
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: CallExpr
+ // CHECK-NEXT: ImplicitCastExpr
+ // CHECK-NEXT: DeclRefExpr{{.*}}'some_int' 'int ()'
#pragma acc init device_type(T)
// CHECK-NEXT: OpenACCInitConstruct{{.*}}init
// CHECK-NEXT: device_type(T)
@@ -43,6 +47,10 @@ void NormalFunc() {
// CHECK-NEXT: ImplicitCastExpr
// CHECK-NEXT: DeclRefExpr{{.*}}'some_long' 'long ()'
// CHECK-NEXT: device_type(T)
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: CallExpr
+ // CHECK-NEXT: ImplicitCastExpr
+ // CHECK-NEXT: DeclRefExpr{{.*}}'some_int' 'int ()'
}
template<typename T>
@@ -64,6 +72,8 @@ void TemplFunc(T t) {
// CHECK-NEXT: DeclRefExpr{{.*}} 't' 'T'
#pragma acc init device_num(t)
// CHECK-NEXT: OpenACCInitConstruct{{.*}}init
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: DeclRefExpr{{.*}} 't' 'T'
#pragma acc init device_type(T)
// CHECK-NEXT: OpenACCInitConstruct{{.*}}init
// CHECK-NEXT: device_type(T)
@@ -75,6 +85,8 @@ void TemplFunc(T t) {
// CHECK-NEXT: NestedNameSpecifier{{.*}} 'T'
// CHECK-NEXT: DeclRefExpr{{.*}} 't' 'T'
// CHECK-NEXT: device_type(T)
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: DeclRefExpr{{.*}} 't' 'T'
// Instantiation:
// CHECK-NEXT: FunctionDecl{{.*}} TemplFunc 'void (SomeStruct)' implicit_instantiation
@@ -98,6 +110,11 @@ void TemplFunc(T t) {
// CHECK-NEXT: DeclRefExpr{{.*}} 't' 'SomeStruct'
// CHECK-NEXT: OpenACCInitConstruct{{.*}}init
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: ImplicitCastExpr{{.*}}'unsigned int'
+ // CHECK-NEXT: CXXMemberCallExpr{{.*}}'unsigned int'
+ // CHECK-NEXT: MemberExpr{{.*}} .operator unsigned int
+ // CHECK-NEXT: DeclRefExpr{{.*}} 't' 'SomeStruct'
// CHECK-NEXT: OpenACCInitConstruct{{.*}}init
// CHECK-NEXT: device_type(T)
@@ -112,6 +129,12 @@ void TemplFunc(T t) {
// CHECK-NEXT: CXXMemberCallExpr{{.*}} 'unsigned int'
// CHECK-NEXT: MemberExpr{{.*}} .operator unsigned int
// CHECK-NEXT: DeclRefExpr{{.*}} 't' 'SomeStruct'
+ // CHECK-NEXT: device_type(T)
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: ImplicitCastExpr{{.*}}'unsigned int'
+ // CHECK-NEXT: CXXMemberCallExpr{{.*}}'unsigned int'
+ // CHECK-NEXT: MemberExpr{{.*}} .operator unsigned int
+ // CHECK-NEXT: DeclRefExpr{{.*}} 't' 'SomeStruct'
}
struct SomeStruct{
diff --git a/clang/test/SemaOpenACC/init-construct.cpp b/clang/test/SemaOpenACC/init-construct.cpp
index 152b27c0f3be1f..e4491ee905f3fa 100644
--- a/clang/test/SemaOpenACC/init-construct.cpp
+++ b/clang/test/SemaOpenACC/init-construct.cpp
@@ -17,12 +17,9 @@ struct ExplicitConvertOnly {
void uses() {
#pragma acc init
#pragma acc init if (getI() < getS())
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc init device_num(getI())
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc init device_type(SOMETHING) device_num(getI())
#pragma acc init device_type(SOMETHING) if (getI() < getS())
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc init device_type(SOMETHING) device_num(getI()) if (getI() < getS())
// expected-error at +1{{value of type 'struct NotConvertible' is not contextually convertible to 'bool'}}
@@ -34,7 +31,6 @@ void uses() {
// expected-note@#AMBIG_INT{{conversion to integral type 'int'}}
// expected-note@#AMBIG_SHORT{{conversion to integral type 'short'}}
#pragma acc init device_num(Ambiguous)
- // expected-warning at +3{{OpenACC clause 'device_num' not yet implemented}}
// expected-error at +2{{OpenACC integer expression requires explicit conversion from 'struct ExplicitConvertOnly' to 'int'}}
// expected-note@#EXPL_CONV{{conversion to integral type 'int'}}
#pragma acc init device_num(Explicit)
@@ -45,20 +41,20 @@ void TestInst() {
T t;
#pragma acc init
#pragma acc init if (T::value < T{})
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc init device_type(SOMETHING) device_num(getI()) if (getI() < getS())
- // expected-warning at +1 2{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc init device_type(SOMETHING) device_type(T) device_num(t) if (t < T::value) device_num(getI()) if (getI() < getS())
-
// expected-error at +1{{value of type 'const NotConvertible' is not contextually convertible to 'bool'}}
#pragma acc init if (T::NCValue)
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC clause 'device_num' requires expression of integer type ('const NotConvertible' invalid)}}
#pragma acc init device_num(T::NCValue)
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +3{{multiple conversions from expression type 'const AmbiguousConvert' to an integral type}}
+ // expected-note@#AMBIG_INT{{conversion to integral type 'int'}}
+ // expected-note@#AMBIG_SHORT{{conversion to integral type 'short'}}
#pragma acc init device_num(T::ACValue)
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +2{{OpenACC integer expression requires explicit conversion from 'const ExplicitConvertOnly' to 'int'}}
+ // expected-note@#EXPL_CONV{{conversion to integral type 'int'}}
#pragma acc init device_num(T::EXValue)
}
diff --git a/clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c b/clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c
index d196633c8b6d92..d75d6abb99f6f8 100644
--- a/clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c
+++ b/clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c
@@ -149,7 +149,7 @@ void uses() {
// expected-error at +1{{OpenACC 'num_workers' clause is not valid on 'loop' directive}}
#pragma acc loop auto num_workers(1)
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'loop' directive}}
#pragma acc loop auto device_num(1)
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -283,7 +283,7 @@ void uses() {
// expected-error at +1{{OpenACC 'num_workers' clause is not valid on 'loop' directive}}
#pragma acc loop num_workers(1) auto
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'loop' directive}}
#pragma acc loop device_num(1) auto
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -418,7 +418,7 @@ void uses() {
// expected-error at +1{{OpenACC 'num_workers' clause is not valid on 'loop' directive}}
#pragma acc loop independent num_workers(1)
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'loop' directive}}
#pragma acc loop independent device_num(1)
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -552,7 +552,7 @@ void uses() {
// expected-error at +1{{OpenACC 'num_workers' clause is not valid on 'loop' directive}}
#pragma acc loop num_workers(1) independent
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'loop' directive}}
#pragma acc loop device_num(1) independent
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -695,7 +695,7 @@ void uses() {
// expected-error at +1{{OpenACC 'num_workers' clause is not valid on 'loop' directive}}
#pragma acc loop seq num_workers(1)
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'loop' directive}}
#pragma acc loop seq device_num(1)
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
@@ -835,7 +835,7 @@ void uses() {
// expected-error at +1{{OpenACC 'num_workers' clause is not valid on 'loop' directive}}
#pragma acc loop num_workers(1) seq
for(unsigned i = 0; i < 5; ++i);
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'loop' directive}}
#pragma acc loop device_num(1) seq
for(unsigned i = 0; i < 5; ++i);
// expected-warning at +1{{OpenACC clause 'default_async' not yet implemented}}
diff --git a/clang/test/SemaOpenACC/loop-construct-device_type-clause.c b/clang/test/SemaOpenACC/loop-construct-device_type-clause.c
index 3e4d0da60b6b27..bf2a2499c34363 100644
--- a/clang/test/SemaOpenACC/loop-construct-device_type-clause.c
+++ b/clang/test/SemaOpenACC/loop-construct-device_type-clause.c
@@ -170,8 +170,7 @@ void uses() {
// expected-error at +1{{OpenACC 'num_workers' clause is not valid on 'loop' directive}}
#pragma acc loop device_type(*) num_workers(1)
for(int i = 0; i < 5; ++i);
- // expected-error at +2{{OpenACC clause 'device_num' may not follow a 'device_type' clause in a 'loop' construct}}
- // expected-note at +1{{previous clause is here}}
+ // expected-error at +1{{OpenACC 'device_num' clause is not valid on 'loop' directive}}
#pragma acc loop device_type(*) device_num(1)
for(int i = 0; i < 5; ++i);
// expected-error at +2{{OpenACC clause 'default_async' may not follow a 'device_type' clause in a 'loop' construct}}
diff --git a/clang/test/SemaOpenACC/shutdown-construct-ast.cpp b/clang/test/SemaOpenACC/shutdown-construct-ast.cpp
index 006f1c9e4c9968..3ec1c0d9364931 100644
--- a/clang/test/SemaOpenACC/shutdown-construct-ast.cpp
+++ b/clang/test/SemaOpenACC/shutdown-construct-ast.cpp
@@ -28,6 +28,10 @@ void NormalFunc() {
// CHECK-NEXT: DeclRefExpr{{.*}}'some_long' 'long ()'
#pragma acc shutdown device_num(some_int())
// CHECK-NEXT: OpenACCShutdownConstruct{{.*}}shutdown
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: CallExpr
+ // CHECK-NEXT: ImplicitCastExpr
+ // CHECK-NEXT: DeclRefExpr{{.*}}'some_int' 'int ()'
#pragma acc shutdown device_type(T)
// CHECK-NEXT: OpenACCShutdownConstruct{{.*}}shutdown
// CHECK-NEXT: device_type(T)
@@ -43,6 +47,10 @@ void NormalFunc() {
// CHECK-NEXT: ImplicitCastExpr
// CHECK-NEXT: DeclRefExpr{{.*}}'some_long' 'long ()'
// CHECK-NEXT: device_type(T)
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: CallExpr
+ // CHECK-NEXT: ImplicitCastExpr
+ // CHECK-NEXT: DeclRefExpr{{.*}}'some_int' 'int ()'
}
template<typename T>
@@ -64,6 +72,8 @@ void TemplFunc(T t) {
// CHECK-NEXT: DeclRefExpr{{.*}} 't' 'T'
#pragma acc shutdown device_num(t)
// CHECK-NEXT: OpenACCShutdownConstruct{{.*}}shutdown
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: DeclRefExpr{{.*}} 't' 'T'
#pragma acc shutdown device_type(T)
// CHECK-NEXT: OpenACCShutdownConstruct{{.*}}shutdown
// CHECK-NEXT: device_type(T)
@@ -75,6 +85,8 @@ void TemplFunc(T t) {
// CHECK-NEXT: NestedNameSpecifier{{.*}} 'T'
// CHECK-NEXT: DeclRefExpr{{.*}} 't' 'T'
// CHECK-NEXT: device_type(T)
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: DeclRefExpr{{.*}} 't' 'T'
// Instantiation:
// CHECK-NEXT: FunctionDecl{{.*}} TemplFunc 'void (SomeStruct)' implicit_instantiation
@@ -98,6 +110,11 @@ void TemplFunc(T t) {
// CHECK-NEXT: DeclRefExpr{{.*}} 't' 'SomeStruct'
// CHECK-NEXT: OpenACCShutdownConstruct{{.*}}shutdown
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: ImplicitCastExpr{{.*}}'unsigned int'
+ // CHECK-NEXT: CXXMemberCallExpr{{.*}}'unsigned int'
+ // CHECK-NEXT: MemberExpr{{.*}} .operator unsigned int
+ // CHECK-NEXT: DeclRefExpr{{.*}} 't' 'SomeStruct'
// CHECK-NEXT: OpenACCShutdownConstruct{{.*}}shutdown
// CHECK-NEXT: device_type(T)
@@ -112,6 +129,12 @@ void TemplFunc(T t) {
// CHECK-NEXT: CXXMemberCallExpr{{.*}} 'unsigned int'
// CHECK-NEXT: MemberExpr{{.*}} .operator unsigned int
// CHECK-NEXT: DeclRefExpr{{.*}} 't' 'SomeStruct'
+ // CHECK-NEXT: device_type(T)
+ // CHECK-NEXT: device_num clause
+ // CHECK-NEXT: ImplicitCastExpr{{.*}}'unsigned int'
+ // CHECK-NEXT: CXXMemberCallExpr{{.*}}'unsigned int'
+ // CHECK-NEXT: MemberExpr{{.*}} .operator unsigned int
+ // CHECK-NEXT: DeclRefExpr{{.*}} 't' 'SomeStruct'
}
struct SomeStruct{
diff --git a/clang/test/SemaOpenACC/shutdown-construct.cpp b/clang/test/SemaOpenACC/shutdown-construct.cpp
index e4305883376c70..c3390b0412873f 100644
--- a/clang/test/SemaOpenACC/shutdown-construct.cpp
+++ b/clang/test/SemaOpenACC/shutdown-construct.cpp
@@ -17,12 +17,9 @@ struct ExplicitConvertOnly {
void uses() {
#pragma acc shutdown
#pragma acc shutdown if (getI() < getS())
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc shutdown device_num(getI())
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc shutdown device_type(SOMETHING) device_num(getI())
#pragma acc shutdown device_type(SOMETHING) if (getI() < getS())
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc shutdown device_type(SOMETHING) device_num(getI()) if (getI() < getS())
// expected-error at +1{{value of type 'struct NotConvertible' is not contextually convertible to 'bool'}}
@@ -34,7 +31,6 @@ void uses() {
// expected-note@#AMBIG_INT{{conversion to integral type 'int'}}
// expected-note@#AMBIG_SHORT{{conversion to integral type 'short'}}
#pragma acc shutdown device_num(Ambiguous)
- // expected-warning at +3{{OpenACC clause 'device_num' not yet implemented}}
// expected-error at +2{{OpenACC integer expression requires explicit conversion from 'struct ExplicitConvertOnly' to 'int'}}
// expected-note@#EXPL_CONV{{conversion to integral type 'int'}}
#pragma acc shutdown device_num(Explicit)
@@ -45,19 +41,20 @@ void TestInst() {
T t;
#pragma acc shutdown
#pragma acc shutdown if (T::value < T{})
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc shutdown device_type(SOMETHING) device_num(getI()) if (getI() < getS())
- // expected-warning at +1 2{{OpenACC clause 'device_num' not yet implemented}}
#pragma acc shutdown device_type(SOMETHING) device_type(T) device_num(t) if (t < T::value) device_num(getI()) if (getI() < getS())
// expected-error at +1{{value of type 'const NotConvertible' is not contextually convertible to 'bool'}}
#pragma acc shutdown if (T::NCValue)
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +1{{OpenACC clause 'device_num' requires expression of integer type ('const NotConvertible' invalid)}}
#pragma acc shutdown device_num(T::NCValue)
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +3{{multiple conversions from expression type 'const AmbiguousConvert' to an integral type}}
+ // expected-note@#AMBIG_INT{{conversion to integral type 'int'}}
+ // expected-note@#AMBIG_SHORT{{conversion to integral type 'short'}}
#pragma acc shutdown device_num(T::ACValue)
- // expected-warning at +1{{OpenACC clause 'device_num' not yet implemented}}
+ // expected-error at +2{{OpenACC integer expression requires explicit conversion from 'const ExplicitConvertOnly' to 'int'}}
+ // expected-note@#EXPL_CONV{{conversion to integral type 'int'}}
#pragma acc shutdown device_num(T::EXValue)
}
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index 140200a52b80b7..7967c10f9f713e 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -2845,6 +2845,10 @@ void OpenACCClauseEnqueue::VisitNumWorkersClause(
const OpenACCNumWorkersClause &C) {
Visitor.AddStmt(C.getIntExpr());
}
+void OpenACCClauseEnqueue::VisitDeviceNumClause(
+ const OpenACCDeviceNumClause &C) {
+ Visitor.AddStmt(C.getIntExpr());
+}
void OpenACCClauseEnqueue::VisitVectorLengthClause(
const OpenACCVectorLengthClause &C) {
Visitor.AddStmt(C.getIntExpr());
More information about the cfe-commits
mailing list