Skip to content

[flang][openacc] Allow if clause on atomic directives #135451

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
Apr 15, 2025
Merged

[flang][openacc] Allow if clause on atomic directives #135451

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
10 changes: 6 additions & 4 deletions flang/include/flang/Parser/parse-tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5244,21 +5244,23 @@ EMPTY_CLASS(AccEndAtomic);
// ACC ATOMIC READ
struct AccAtomicRead {
TUPLE_CLASS_BOILERPLATE(AccAtomicRead);
std::tuple<Verbatim, Statement<AssignmentStmt>, std::optional<AccEndAtomic>>
std::tuple<Verbatim, AccClauseList, Statement<AssignmentStmt>,
std::optional<AccEndAtomic>>
t;
};

// ACC ATOMIC WRITE
struct AccAtomicWrite {
TUPLE_CLASS_BOILERPLATE(AccAtomicWrite);
std::tuple<Verbatim, Statement<AssignmentStmt>, std::optional<AccEndAtomic>>
std::tuple<Verbatim, AccClauseList, Statement<AssignmentStmt>,
std::optional<AccEndAtomic>>
t;
};

// ACC ATOMIC UPDATE
struct AccAtomicUpdate {
TUPLE_CLASS_BOILERPLATE(AccAtomicUpdate);
std::tuple<std::optional<Verbatim>, Statement<AssignmentStmt>,
std::tuple<std::optional<Verbatim>, AccClauseList, Statement<AssignmentStmt>,
std::optional<AccEndAtomic>>
t;
};
Expand All @@ -5268,7 +5270,7 @@ struct AccAtomicCapture {
TUPLE_CLASS_BOILERPLATE(AccAtomicCapture);
WRAPPER_CLASS(Stmt1, Statement<AssignmentStmt>);
WRAPPER_CLASS(Stmt2, Statement<AssignmentStmt>);
std::tuple<Verbatim, Stmt1, Stmt2, AccEndAtomic> t;
std::tuple<Verbatim, AccClauseList, Stmt1, Stmt2, AccEndAtomic> t;
};

struct OpenACCAtomicConstruct {
Expand Down
25 changes: 14 additions & 11 deletions flang/lib/Parser/openacc-parsers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,22 +187,25 @@ TYPE_PARSER(construct<AccBeginCombinedDirective>(
// 2.12 Atomic constructs
TYPE_PARSER(construct<AccEndAtomic>(startAccLine >> "END ATOMIC"_tok))

TYPE_PARSER("ATOMIC" >>
construct<AccAtomicRead>(verbatim("READ"_tok) / endAccLine,
statement(assignmentStmt), maybe(Parser<AccEndAtomic>{} / endAccLine)))
TYPE_PARSER("ATOMIC" >> construct<AccAtomicRead>(verbatim("READ"_tok),
Parser<AccClauseList>{} / endAccLine,
statement(assignmentStmt),
maybe(Parser<AccEndAtomic>{} / endAccLine)))

TYPE_PARSER("ATOMIC" >>
construct<AccAtomicWrite>(verbatim("WRITE"_tok) / endAccLine,
statement(assignmentStmt), maybe(Parser<AccEndAtomic>{} / endAccLine)))
TYPE_PARSER("ATOMIC" >> construct<AccAtomicWrite>(verbatim("WRITE"_tok),
Parser<AccClauseList>{} / endAccLine,
statement(assignmentStmt),
maybe(Parser<AccEndAtomic>{} / endAccLine)))

TYPE_PARSER("ATOMIC" >>
construct<AccAtomicUpdate>(maybe(verbatim("UPDATE"_tok)) / endAccLine,
statement(assignmentStmt), maybe(Parser<AccEndAtomic>{} / endAccLine)))
construct<AccAtomicUpdate>(maybe(verbatim("UPDATE"_tok)),
Parser<AccClauseList>{} / endAccLine, statement(assignmentStmt),
maybe(Parser<AccEndAtomic>{} / endAccLine)))

TYPE_PARSER("ATOMIC" >>
construct<AccAtomicCapture>(verbatim("CAPTURE"_tok) / endAccLine,
statement(assignmentStmt), statement(assignmentStmt),
Parser<AccEndAtomic>{} / endAccLine))
construct<AccAtomicCapture>(verbatim("CAPTURE"_tok),
Parser<AccClauseList>{} / endAccLine, statement(assignmentStmt),
statement(assignmentStmt), Parser<AccEndAtomic>{} / endAccLine))

TYPE_PARSER(
sourced(construct<OpenACCAtomicConstruct>(Parser<AccAtomicRead>{})) ||
Expand Down
32 changes: 32 additions & 0 deletions flang/test/Semantics/OpenACC/acc-atomic-validity.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ program openacc_atomic_validity
integer :: i
integer, parameter :: N = 256
integer, dimension(N) :: c
logical :: l


!$acc parallel
Expand All @@ -23,27 +24,58 @@ program openacc_atomic_validity
!$acc atomic write
c(i) = 10

!$acc atomic write if(l)
c(i) = 10

!$acc atomic write
c(i) = 10
!$acc end atomic

!$acc atomic write if(.true.)
c(i) = 10
!$acc end atomic

!$acc atomic read
i = c(i)

!$acc atomic read if(.true.)
i = c(i)

!$acc atomic read
i = c(i)
!$acc end atomic

!$acc atomic read if(l)
i = c(i)
!$acc end atomic

!ERROR: FINALIZE clause is not allowed on the ATOMIC READ FINALIZE IF(L)
!$acc atomic read finalize if(l)
i = c(i)
!$acc end atomic

!$acc atomic capture
c(i) = i
i = i + 1
!$acc end atomic

!$acc atomic capture if(l .EQV. .false.)
c(i) = i
i = i + 1
!$acc end atomic

!$acc atomic update
!ERROR: RHS of atomic update statement must be scalar
!ERROR: LHS of atomic update statement must be scalar
c = c + 1

!$acc atomic update if(i == 0)
c(i) = c(i) + 1

!ERROR: At most one IF clause can appear on the ATOMIC UPDATE IF(I == 0) IF(.TRUE.)
!$acc atomic update if(i == 0) if(.true.)
c(i) = c(i) + 1

!$acc end parallel

end program openacc_atomic_validity
1 change: 1 addition & 0 deletions llvm/include/llvm/Frontend/OpenACC/ACC.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ def ACCC_Unknown : Clause<"unknown"> {

// 2.12
def ACC_Atomic : Directive<"atomic"> {
let allowedOnceClauses = [VersionedClause<ACCC_If, 34>];
let association = AS_Block;
let category = CA_Executable;
}
Expand Down