[flang-commits] [flang] [Flang] Add semantics checks for cray pointer usage in DSA list (PR #123171)
Thirumalai Shaktivel via flang-commits
flang-commits at lists.llvm.org
Sun Jan 26 21:41:46 PST 2025
https://github.com/Thirumalai-Shaktivel updated https://github.com/llvm/llvm-project/pull/123171
>From 9425e5dee8a184aa63028e544e6b3ff30bbbda92 Mon Sep 17 00:00:00 2001
From: Thirumalai-Shaktivel <thirumalaishaktivel at gmail.com>
Date: Tue, 24 Dec 2024 04:55:39 +0000
Subject: [PATCH 1/3] [Flang OpenMP] Add semantics checks for cray pointer
usage in DSA list
Problems:
- Cray pointee cannot be used in the DSA list
- Cray pointer has to be in DSA list when cray pointee is used
in the default (none) region
Fix: Added required semantic checks along the tests
---
flang/lib/Semantics/check-omp-structure.cpp | 19 +++++++++++++
flang/lib/Semantics/check-omp-structure.h | 2 ++
flang/lib/Semantics/resolve-directives.cpp | 24 ++++++++++++-----
.../Semantics/OpenMP/cray-pointer-usage.f90 | 27 +++++++++++++++++++
4 files changed, 66 insertions(+), 6 deletions(-)
create mode 100644 flang/test/Semantics/OpenMP/cray-pointer-usage.f90
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index 6db43cf6f04bd3..d1f943f86f324e 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -3374,6 +3374,7 @@ void OmpStructureChecker::Enter(const parser::OmpClause::Ordered &x) {
void OmpStructureChecker::Enter(const parser::OmpClause::Shared &x) {
CheckAllowedClause(llvm::omp::Clause::OMPC_shared);
CheckIsVarPartOfAnotherVar(GetContext().clauseSource, x.v, "SHARED");
+ CheckCrayPointee(x.v, "SHARED");
}
void OmpStructureChecker::Enter(const parser::OmpClause::Private &x) {
SymbolSourceMap symbols;
@@ -3381,6 +3382,7 @@ void OmpStructureChecker::Enter(const parser::OmpClause::Private &x) {
CheckAllowedClause(llvm::omp::Clause::OMPC_private);
CheckIsVarPartOfAnotherVar(GetContext().clauseSource, x.v, "PRIVATE");
CheckIntentInPointer(symbols, llvm::omp::Clause::OMPC_private);
+ CheckCrayPointee(x.v, "PRIVATE");
}
void OmpStructureChecker::Enter(const parser::OmpClause::Nowait &x) {
@@ -3460,6 +3462,7 @@ void OmpStructureChecker::Enter(const parser::OmpClause::Firstprivate &x) {
CheckAllowedClause(llvm::omp::Clause::OMPC_firstprivate);
CheckIsVarPartOfAnotherVar(GetContext().clauseSource, x.v, "FIRSTPRIVATE");
+ CheckCrayPointee(x.v, "FIRSTPRIVATE");
CheckIsLoopIvPartOfClause(llvmOmpClause::OMPC_firstprivate, x.v);
SymbolSourceMap currSymbols;
@@ -4556,6 +4559,22 @@ void OmpStructureChecker::CheckProcedurePointer(
}
}
+void OmpStructureChecker::CheckCrayPointee(
+ const parser::OmpObjectList &objectList, llvm::StringRef clause) {
+ SymbolSourceMap symbols;
+ GetSymbolsInObjectList(objectList, symbols);
+ for (auto it{symbols.begin()}; it != symbols.end(); ++it) {
+ const auto *symbol{it->first};
+ const auto source{it->second};
+ if (symbol->test(Symbol::Flag::CrayPointee)) {
+ context_.Say(source,
+ "Cray Pointee '%s' may not appear in %s clause, use Cray Pointer '%s' instead"_err_en_US,
+ symbol->name(), clause.str(),
+ semantics::GetCrayPointer(*symbol).name());
+ }
+ }
+}
+
void OmpStructureChecker::GetSymbolsInObjectList(
const parser::OmpObjectList &objectList, SymbolSourceMap &symbols) {
for (const auto &ompObject : objectList.v) {
diff --git a/flang/lib/Semantics/check-omp-structure.h b/flang/lib/Semantics/check-omp-structure.h
index dc360957c873b7..8952c4a85ccd41 100644
--- a/flang/lib/Semantics/check-omp-structure.h
+++ b/flang/lib/Semantics/check-omp-structure.h
@@ -197,6 +197,8 @@ class OmpStructureChecker
const parser::CharBlock &source, const parser::OmpObjectList &objList);
void CheckIntentInPointer(SymbolSourceMap &, const llvm::omp::Clause);
void CheckProcedurePointer(SymbolSourceMap &, const llvm::omp::Clause);
+ void CheckCrayPointee(
+ const parser::OmpObjectList &objectList, llvm::StringRef clause);
void GetSymbolsInObjectList(const parser::OmpObjectList &, SymbolSourceMap &);
void CheckDefinableObjects(SymbolSourceMap &, const llvm::omp::Clause);
void CheckCopyingPolymorphicAllocatable(
diff --git a/flang/lib/Semantics/resolve-directives.cpp b/flang/lib/Semantics/resolve-directives.cpp
index 39478b58a9070d..9cbc61391ba1fb 100644
--- a/flang/lib/Semantics/resolve-directives.cpp
+++ b/flang/lib/Semantics/resolve-directives.cpp
@@ -2115,8 +2115,12 @@ void OmpAttributeVisitor::Post(const parser::OpenMPAllocatorsConstruct &x) {
static bool IsPrivatizable(const Symbol *sym) {
auto *misc{sym->detailsIf<MiscDetails>()};
return IsVariableName(*sym) && !IsProcedure(*sym) && !IsNamedConstant(*sym) &&
- !semantics::IsAssumedSizeArray(
- *sym) && /* OpenMP 5.2, 5.1.1: Assumed-size arrays are shared*/
+ (!semantics::IsAssumedSizeArray(
+ *sym) || /* OpenMP 5.2, 5.1.1: Assumed-size arrays are shared*/
+ (sym->test(Symbol::Flag::CrayPointee) &&
+ // If CrayPointer is among the DSA list then the
+ // CrayPointee is Privatizable
+ &semantics::GetCrayPointer(*sym))) &&
!sym->owner().IsDerivedType() &&
sym->owner().kind() != Scope::Kind::ImpliedDos &&
!sym->detailsIf<semantics::AssocEntityDetails>() &&
@@ -2282,10 +2286,18 @@ void OmpAttributeVisitor::Post(const parser::Name &name) {
// the scope of the parallel region, and not in this scope.
// TODO: check whether this should be caught in IsObjectWithDSA
!symbol->test(Symbol::Flag::OmpPrivate)) {
- context_.Say(name.source,
- "The DEFAULT(NONE) clause requires that '%s' must be listed in "
- "a data-sharing attribute clause"_err_en_US,
- symbol->name());
+ if (symbol->test(Symbol::Flag::CrayPointee)) {
+ std::string crayPtrName{
+ semantics::GetCrayPointer(*symbol).name().ToString()};
+ if (!IsObjectWithDSA(*currScope().FindSymbol(crayPtrName)))
+ context_.Say(name.source,
+ "The DEFAULT(NONE) clause requires that the Cray Pointer '%s' must be listed in a data-sharing attribute clause"_err_en_US,
+ crayPtrName);
+ } else {
+ context_.Say(name.source,
+ "The DEFAULT(NONE) clause requires that '%s' must be listed in a data-sharing attribute clause"_err_en_US,
+ symbol->name());
+ }
}
}
}
diff --git a/flang/test/Semantics/OpenMP/cray-pointer-usage.f90 b/flang/test/Semantics/OpenMP/cray-pointer-usage.f90
new file mode 100644
index 00000000000000..c7d03f0db99040
--- /dev/null
+++ b/flang/test/Semantics/OpenMP/cray-pointer-usage.f90
@@ -0,0 +1,27 @@
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
+subroutine test_cray_pointer_usage
+ implicit none
+ real(8) :: var(*), pointee(2)
+ pointer(ivar, var)
+
+ pointee = 42.0
+ ivar = loc(pointee)
+
+ !$omp parallel num_threads(2) default(none)
+ ! ERROR: The DEFAULT(NONE) clause requires that the Cray Pointer 'ivar' must be listed in a data-sharing attribute clause
+ print *, var(1)
+ !$omp end parallel
+
+ ! ERROR: Cray Pointee 'var' may not appear in PRIVATE clause, use Cray Pointer 'ivar' instead
+ !$omp parallel num_threads(2) default(none) private(var)
+ print *, var(1)
+ !$omp end parallel
+
+ !$omp parallel num_threads(2) default(none) firstprivate(ivar)
+ print *, var(1)
+ !$omp end parallel
+
+ !$omp parallel num_threads(2) default(private) shared(ivar)
+ print *, var(1)
+ !$omp end parallel
+end subroutine test_cray_pointer_usage
>From 538a41ce83b3cf3a770c833d9970c2df453cc375 Mon Sep 17 00:00:00 2001
From: Thirumalai-Shaktivel <thirumalaishaktivel at gmail.com>
Date: Thu, 16 Jan 2025 09:22:13 +0000
Subject: [PATCH 2/3] [Flang] Remove redundant check for CrayPointer
---
flang/lib/Semantics/resolve-directives.cpp | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/flang/lib/Semantics/resolve-directives.cpp b/flang/lib/Semantics/resolve-directives.cpp
index 9cbc61391ba1fb..0218288e373b92 100644
--- a/flang/lib/Semantics/resolve-directives.cpp
+++ b/flang/lib/Semantics/resolve-directives.cpp
@@ -2115,12 +2115,11 @@ void OmpAttributeVisitor::Post(const parser::OpenMPAllocatorsConstruct &x) {
static bool IsPrivatizable(const Symbol *sym) {
auto *misc{sym->detailsIf<MiscDetails>()};
return IsVariableName(*sym) && !IsProcedure(*sym) && !IsNamedConstant(*sym) &&
- (!semantics::IsAssumedSizeArray(
- *sym) || /* OpenMP 5.2, 5.1.1: Assumed-size arrays are shared*/
- (sym->test(Symbol::Flag::CrayPointee) &&
- // If CrayPointer is among the DSA list then the
- // CrayPointee is Privatizable
- &semantics::GetCrayPointer(*sym))) &&
+ ( // OpenMP 5.2, 5.1.1: Assumed-size arrays are shared
+ !semantics::IsAssumedSizeArray(*sym) ||
+ // If CrayPointer is among the DSA list then the
+ // CrayPointee is Privatizable
+ sym->test(Symbol::Flag::CrayPointee)) &&
!sym->owner().IsDerivedType() &&
sym->owner().kind() != Scope::Kind::ImpliedDos &&
!sym->detailsIf<semantics::AssocEntityDetails>() &&
>From 1142fdc0de554ebfc70419be5344c9f581152bb1 Mon Sep 17 00:00:00 2001
From: Thirumalai-Shaktivel <thirumalaishaktivel at gmail.com>
Date: Mon, 27 Jan 2025 05:37:30 +0000
Subject: [PATCH 3/3] [Flang] Throw errors for other DSA clauses based on
OpenMP 5.0
---
flang/lib/Semantics/check-omp-structure.cpp | 14 ++++++++++----
flang/lib/Semantics/check-omp-structure.h | 4 ++--
.../Semantics/OpenMP/cray-pointer-usage.f90 | 17 +++++++++++++++++
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index d1f943f86f324e..d37b77efe144d5 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -3697,6 +3697,7 @@ void OmpStructureChecker::Enter(const parser::OmpClause::Linear &x) {
SymbolSourceMap symbols;
auto &objects{std::get<parser::OmpObjectList>(x.v.t)};
+ CheckCrayPointee(objects, "LINEAR", false);
GetSymbolsInObjectList(objects, symbols);
auto CheckIntegerNoRef{[&](const Symbol *symbol, parser::CharBlock source) {
@@ -4142,6 +4143,7 @@ void OmpStructureChecker::Enter(const parser::OmpClause::Lastprivate &x) {
const auto &objectList{std::get<parser::OmpObjectList>(x.v.t)};
CheckIsVarPartOfAnotherVar(
GetContext().clauseSource, objectList, "LASTPRIVATE");
+ CheckCrayPointee(objectList, "LASTPRIVATE");
DirectivesClauseTriple dirClauseTriple;
SymbolSourceMap currSymbols;
@@ -4560,17 +4562,21 @@ void OmpStructureChecker::CheckProcedurePointer(
}
void OmpStructureChecker::CheckCrayPointee(
- const parser::OmpObjectList &objectList, llvm::StringRef clause) {
+ const parser::OmpObjectList &objectList, llvm::StringRef clause,
+ bool suggestToUseCrayPointer) {
SymbolSourceMap symbols;
GetSymbolsInObjectList(objectList, symbols);
for (auto it{symbols.begin()}; it != symbols.end(); ++it) {
const auto *symbol{it->first};
const auto source{it->second};
if (symbol->test(Symbol::Flag::CrayPointee)) {
+ std::string suggestionMsg = "";
+ if (suggestToUseCrayPointer)
+ suggestionMsg = ", use Cray Pointer '" +
+ semantics::GetCrayPointer(*symbol).name().ToString() + "' instead";
context_.Say(source,
- "Cray Pointee '%s' may not appear in %s clause, use Cray Pointer '%s' instead"_err_en_US,
- symbol->name(), clause.str(),
- semantics::GetCrayPointer(*symbol).name());
+ "Cray Pointee '%s' may not appear in %s clause%s"_err_en_US,
+ symbol->name(), clause.str(), suggestionMsg);
}
}
}
diff --git a/flang/lib/Semantics/check-omp-structure.h b/flang/lib/Semantics/check-omp-structure.h
index 8952c4a85ccd41..a0f7a86cd927a1 100644
--- a/flang/lib/Semantics/check-omp-structure.h
+++ b/flang/lib/Semantics/check-omp-structure.h
@@ -197,8 +197,8 @@ class OmpStructureChecker
const parser::CharBlock &source, const parser::OmpObjectList &objList);
void CheckIntentInPointer(SymbolSourceMap &, const llvm::omp::Clause);
void CheckProcedurePointer(SymbolSourceMap &, const llvm::omp::Clause);
- void CheckCrayPointee(
- const parser::OmpObjectList &objectList, llvm::StringRef clause);
+ void CheckCrayPointee(const parser::OmpObjectList &objectList,
+ llvm::StringRef clause, bool suggestToUseCrayPointer = true);
void GetSymbolsInObjectList(const parser::OmpObjectList &, SymbolSourceMap &);
void CheckDefinableObjects(SymbolSourceMap &, const llvm::omp::Clause);
void CheckCopyingPolymorphicAllocatable(
diff --git a/flang/test/Semantics/OpenMP/cray-pointer-usage.f90 b/flang/test/Semantics/OpenMP/cray-pointer-usage.f90
index c7d03f0db99040..6c74462dd27896 100644
--- a/flang/test/Semantics/OpenMP/cray-pointer-usage.f90
+++ b/flang/test/Semantics/OpenMP/cray-pointer-usage.f90
@@ -1,8 +1,13 @@
!RUN: %python %S/../test_errors.py %s %flang -fopenmp
subroutine test_cray_pointer_usage
implicit none
+ integer :: i
real(8) :: var(*), pointee(2)
pointer(ivar, var)
+ ! ERROR: Cray Pointee 'var' may not appear in LINEAR clause
+ ! ERROR: The list item 'var' specified without the REF 'linear-modifier' must be of INTEGER type
+ ! ERROR: The list item `var` must be a dummy argument
+ !$omp declare simd linear(var)
pointee = 42.0
ivar = loc(pointee)
@@ -17,6 +22,18 @@ subroutine test_cray_pointer_usage
print *, var(1)
!$omp end parallel
+ ! ERROR: Cray Pointee 'var' may not appear in SHARED clause, use Cray Pointer 'ivar' instead
+ !$omp parallel num_threads(2) default(none) shared(var)
+ print *, var(1)
+ !$omp end parallel
+
+ ! ERROR: Cray Pointee 'var' may not appear in LASTPRIVATE clause, use Cray Pointer 'ivar' instead
+ !$omp do lastprivate(var)
+ do i = 1, 10
+ print *, var(1)
+ end do
+ !$omp end do
+
!$omp parallel num_threads(2) default(none) firstprivate(ivar)
print *, var(1)
!$omp end parallel
More information about the flang-commits
mailing list