Skip to content

[OpenMP] Support for nothing in metadirective #73690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2023
Merged

[OpenMP] Support for nothing in metadirective #73690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions clang/lib/Parse/ParseOpenMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,12 +2518,14 @@ StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective(

switch (DKind) {
case OMPD_nothing:
if ((StmtCtx & ParsedStmtContext::AllowStandaloneOpenMPDirectives) ==
ParsedStmtContext())
Diag(Tok, diag::err_omp_immediate_directive)
<< getOpenMPDirectiveName(DKind) << 0;
ConsumeToken();
skipUntilPragmaOpenMPEnd(DKind);
// If we are parsing the directive within a metadirective, the directive
// ends with a ')'.
if (ReadDirectiveWithinMetadirective && Tok.is(tok::r_paren))
while (Tok.isNot(tok::annot_pragma_openmp_end))
ConsumeAnyToken();
else
skipUntilPragmaOpenMPEnd(DKind);
if (Tok.is(tok::annot_pragma_openmp_end))
ConsumeAnnotationToken();
break;
Expand Down
12 changes: 12 additions & 0 deletions clang/test/OpenMP/metadirective_ast_print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ void foo(void) {
default(parallel for)
for (int i = 0; i < 100; i++)
;

#pragma omp metadirective when(implementation = {extension(match_all)} \
: nothing) default(parallel for)
for (int i = 0; i < 16; i++)
;

#pragma omp metadirective when(implementation = {extension(match_any)} \
: parallel) default(nothing)
for (int i = 0; i < 16; i++)
;
}

// CHECK: void bar(void);
Expand Down Expand Up @@ -95,5 +105,7 @@ void foo(void) {
// CHECK-NEXT: for (int j = 0; j < 16; j++)
// CHECK-AMDGCN: #pragma omp teams distribute parallel for
// CHECK-AMDGCN-NEXT: for (int i = 0; i < 100; i++)
// CHECK: for (int i = 0; i < 16; i++)
// CHECK: for (int i = 0; i < 16; i++)

#endif
20 changes: 20 additions & 0 deletions clang/test/OpenMP/metadirective_empty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@ void func() {
:) default(parallel for)
for (int i = 0; i < N; i++)
;

#pragma omp metadirective when(implementation = {vendor(llvm)} \
:nothing) default(parallel for)
for (int i = 0; i < N; i++)
;
}

// CHECK-LABEL: void @_Z4funcv()
// CHECK: entry:
// CHECK: [[I:%.+]] = alloca i32,
// CHECK: [[I1:%.+]] = alloca i32,
// CHECK: store i32 0, ptr [[I]],
// CHECK: br label %[[FOR_COND:.+]]
// CHECK: [[FOR_COND]]:
Expand All @@ -33,6 +39,20 @@ void func() {
// CHECK: store i32 [[INC]], ptr [[I]],
// CHECK: br label %[[FOR_COND]],
// CHECK: [[FOR_END]]:
// CHECK: store i32 0, ptr [[I1]],
// CHECK: br label %[[FOR_COND1:.+]]
// CHECK: [[FOR_COND1]]:
// CHECK: [[TWO:%.+]] = load i32, ptr [[I1]],
// CHECK: [[CMP1:%.+]] = icmp slt i32 [[TWO]], 1000
// CHECK: br i1 [[CMP1]], label %[[FOR_BODY1:.+]], label %[[FOR_END1:.+]]
// CHECK: [[FOR_BODY1]]:
// CHECK: br label %[[FOR_INC1:.+]]
// CHECK: [[FOR_INC1]]:
// CHECK: [[THREE:%.+]] = load i32, ptr [[I1]],
// CHECK: [[INC1:%.+]] = add nsw i32 [[THREE]], 1
// CHECK: store i32 [[INC1]], ptr [[I1]],
// CHECK: br label %[[FOR_COND1]],
// CHECK: [[FOR_END1]]:
// CHECK: ret void
// CHECK: }

Expand Down
1 change: 0 additions & 1 deletion clang/test/OpenMP/nothing_messages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ int mixed() {
x=d;
}

// expected-error@+2 {{#pragma omp nothing' cannot be an immediate substatement}}
if(!x)
#pragma omp nothing
x=d;
Expand Down