[flang-commits] [flang] [llvm] [flang][OpenMP]Add support for fail clause (PR #118683)
Mats Petersson via flang-commits
flang-commits at lists.llvm.org
Fri Dec 6 10:11:53 PST 2024
https://github.com/Leporacanthicus updated https://github.com/llvm/llvm-project/pull/118683
>From 59752d2ec7d3815882d3b4842ae3595c3e4795a7 Mon Sep 17 00:00:00 2001
From: Mats Petersson <mats.petersson at arm.com>
Date: Wed, 4 Dec 2024 17:01:08 +0000
Subject: [PATCH 1/3] [flang][OpenMP]Add support for fail clause
Support the atomic compare option of a fail(memory-order) clauses.
Additional tests introduced to check that parsing and semantics checks for
the new clause is handled.
Lowering for atomic compare is still unsupported and wil end in a TOOD
(aka "Not yet implemented"). A test for this case with the fail clause
is also present.
---
flang/include/flang/Parser/dump-parse-tree.h | 1 +
flang/include/flang/Parser/parse-tree.h | 14 ++++++++++++--
flang/lib/Parser/openmp-parsers.cpp | 4 ++++
flang/lib/Parser/unparse.cpp | 6 ++++++
flang/lib/Semantics/check-omp-structure.cpp | 19 +++++++++++++++----
flang/lib/Semantics/semantics.cpp | 5 +++++
.../Lower/OpenMP/Todo/atomic-compare-fail.f90 | 11 +++++++++++
flang/test/Parser/OpenMP/atomic-unparse.f90 | 19 +++++++++++++++++++
.../test/Semantics/OpenMP/atomic-compare.f90 | 13 +++++++++++++
llvm/include/llvm/Frontend/OpenMP/OMP.td | 1 +
10 files changed, 87 insertions(+), 6 deletions(-)
create mode 100644 flang/test/Lower/OpenMP/Todo/atomic-compare-fail.f90
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index c6f35a07d81ea5..13825eb7ba41e3 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -546,6 +546,7 @@ class ParseTreeDumper {
NODE(parser, OmpEndCriticalDirective)
NODE(parser, OmpEndLoopDirective)
NODE(parser, OmpEndSectionsDirective)
+ NODE(parser, OmpFailClause)
NODE(parser, OmpFromClause)
NODE(OmpFromClause, Modifier)
NODE(parser, OmpExpectation)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 8160b095f06dd9..5947f248f6ef77 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -269,6 +269,7 @@ struct OpenACCRoutineConstruct;
struct OpenMPConstruct;
struct OpenMPDeclarativeConstruct;
struct OmpEndLoopDirective;
+struct OmpMemoryOrderClause;
struct CUFKernelDoConstruct;
// Cooked character stream locations
@@ -4098,6 +4099,14 @@ struct OmpUpdateClause {
std::variant<OmpDependenceType, OmpTaskDependenceType> u;
};
+// OMP 5.2 15.8.3 extened-atomic, fail-clause ->
+// FAIL(memory-order)
+struct OmpFailClause {
+ WRAPPER_CLASS_BOILERPLATE(
+ OmpFailClause, common::Indirection<OmpMemoryOrderClause>);
+ CharBlock source;
+};
+
// OpenMP Clauses
struct OmpClause {
UNION_CLASS_BOILERPLATE(OmpClause);
@@ -4317,11 +4326,12 @@ struct OmpMemoryOrderClause {
};
// 2.17.7 Atomic construct
-// atomic-clause -> memory-order-clause | HINT(hint-expression)
+// atomic-clause -> memory-order-clause | HINT(hint-expression) |
+// FAIL(memory-order)
struct OmpAtomicClause {
UNION_CLASS_BOILERPLATE(OmpAtomicClause);
CharBlock source;
- std::variant<OmpMemoryOrderClause, OmpClause> u;
+ std::variant<OmpMemoryOrderClause, OmpFailClause, OmpClause> u;
};
// atomic-clause-list -> [atomic-clause, [atomic-clause], ...]
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp
index 86d475c1a15422..f8fda92d5ac2bb 100644
--- a/flang/lib/Parser/openmp-parsers.cpp
+++ b/flang/lib/Parser/openmp-parsers.cpp
@@ -739,6 +739,9 @@ TYPE_PARSER(sourced(construct<OpenMPCancellationPointConstruct>(
TYPE_PARSER(sourced(construct<OpenMPCancelConstruct>(verbatim("CANCEL"_tok),
Parser<OmpCancelType>{}, maybe("IF" >> parenthesized(scalarLogicalExpr)))))
+TYPE_PARSER(sourced(construct<OmpFailClause>(
+ parenthesized(indirect(Parser<OmpMemoryOrderClause>{})))))
+
// 2.17.7 Atomic construct/2.17.8 Flush construct [OpenMP 5.0]
// memory-order-clause ->
// seq_cst
@@ -767,6 +770,7 @@ TYPE_PARSER(construct<OmpAtomicDefaultMemOrderClause>(
// atomic-clause -> memory-order-clause | HINT(hint-expression)
TYPE_PARSER(sourced(construct<OmpAtomicClause>(
construct<OmpAtomicClause>(Parser<OmpMemoryOrderClause>{}) ||
+ construct<OmpAtomicClause>("FAIL" >> Parser<OmpFailClause>{}) ||
construct<OmpAtomicClause>("HINT" >>
sourced(construct<OmpClause>(
construct<OmpClause::Hint>(parenthesized(constantExpr))))))))
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index 4782cc1f2d7d7d..a10be3f1c797de 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -2702,10 +2702,16 @@ class UnparseVisitor {
Put("\n");
EndOpenMP();
}
+ void Unparse(const OmpFailClause &x) {
+ Word("FAIL(");
+ Walk(x.v);
+ Put(")");
+ }
void Unparse(const OmpMemoryOrderClause &x) { Walk(x.v); }
void Unparse(const OmpAtomicClause &x) {
common::visit(common::visitors{
[&](const OmpMemoryOrderClause &y) { Walk(y); },
+ [&](const OmpFailClause &y) { Walk(y); },
[&](const OmpClause &z) { Walk(z); },
},
x.u);
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index 27e2b946732abc..4885f79222aa16 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -2486,17 +2486,28 @@ void OmpStructureChecker::CheckAtomicMemoryOrderClause(
const parser::OmpAtomicClauseList *leftHandClauseList,
const parser::OmpAtomicClauseList *rightHandClauseList) {
int numMemoryOrderClause = 0;
+ int numFailClause = 0;
auto checkForValidMemoryOrderClause =
[&](const parser::OmpAtomicClauseList *clauseList) {
for (const auto &clause : clauseList->v) {
- if (std::get_if<Fortran::parser::OmpMemoryOrderClause>(&clause.u)) {
- numMemoryOrderClause++;
- if (numMemoryOrderClause > 1) {
+ if (std::get_if<parser::OmpFailClause>(&clause.u)) {
+ numFailClause++;
+ if (numFailClause > 1) {
context_.Say(clause.source,
- "More than one memory order clause not allowed on "
+ "More than one fail clause not allowed on "
"OpenMP Atomic construct"_err_en_US);
return;
}
+ } else {
+ if (std::get_if<Fortran::parser::OmpMemoryOrderClause>(&clause.u)) {
+ numMemoryOrderClause++;
+ if (numMemoryOrderClause > 1) {
+ context_.Say(clause.source,
+ "More than one memory order clause not allowed on "
+ "OpenMP Atomic construct"_err_en_US);
+ return;
+ }
+ }
}
}
};
diff --git a/flang/lib/Semantics/semantics.cpp b/flang/lib/Semantics/semantics.cpp
index 58dc1f218b56f4..779c24e90e69d9 100644
--- a/flang/lib/Semantics/semantics.cpp
+++ b/flang/lib/Semantics/semantics.cpp
@@ -114,6 +114,11 @@ class SemanticsVisitor : public virtual BaseChecker, public virtual C... {
context_.set_location(std::nullopt);
}
+ // This is necessary to avoid "walking" into the Fail clause,
+ // which confuses the CheckAllowed into thinking there's another
+ // memoryorder, when it's actually the argument to the fail clause.
+ bool Pre(const parser::OmpFailClause &) { return false; }
+
bool Walk(const parser::Program &program) {
parser::Walk(program, *this);
return !context_.AnyFatalError();
diff --git a/flang/test/Lower/OpenMP/Todo/atomic-compare-fail.f90 b/flang/test/Lower/OpenMP/Todo/atomic-compare-fail.f90
new file mode 100644
index 00000000000000..b82bd13622764b
--- /dev/null
+++ b/flang/test/Lower/OpenMP/Todo/atomic-compare-fail.f90
@@ -0,0 +1,11 @@
+! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -fopenmp-version=51 -o - %s 2>&1 | FileCheck %s
+
+! CHECK: not yet implemented: OpenMP atomic compare
+program p
+ integer :: x
+ logical :: r
+ !$omp atomic compare fail(relaxed)
+ if (x .eq. 0) then
+ x = 2
+ end if
+end program p
diff --git a/flang/test/Parser/OpenMP/atomic-unparse.f90 b/flang/test/Parser/OpenMP/atomic-unparse.f90
index 64fa79fb1d1a2f..16dc7a1a92bf9e 100644
--- a/flang/test/Parser/OpenMP/atomic-unparse.f90
+++ b/flang/test/Parser/OpenMP/atomic-unparse.f90
@@ -165,6 +165,20 @@ program main
i = j
end if
+
+!$omp atomic compare fail(relaxed)
+ if (i .eq. k) then
+ i = j
+ end if
+!$omp atomic fail(relaxed) compare
+ if (i .eq. k) then
+ i = j
+ end if
+!$omp atomic fail(relaxed) compare acquire
+ if (i .eq. k) then
+ i = j
+ end if
+
!ATOMIC
!$omp atomic
i = j
@@ -262,6 +276,9 @@ end program main
!CHECK: !$OMP ATOMIC COMPARE ACQUIRE
!CHECK: !$OMP ATOMIC RELAXED COMPARE
!CHECK: !$OMP ATOMIC COMPARE RELAXED
+!CHECK: !$OMP ATOMIC COMPARE FAIL(RELAXED)
+!CHECK: !$OMP ATOMIC FAIL(RELAXED) COMPARE
+!CHECK: !$OMP ATOMIC FAIL(RELAXED) COMPARE ACQUIRE
!ATOMIC
!CHECK: !$OMP ATOMIC
@@ -270,3 +287,5 @@ end program main
!CHECK: !$OMP ATOMIC ACQ_REL
!CHECK: !$OMP ATOMIC ACQUIRE
!CHECK: !$OMP ATOMIC RELAXED
+
+
diff --git a/flang/test/Semantics/OpenMP/atomic-compare.f90 b/flang/test/Semantics/OpenMP/atomic-compare.f90
index 85644ad909107e..f677f0c2d8c0f8 100644
--- a/flang/test/Semantics/OpenMP/atomic-compare.f90
+++ b/flang/test/Semantics/OpenMP/atomic-compare.f90
@@ -35,6 +35,14 @@
if (b .eq. a) b = c
!$omp end atomic
+ !$omp atomic hint(1) acq_rel compare fail(release)
+ if (c .eq. a) a = b
+ !$omp end atomic
+
+ !$omp atomic compare fail(release)
+ if (c .eq. a) a = b
+ !$omp end atomic
+
! Check for error conditions:
!ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
!ERROR: At most one SEQ_CST clause can appear on the COMPARE directive
@@ -75,5 +83,10 @@
!$omp atomic relaxed compare relaxed
if (b .eq. c) b = a
+ !ERROR: More than one fail clause not allowed on OpenMP Atomic construct
+ !$omp atomic fail(release) compare fail(release)
+ if (c .eq. a) a = b
+ !$omp end atomic
+
!$omp end parallel
end
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td b/llvm/include/llvm/Frontend/OpenMP/OMP.td
index bd7fb2361aaeb1..772f60343c6348 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMP.td
+++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td
@@ -177,6 +177,7 @@ def OMPC_Exclusive : Clause<"exclusive"> {
}
def OMPC_Fail : Clause<"fail"> {
let clangClass = "OMPFailClause";
+ let flangClass = "OmpFailClause";
}
def OMPC_Filter : Clause<"filter"> {
let clangClass = "OMPFilterClause";
>From 04e8fd520c00f577e81524213acfa05b6813622d Mon Sep 17 00:00:00 2001
From: Mats Petersson <mats.petersson at arm.com>
Date: Thu, 5 Dec 2024 11:08:46 +0000
Subject: [PATCH 2/3] Fix review comments
---
flang/include/flang/Parser/parse-tree.h | 16 ++--
flang/lib/Semantics/check-omp-structure.cpp | 6 +-
.../test/Semantics/OpenMP/atomic-compare.f90 | 20 ++---
flang/test/Semantics/OpenMP/atomic01.f90 | 90 +++++++++----------
flang/test/Semantics/OpenMP/atomic05.f90 | 10 +--
5 files changed, 70 insertions(+), 72 deletions(-)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 5947f248f6ef77..946d1d940880dd 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -3915,6 +3915,14 @@ struct OmpDeviceTypeClause {
WRAPPER_CLASS_BOILERPLATE(OmpDeviceTypeClause, DeviceTypeDescription);
};
+// OMP 5.2 15.8.3 extened-atomic, fail-clause ->
+// FAIL(memory-order)
+struct OmpFailClause {
+ WRAPPER_CLASS_BOILERPLATE(
+ OmpFailClause, common::Indirection<OmpMemoryOrderClause>);
+ CharBlock source;
+};
+
// Ref: [4.5:107-109], [5.0:176-180], [5.1:205-210], [5.2:167-168]
//
// from-clause ->
@@ -4099,14 +4107,6 @@ struct OmpUpdateClause {
std::variant<OmpDependenceType, OmpTaskDependenceType> u;
};
-// OMP 5.2 15.8.3 extened-atomic, fail-clause ->
-// FAIL(memory-order)
-struct OmpFailClause {
- WRAPPER_CLASS_BOILERPLATE(
- OmpFailClause, common::Indirection<OmpMemoryOrderClause>);
- CharBlock source;
-};
-
// OpenMP Clauses
struct OmpClause {
UNION_CLASS_BOILERPLATE(OmpClause);
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index 4885f79222aa16..82dec4b2c09ae7 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -2494,8 +2494,7 @@ void OmpStructureChecker::CheckAtomicMemoryOrderClause(
numFailClause++;
if (numFailClause > 1) {
context_.Say(clause.source,
- "More than one fail clause not allowed on "
- "OpenMP Atomic construct"_err_en_US);
+ "More than one FAIL clause not allowed on OpenMP ATOMIC construct"_err_en_US);
return;
}
} else {
@@ -2503,8 +2502,7 @@ void OmpStructureChecker::CheckAtomicMemoryOrderClause(
numMemoryOrderClause++;
if (numMemoryOrderClause > 1) {
context_.Say(clause.source,
- "More than one memory order clause not allowed on "
- "OpenMP Atomic construct"_err_en_US);
+ "More than one memory order clause not allowed on OpenMP ATOMIC construct"_err_en_US);
return;
}
}
diff --git a/flang/test/Semantics/OpenMP/atomic-compare.f90 b/flang/test/Semantics/OpenMP/atomic-compare.f90
index f677f0c2d8c0f8..54492bf6a22a60 100644
--- a/flang/test/Semantics/OpenMP/atomic-compare.f90
+++ b/flang/test/Semantics/OpenMP/atomic-compare.f90
@@ -44,46 +44,46 @@
!$omp end atomic
! Check for error conditions:
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the COMPARE directive
!$omp atomic seq_cst seq_cst compare
if (b .eq. c) b = a
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the COMPARE directive
!$omp atomic compare seq_cst seq_cst
if (b .eq. c) b = a
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the COMPARE directive
!$omp atomic seq_cst compare seq_cst
if (b .eq. c) b = a
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQUIRE clause can appear on the COMPARE directive
!$omp atomic acquire acquire compare
if (b .eq. c) b = a
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQUIRE clause can appear on the COMPARE directive
!$omp atomic compare acquire acquire
if (b .eq. c) b = a
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQUIRE clause can appear on the COMPARE directive
!$omp atomic acquire compare acquire
if (b .eq. c) b = a
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the COMPARE directive
!$omp atomic relaxed relaxed compare
if (b .eq. c) b = a
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the COMPARE directive
!$omp atomic compare relaxed relaxed
if (b .eq. c) b = a
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the COMPARE directive
!$omp atomic relaxed compare relaxed
if (b .eq. c) b = a
- !ERROR: More than one fail clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one FAIL clause not allowed on OpenMP ATOMIC construct
!$omp atomic fail(release) compare fail(release)
if (c .eq. a) a = b
!$omp end atomic
diff --git a/flang/test/Semantics/OpenMP/atomic01.f90 b/flang/test/Semantics/OpenMP/atomic01.f90
index 538db316f6e7f5..173effe86b69c0 100644
--- a/flang/test/Semantics/OpenMP/atomic01.f90
+++ b/flang/test/Semantics/OpenMP/atomic01.f90
@@ -14,193 +14,193 @@
! At most one memory-order-clause may appear on the construct.
!READ
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the READ directive
!$omp atomic seq_cst seq_cst read
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the READ directive
!$omp atomic read seq_cst seq_cst
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the READ directive
!$omp atomic seq_cst read seq_cst
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQUIRE clause can appear on the READ directive
!$omp atomic acquire acquire read
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQUIRE clause can appear on the READ directive
!$omp atomic read acquire acquire
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQUIRE clause can appear on the READ directive
!$omp atomic acquire read acquire
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the READ directive
!$omp atomic relaxed relaxed read
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the READ directive
!$omp atomic read relaxed relaxed
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the READ directive
!$omp atomic relaxed read relaxed
i = j
!UPDATE
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the UPDATE directive
!$omp atomic seq_cst seq_cst update
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the UPDATE directive
!$omp atomic update seq_cst seq_cst
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the UPDATE directive
!$omp atomic seq_cst update seq_cst
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the UPDATE directive
!$omp atomic release release update
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the UPDATE directive
!$omp atomic update release release
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the UPDATE directive
!$omp atomic release update release
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the UPDATE directive
!$omp atomic relaxed relaxed update
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the UPDATE directive
!$omp atomic update relaxed relaxed
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the UPDATE directive
!$omp atomic relaxed update relaxed
!ERROR: Invalid or missing operator in atomic update statement
i = j
!CAPTURE
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the CAPTURE directive
!$omp atomic seq_cst seq_cst capture
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the CAPTURE directive
!$omp atomic capture seq_cst seq_cst
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the CAPTURE directive
!$omp atomic seq_cst capture seq_cst
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the CAPTURE directive
!$omp atomic release release capture
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the CAPTURE directive
!$omp atomic capture release release
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the CAPTURE directive
!$omp atomic release capture release
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the CAPTURE directive
!$omp atomic relaxed relaxed capture
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the CAPTURE directive
!$omp atomic capture relaxed relaxed
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the CAPTURE directive
!$omp atomic relaxed capture relaxed
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQ_REL clause can appear on the CAPTURE directive
!$omp atomic acq_rel acq_rel capture
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQ_REL clause can appear on the CAPTURE directive
!$omp atomic capture acq_rel acq_rel
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQ_REL clause can appear on the CAPTURE directive
!$omp atomic acq_rel capture acq_rel
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQUIRE clause can appear on the CAPTURE directive
!$omp atomic acquire acquire capture
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQUIRE clause can appear on the CAPTURE directive
!$omp atomic capture acquire acquire
i = j
j = k
!$omp end atomic
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one ACQUIRE clause can appear on the CAPTURE directive
!$omp atomic acquire capture acquire
i = j
@@ -208,57 +208,57 @@
!$omp end atomic
!WRITE
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the WRITE directive
!$omp atomic seq_cst seq_cst write
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the WRITE directive
!$omp atomic write seq_cst seq_cst
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the WRITE directive
!$omp atomic seq_cst write seq_cst
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the WRITE directive
!$omp atomic release release write
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the WRITE directive
!$omp atomic write release release
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the WRITE directive
!$omp atomic release write release
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the WRITE directive
!$omp atomic relaxed relaxed write
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the WRITE directive
!$omp atomic write relaxed relaxed
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the WRITE directive
!$omp atomic relaxed write relaxed
i = j
!No atomic-clause
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELAXED clause can appear on the ATOMIC directive
!$omp atomic relaxed relaxed
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one SEQ_CST clause can appear on the ATOMIC directive
!$omp atomic seq_cst seq_cst
!ERROR: Invalid or missing operator in atomic update statement
i = j
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!ERROR: At most one RELEASE clause can appear on the ATOMIC directive
!$omp atomic release release
!ERROR: Invalid or missing operator in atomic update statement
diff --git a/flang/test/Semantics/OpenMP/atomic05.f90 b/flang/test/Semantics/OpenMP/atomic05.f90
index f37aabcfce06ec..266268a2124409 100644
--- a/flang/test/Semantics/OpenMP/atomic05.f90
+++ b/flang/test/Semantics/OpenMP/atomic05.f90
@@ -8,20 +8,20 @@ program OmpAtomic
use omp_lib
integer :: g, x
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!$omp atomic relaxed, seq_cst
x = x + 1
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!$omp atomic read seq_cst, relaxed
x = g
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!$omp atomic write relaxed, release
x = 2 * 4
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!$omp atomic update release, seq_cst
!ERROR: Invalid or missing operator in atomic update statement
x = 10
- !ERROR: More than one memory order clause not allowed on OpenMP Atomic construct
+ !ERROR: More than one memory order clause not allowed on OpenMP ATOMIC construct
!$omp atomic capture release, seq_cst
x = g
g = x * 10
>From 35856c165bb595dcc38491c15f73864374651f9b Mon Sep 17 00:00:00 2001
From: Mats Petersson <mats.petersson at arm.com>
Date: Fri, 6 Dec 2024 18:08:55 +0000
Subject: [PATCH 3/3] Minor review updates
---
flang/include/flang/Parser/parse-tree.h | 2 +-
flang/lib/Semantics/check-omp-structure.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 946d1d940880dd..2b4cb21017fa0d 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -3915,7 +3915,7 @@ struct OmpDeviceTypeClause {
WRAPPER_CLASS_BOILERPLATE(OmpDeviceTypeClause, DeviceTypeDescription);
};
-// OMP 5.2 15.8.3 extened-atomic, fail-clause ->
+// OMP 5.2 15.8.3 extended-atomic, fail-clause ->
// FAIL(memory-order)
struct OmpFailClause {
WRAPPER_CLASS_BOILERPLATE(
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index 82dec4b2c09ae7..9dca75ccfc784f 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -2485,8 +2485,8 @@ void OmpStructureChecker::CheckAtomicCaptureConstruct(
void OmpStructureChecker::CheckAtomicMemoryOrderClause(
const parser::OmpAtomicClauseList *leftHandClauseList,
const parser::OmpAtomicClauseList *rightHandClauseList) {
- int numMemoryOrderClause = 0;
- int numFailClause = 0;
+ int numMemoryOrderClause{0};
+ int numFailClause{0};
auto checkForValidMemoryOrderClause =
[&](const parser::OmpAtomicClauseList *clauseList) {
for (const auto &clause : clauseList->v) {
More information about the flang-commits
mailing list