This is an archive of the discontinued LLVM Phabricator instance.

Differential D141531

[OpenMP][FIX] Allow multiple `depend` clauses on a `taskwait nowait`
ClosedPublic

Authored by jdoerfert on Jan 11 2023, 11:24 AM.

Details

Reviewers
jhuber6
tianshilei1992
ABataev
Commits
rGa8eccca93415: [OpenMP][FIX] Allow multiple `depend` clauses on a `taskwait nowait`
Summary

Fixes https://github.com/llvm/llvm-project/issues/59941

Diff Detail

Event Timeline

jdoerfert created this revision.Jan 11 2023, 11:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 11 2023, 11:24 AM
Herald added subscribers: guansong, bollu, yaxunl. · View Herald Transcript
jdoerfert requested review of this revision.Jan 11 2023, 11:24 AM
Herald added a subscriber: sstefan1. · View Herald TranscriptJan 11 2023, 11:24 AM
ABataev accepted this revision.Jan 11 2023, 11:43 AM

LG

This revision is now accepted and ready to land.Jan 11 2023, 11:43 AM
tianshilei1992 accepted this revision.Jan 11 2023, 11:50 AM
Harbormaster completed remote builds in B207157: Diff 488306.Jan 11 2023, 2:37 PM
Closed by commit rGa8eccca93415: [OpenMP][FIX] Allow multiple `depend` clauses on a `taskwait nowait` (authored by jdoerfert). · Explain WhyJan 11 2023, 10:38 PM
This revision was automatically updated to reflect the committed changes.
jdoerfert added a commit: rGa8eccca93415: [OpenMP][FIX] Allow multiple `depend` clauses on a `taskwait nowait`.
Herald added a project: Restricted Project. · View Herald TranscriptJan 11 2023, 10:38 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript

Revision Contents

PathSize
clang/
lib/
Sema/
7 lines
test/
OpenMP/
4 lines

Diff 488306

clang/lib/Sema/SemaOpenMP.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 11,103 Lines • ▼ Show 20 LinesStmtResult Sema::ActOnOpenMPErrorDirective(ArrayRef<OMPClause *> Clauses,
return OMPErrorDirective::Create(Context, StartLoc, EndLoc, Clauses); return OMPErrorDirective::Create(Context, StartLoc, EndLoc, Clauses);
} }
StmtResult Sema::ActOnOpenMPTaskwaitDirective(ArrayRef<OMPClause *> Clauses, StmtResult Sema::ActOnOpenMPTaskwaitDirective(ArrayRef<OMPClause *> Clauses,
SourceLocation StartLoc, SourceLocation StartLoc,
SourceLocation EndLoc) { SourceLocation EndLoc) {
const OMPNowaitClause *NowaitC = const OMPNowaitClause *NowaitC =
OMPExecutableDirective::getSingleClause<OMPNowaitClause>(Clauses); OMPExecutableDirective::getSingleClause<OMPNowaitClause>(Clauses);
const OMPDependClause *DependC = bool HasDependC =
OMPExecutableDirective::getSingleClause<OMPDependClause>(Clauses); !OMPExecutableDirective::getClausesOfKind<OMPDependClause>(Clauses)
if (NowaitC && !DependC) { .empty();
if (NowaitC && !HasDependC) {
Diag(StartLoc, diag::err_omp_nowait_clause_without_depend); Diag(StartLoc, diag::err_omp_nowait_clause_without_depend);
return StmtError(); return StmtError();
} }
return OMPTaskwaitDirective::Create(Context, StartLoc, EndLoc, Clauses); return OMPTaskwaitDirective::Create(Context, StartLoc, EndLoc, Clauses);
} }
StmtResult Sema::ActOnOpenMPTaskgroupDirective(ArrayRef<OMPClause *> Clauses, StmtResult Sema::ActOnOpenMPTaskgroupDirective(ArrayRef<OMPClause *> Clauses,
▲ Show 20 Lines • Show All 12,628 Lines • Show Last 20 Lines

clang/test/OpenMP/taskwait_ast_print.cpp

Show All 19 Lines#pragma omp taskwait depend(in:a, argc)
return a + argc; return a + argc;
} }
template <class T> template <class T>
T ndmain(T argc) { T ndmain(T argc) {
static T a; static T a;
#pragma omp taskwait #pragma omp taskwait
#pragma omp taskwait depend(in:a, argc) nowait #pragma omp taskwait depend(in:a, argc) nowait
#pragma omp taskwait depend(in:a) depend(in:argc) nowait
return a + argc; return a + argc;
} }
// CHECK: static T a; // CHECK: static T a;
// CHECK-NEXT: #pragma omp taskwait{{$}} // CHECK-NEXT: #pragma omp taskwait{{$}}
// CHECK-NEXT: #pragma omp taskwait depend(in : a,argc){{$}} // CHECK-NEXT: #pragma omp taskwait depend(in : a,argc){{$}}
// CHECK: static int a; // CHECK: static int a;
// CHECK-NEXT: #pragma omp taskwait // CHECK-NEXT: #pragma omp taskwait
// CHECK-NEXT: #pragma omp taskwait depend(in : a,argc){{$}} // CHECK-NEXT: #pragma omp taskwait depend(in : a,argc){{$}}
// CHECK: static char a; // CHECK: static char a;
// CHECK-NEXT: #pragma omp taskwait // CHECK-NEXT: #pragma omp taskwait
// CHECK-NEXT: #pragma omp taskwait depend(in : a,argc){{$}} // CHECK-NEXT: #pragma omp taskwait depend(in : a,argc){{$}}
// CHECK: static T a; // CHECK: static T a;
// CHECK-NEXT: #pragma omp taskwait{{$}} // CHECK-NEXT: #pragma omp taskwait{{$}}
// CHECK-NEXT: #pragma omp taskwait depend(in : a,argc) nowait{{$}} // CHECK-NEXT: #pragma omp taskwait depend(in : a,argc) nowait{{$}}
// CHECK-NEXT: #pragma omp taskwait depend(in : a) depend(in : argc) nowait{{$}}
// CHECK: static int a; // CHECK: static int a;
// CHECK-NEXT: #pragma omp taskwait // CHECK-NEXT: #pragma omp taskwait
// CHECK-NEXT: #pragma omp taskwait depend(in : a,argc) nowait{{$}} // CHECK-NEXT: #pragma omp taskwait depend(in : a,argc) nowait{{$}}
// CHECK-NEXT: #pragma omp taskwait depend(in : a) depend(in : argc) nowait{{$}}
// CHECK: static char a; // CHECK: static char a;
// CHECK-NEXT: #pragma omp taskwait // CHECK-NEXT: #pragma omp taskwait
// CHECK-NEXT: #pragma omp taskwait depend(in : a,argc) nowait{{$}} // CHECK-NEXT: #pragma omp taskwait depend(in : a,argc) nowait{{$}}
// CHECK-NEXT: #pragma omp taskwait depend(in : a) depend(in : argc) nowait{{$}}
int main(int argc, char **argv) { int main(int argc, char **argv) {
static int a; static int a;
// CHECK: static int a; // CHECK: static int a;
#pragma omp taskwait #pragma omp taskwait
#pragma omp taskwait depend(out:a, argc) #pragma omp taskwait depend(out:a, argc)
// CHECK-NEXT: #pragma omp taskwait // CHECK-NEXT: #pragma omp taskwait
// CHECK-NEXT: #pragma omp taskwait depend(out : a,argc) // CHECK-NEXT: #pragma omp taskwait depend(out : a,argc)
return tmain(argc) + tmain(argv[0][0]) + a + ndmain(argc) + ndmain(argv[0][0]); return tmain(argc) + tmain(argv[0][0]) + a + ndmain(argc) + ndmain(argv[0][0]);
} }
#endif #endif