[llvm] 26fc3aa - [OpenMP] Missing implicit otherwise clause in metadirective. (#127113)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 28 05:02:40 PST 2025
Author: Zahira Ammarguellat
Date: 2025-02-28T08:02:35-05:00
New Revision: 26fc3aa983ab4615dfc32cebf74076c118de2a9d
URL: https://github.com/llvm/llvm-project/commit/26fc3aa983ab4615dfc32cebf74076c118de2a9d
DIFF: https://github.com/llvm/llvm-project/commit/26fc3aa983ab4615dfc32cebf74076c118de2a9d.diff
LOG: [OpenMP] Missing implicit otherwise clause in metadirective. (#127113)
Compiling this:
`int main() {`
` #pragma omp metadirective when(use r= {condition(0)}`
`: parallel for)`
`for (int i=0; i<10; i++)`
;
}`
is generating an error:
`error: expected expression`
The compiler is interpreting this as if it's compiling a `#pragma omp
metadirective` with no `otherwise` clause.
In the OMP5.2 specs chapter 7.4 it's mentioned that:
`If no otherwise clause is specified the effect is as if one was
specified without an associated directive variant.`
This patch fixes the issue.
Added:
clang/test/OpenMP/metadirective_otherwise.cpp
Modified:
clang/lib/Parse/ParseOpenMP.cpp
clang/test/OpenMP/metadirective_ast_print.c
llvm/include/llvm/Frontend/OpenMP/OMPContext.h
Removed:
################################################################################
diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp
index 42e6aac681c1c..b791c5d5e3019 100644
--- a/clang/lib/Parse/ParseOpenMP.cpp
+++ b/clang/lib/Parse/ParseOpenMP.cpp
@@ -2883,6 +2883,15 @@ StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective(
/*ReadDirectiveWithinMetadirective=*/true);
break;
}
+ // If no match is found and no otherwise clause is present, skip
+ // OMP5.2 Chapter 7.4: If no otherwise clause is specified the effect is as
+ // if one was specified without an associated directive variant.
+ if (BestIdx == -1 && Idx == 1) {
+ assert(Tok.is(tok::annot_pragma_openmp_end) &&
+ "Expecting the end of the pragma here");
+ ConsumeAnnotationToken();
+ return StmtEmpty();
+ }
break;
}
case OMPD_threadprivate: {
diff --git a/clang/test/OpenMP/metadirective_ast_print.c b/clang/test/OpenMP/metadirective_ast_print.c
index d9ff7e7645216..851f08ce37ee7 100644
--- a/clang/test/OpenMP/metadirective_ast_print.c
+++ b/clang/test/OpenMP/metadirective_ast_print.c
@@ -77,6 +77,34 @@ void foo(void) {
: parallel) default(nothing)
for (int i = 0; i < 16; i++)
;
+
+#pragma omp metadirective when(user = {condition(0)} \
+ : parallel for) otherwise()
+ for (int i=0; i<10; i++)
+ ;
+#pragma omp metadirective when(user = {condition(0)} \
+ : parallel for)
+ for (int i=0; i<10; i++)
+ ;
+#pragma omp metadirective when(user = {condition(0)} \
+ : parallel for) when(implementation = {extension(match_none)} \
+ : parallel) default(parallel for)
+ for (int i=0; i<10; i++)
+ ;
+
+#pragma omp metadirective when(user = {condition(1)} \
+ : parallel for) otherwise()
+ for (int i=0; i<10; i++)
+ ;
+#pragma omp metadirective when(user = {condition(1)} \
+ : parallel for)
+ for (int i=0; i<10; i++)
+ ;
+#pragma omp metadirective when(user = {condition(1)} \
+ : parallel for) when(implementation = {extension(match_none)} \
+ : parallel) default(parallel for)
+ for (int i=0; i<10; i++)
+ ;
}
// CHECK: void bar(void);
diff --git a/clang/test/OpenMP/metadirective_otherwise.cpp b/clang/test/OpenMP/metadirective_otherwise.cpp
new file mode 100644
index 0000000000000..0533350c84eed
--- /dev/null
+++ b/clang/test/OpenMP/metadirective_otherwise.cpp
@@ -0,0 +1,125 @@
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-unknown-linux -emit-llvm %s -o - | FileCheck %s
+// expected-no-diagnostics
+
+#ifndef HEADER
+#define HEADER
+
+void func1() {
+#pragma omp metadirective when(user = {condition(0)} \
+ : parallel for) otherwise()
+ for (int i = 0; i < 100; i++)
+ ;
+
+#pragma omp metadirective when(user = {condition(0)} \
+ : parallel for)
+ for (int i = 0; i < 100; i++)
+ ;
+
+#pragma omp metadirective when(user = {condition(0)} \
+ : parallel for) \
+ when(implementation = {extension(match_none)} \
+ : parallel) default(parallel for)
+
+ for (int i = 0; i < 100; i++)
+ ;
+
+
+}
+
+// CHECK-LABEL: define dso_local void @_Z5func1v()
+// CHECK: entry
+// CHECK-NEXT: [[I:%.*]] = alloca i32, align 4
+// CHECK-NEXT: [[I1:%.*]] = alloca i32, align 4
+// CHECK-NEXT: store i32 0, ptr [[I]], align 4
+// CHECK-NEXT: br label %[[FOR_COND:.*]]
+// CHECK: [[FOR_COND]]:
+// CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr [[I]], align 4
+// CHECK-NEXT: [[CMP:%.*]] = icmp slt i32 [[TMP0]], 100
+// CHECK-NEXT: br i1 [[CMP]], label %[[FOR_BODY:.*]], label %[[FOR_END:.*]]
+// CHECK: [[FOR_BODY]]:
+// CHECK-NEXT: br label %[[FOR_INC:.*]]
+// CHECK: [[FOR_INC]]:
+// CHECK-NEXT: [[TMP1:%.*]] = load i32, ptr [[I]], align 4
+// CHECK-NEXT: [[INC:%.*]] = add nsw i32 [[TMP1]], 1
+// CHECK-NEXT: store i32 [[INC]], ptr [[I]], align 4
+// CHECK-NEXT: br label %[[FOR_COND]], !llvm.loop [[LOOP3:![0-9]+]]
+// CHECK: [[FOR_END]]:
+// CHECK-NEXT: store i32 0, ptr [[I1]], align 4
+// CHECK-NEXT: br label %[[FOR_COND2:.*]]
+// CHECK: [[FOR_COND2]]:
+// CHECK-NEXT: [[TMP2:%.*]] = load i32, ptr [[I1]], align 4
+// CHECK-NEXT: [[CMP3:%.*]] = icmp slt i32 [[TMP2]], 100
+// CHECK-NEXT: br i1 [[CMP3]], label %[[FOR_BODY4:.*]], label %[[FOR_END7:.*]]
+// CHECK: [[FOR_BODY4]]:
+// CHECK-NEXT: br label %[[FOR_INC5:.*]]
+// CHECK: [[FOR_INC5]]:
+// CHECK-NEXT: [[TMP3:%.*]] = load i32, ptr [[I1]], align 4
+// CHECK-NEXT: [[INC6:%.*]] = add nsw i32 [[TMP3]], 1
+// CHECK-NEXT: store i32 [[INC6]], ptr [[I1]], align 4
+// CHECK-NEXT: br label %[[FOR_COND2]], !llvm.loop [[LOOP5:![0-9]+]]
+// CHECK: [[FOR_END7]]:
+// CHECK: ret void
+
+void func2() {
+#pragma omp metadirective when(user = {condition(1)} \
+ : parallel for) otherwise()
+ for (int i = 0; i < 100; i++)
+ ;
+
+#pragma omp metadirective when(user = {condition(1)} \
+ : parallel for)
+ for (int i = 0; i < 100; i++)
+ ;
+}
+
+// CHECK-LABEL: define dso_local void @_Z5func2v()
+// CHECK: entry
+// CHECK-NEXT: call void (ptr, i32, ptr, ...) @__kmpc_fork_call(ptr @[[GLOB2:[0-9]+]], i32 0, ptr @_Z5func2v.omp_outlined)
+// CHECK-NEXT: call void (ptr, i32, ptr, ...) @__kmpc_fork_call(ptr @[[GLOB2]], i32 0, ptr @_Z5func2v.omp_outlined.1)
+// CHECK-NEXT: ret void
+
+
+void func3() {
+#pragma omp metadirective when(user = {condition(0)} \
+ : parallel for) \
+ when(implementation = {extension(match_none)} \
+ : parallel) default(parallel for)
+
+ for (int i = 0; i < 100; i++)
+ ;
+
+}
+
+// CHECK-LABEL: define dso_local void @_Z5func3v()
+// CHECK: entry
+// CHECK-NEXT: call void (ptr, i32, ptr, ...) @__kmpc_fork_call(ptr @1, i32 0, ptr @_Z5func3v.omp_outlined)
+// CHECK-NEXT: ret void
+// CHECK-NEXT: }
+
+// CHECK-LABEL: define internal void @_Z5func3v.omp_outlined
+// CHECK-SAME: (ptr noalias noundef [[DOTGLOBAL_TID_:%.*]],
+// CHECK-SAME: ptr noalias noundef [[DOTBOUND_TID_:%.*]])
+// CHECK-NEXT: entry
+// CHECK-NEXT: [[GLOB_TID__ADDR:%.*]] = alloca ptr, align 8
+// CHECK-NEXT: [[BOUND_TID__ADDR:%.*]] = alloca ptr, align 8
+// CHECK-NEXT: [[I:%.*]] = alloca i32, align 4
+// CHECK-NEXT: store ptr [[DOTGLOBAL_TID_]], ptr [[GLOB_TID__ADDR]], align 8
+// CHECK-NEXT: store ptr [[DOTBOUND_TID_]], ptr [[BOUND_TID__ADDR]], align 8
+// CHECK-NEXT: store i32 0, ptr [[I]], align 4
+// CHECK-NEXT: br label %for.cond
+// CHECK:for.cond:
+// CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr [[I]], align 4
+// CHECK-NEXT: [[CMP:%.*]] = icmp slt i32 [[TMP0]], 100
+// CHECK-NEXT: br i1 [[CMP]], label [[FOR_BODY:%.*]], label [[FOR_END:%.*]]
+// CHECK:for.body:
+// CHECK-NEXT: br label [[FOR_INC:%.*]]
+// CHECK:for.inc:
+// CHECK-NEXT: [[TMP1:%.*]] = load i32, ptr [[I]], align 4
+// CHECK-NEXT: [[INC:%.*]] = add nsw i32 [[TMP1]], 1
+// CHECK-NEXT: store i32 [[INC]], ptr [[I]], align 4
+// CHECK-NEXT: br label [[FOR_COND:%.*]]
+// CHECK:for.end:
+// CHECK-NEXT: ret void
+// CHECK-NEXT:}
+
+#endif
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPContext.h b/llvm/include/llvm/Frontend/OpenMP/OMPContext.h
index a501eaf2356ff..26163fdb4b63d 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPContext.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPContext.h
@@ -188,7 +188,7 @@ bool isVariantApplicableInContext(const VariantMatchInfo &VMI,
bool DeviceSetOnly = false);
/// Return the index (into \p VMIs) of the variant with the highest score
-/// from the ones applicble in \p Ctx. See llvm::isVariantApplicableInContext.
+/// from the ones applicable in \p Ctx. See llvm::isVariantApplicableInContext.
int getBestVariantMatchForContext(const SmallVectorImpl<VariantMatchInfo> &VMIs,
const OMPContext &Ctx);
More information about the llvm-commits
mailing list