Skip to content

[flang][OpenMP] Use OmpDirectiveSpecification in ASSUMES #160591

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 14 commits into from
Sep 27, 2025
Merged

[flang][OpenMP] Use OmpDirectiveSpecification in ASSUMES #160591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2b1bc65
[flang][OpenMP] Introduce variant argument, customize OmpArgument par…
kparzysz Sep 23, 2025
38cf6a6
[flang][OpenMP] Use OmpDirectiveSpecification in DECLARE_VARIANT
kparzysz Sep 23, 2025
7e54af8
Fix directive name in message
kparzysz Sep 23, 2025
6f624f9
[flang][OpenMP] Use OmpDirectiveSpecification in DECLARE_SIMD
kparzysz Sep 23, 2025
acc37eb
format
kparzysz Sep 23, 2025
30c575b
Add missing trivial overload
kparzysz Sep 23, 2025
525f12f
[flang][OpenMP] Use OmpDirectiveSpecification in DECLARE_TARGET
kparzysz Sep 24, 2025
0f8c824
Remove unused AST classes
kparzysz Sep 24, 2025
f5eb99f
Fix example
kparzysz Sep 24, 2025
eb12400
[flang][OpenMP] Use OmpDirectiveSpecification in ASSUMES
kparzysz Sep 24, 2025
7f1df5b
Forgot "sourced"
kparzysz Sep 24, 2025
98ebcc3
Merge branch 'main' into users/kparzysz/r10-ods-declare-target
kparzysz Sep 25, 2025
cfef35d
Merge branch 'users/kparzysz/r10-ods-declare-target' into users/kparz…
kparzysz Sep 25, 2025
c2b2f6e
Merge branch 'main' into users/kparzysz/r11-ods-assumes
kparzysz Sep 26, 2025
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
2 changes: 0 additions & 2 deletions flang/include/flang/Parser/openmp-utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ struct ConstructId {
}

MAKE_CONSTR_ID(OpenMPDeclarativeAllocate, D::OMPD_allocate);
MAKE_CONSTR_ID(OpenMPDeclarativeAssumes, D::OMPD_assumes);
MAKE_CONSTR_ID(OpenMPDeclareReductionConstruct, D::OMPD_declare_reduction);
MAKE_CONSTR_ID(OpenMPExecutableAllocate, D::OMPD_allocate);
MAKE_CONSTR_ID(OpenMPRequiresConstruct, D::OMPD_requires);
Expand Down Expand Up @@ -94,7 +93,6 @@ struct DirectiveNameScope {
if constexpr (std::is_base_of_v<OmpBlockConstruct, T>) {
return std::get<OmpBeginDirective>(x.t).DirName();
} else if constexpr (std::is_same_v<T, OpenMPDeclarativeAllocate> ||
std::is_same_v<T, OpenMPDeclarativeAssumes> ||
std::is_same_v<T, OpenMPDeclareReductionConstruct> ||
std::is_same_v<T, OpenMPExecutableAllocate> ||
std::is_same_v<T, OpenMPRequiresConstruct>) {
Expand Down
4 changes: 2 additions & 2 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 @@ -4877,8 +4877,8 @@ struct OpenMPUtilityConstruct {
// ASSUMES absent-clause | contains-clause | holds-clause | no-openmp-clause |
// no-openmp-routines-clause | no-parallelism-clause
struct OpenMPDeclarativeAssumes {
TUPLE_CLASS_BOILERPLATE(OpenMPDeclarativeAssumes);
std::tuple<Verbatim, OmpClauseList> t;
WRAPPER_CLASS_BOILERPLATE(
OpenMPDeclarativeAssumes, OmpDirectiveSpecification);
CharBlock source;
};

Expand Down
4 changes: 3 additions & 1 deletion flang/lib/Parser/openmp-parsers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1853,7 +1853,9 @@ TYPE_PARSER(

// Assumes Construct
TYPE_PARSER(sourced(construct<OpenMPDeclarativeAssumes>(
verbatim("ASSUMES"_tok), Parser<OmpClauseList>{})))
predicated(OmpDirectiveNameParser{},
IsDirective(llvm::omp::Directive::OMPD_assumes)) >=
Parser<OmpDirectiveSpecification>{})))

// Declarative constructs
TYPE_PARSER(
Expand Down
4 changes: 2 additions & 2 deletions flang/lib/Parser/unparse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2558,8 +2558,8 @@ class UnparseVisitor {

void Unparse(const OpenMPDeclarativeAssumes &x) {
BeginOpenMP();
Word("!$OMP ASSUMES ");
Walk(std::get<OmpClauseList>(x.t));
Word("!$OMP ");
Walk(x.v);
Put("\n");
EndOpenMP();
}
Expand Down
4 changes: 0 additions & 4 deletions flang/lib/Semantics/check-omp-structure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,10 +620,6 @@ template <typename Checker> struct DirectiveSpellingVisitor {
checker_(GetDirName(x.t).source, Directive::OMPD_allocators);
return false;
}
bool Pre(const parser::OpenMPDeclarativeAssumes &x) {
checker_(std::get<parser::Verbatim>(x.t).source, Directive::OMPD_assumes);
return false;
}
bool Pre(const parser::OpenMPGroupprivate &x) {
checker_(x.v.DirName().source, Directive::OMPD_groupprivate);
return false;
Expand Down
8 changes: 5 additions & 3 deletions flang/test/Parser/OpenMP/assumption.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,11 @@ program p
end program p

!UNPARSE: PROGRAM p
!UNPARSE: !$OMP ASSUMES NO_OPENMP
!UNPARSE: !$OMP ASSUMES NO_OPENMP
!UNPARSE: END PROGRAM p

!PARSE-TREE: OpenMPDeclarativeConstruct -> OpenMPDeclarativeAssumes
!PARSE-TREE: | Verbatim
!PARSE-TREE: OpenMPDeclarativeConstruct -> OpenMPDeclarativeAssumes -> OmpDirectiveSpecification
!PARSE-TREE: | OmpDirectiveName -> llvm::omp::Directive = assumes
!PARSE-TREE: | OmpClauseList -> OmpClause -> NoOpenmp
!PARSE-TREE: | Flags = None
!PARSE-TREE: ImplicitPart ->