[Flang][OpenMP] Do not default privatize symbols that are not variables #117886
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes an issue where the compiler is trying to default privatize construct names. Fixes llvm#112572
llvmbot
added
flang
Member
|
@llvm/pr-subscribers-flang-openmp Author: Kiran Chandramohan (kiranchandramohan) ChangesFixes an issue where the compiler is trying to default privatize construct names. Fixes #112572 Full diff: https://github.com/llvm/llvm-project/pull/117886.diff 2 Files Affected:
diff --git a/flang/lib/Semantics/resolve-directives.cpp b/flang/lib/Semantics/resolve-directives.cpp
index 80e238f3476ac8..59013619cc689d 100644
--- a/flang/lib/Semantics/resolve-directives.cpp
+++ b/flang/lib/Semantics/resolve-directives.cpp
@@ -2112,7 +2112,7 @@ void OmpAttributeVisitor::Post(const parser::OpenMPAllocatorsConstruct &x) {
static bool IsPrivatizable(const Symbol *sym) {
auto *misc{sym->detailsIf<MiscDetails>()};
- return !IsProcedure(*sym) && !IsNamedConstant(*sym) &&
+ return IsVariableName(*sym) && !IsProcedure(*sym) && !IsNamedConstant(*sym) &&
!semantics::IsAssumedSizeArray(
*sym) && /* OpenMP 5.2, 5.1.1: Assumed-size arrays are shared*/
!sym->owner().IsDerivedType() &&
diff --git a/flang/test/Semantics/OpenMP/critical_within_default.f90 b/flang/test/Semantics/OpenMP/critical_within_default.f90
new file mode 100644
index 00000000000000..dd972e6e529492
--- /dev/null
+++ b/flang/test/Semantics/OpenMP/critical_within_default.f90
@@ -0,0 +1,17 @@
+! RUN: %flang_fc1 -fopenmp -fdebug-dump-symbols %s | FileCheck %s
+! Test that we do not make a private copy of the critical name
+
+!CHECK: MainProgram scope: mn
+!CHECK-NEXT: j size=4 offset=0: ObjectEntity type: INTEGER(4)
+!CHECK-NEXT: OtherConstruct scope:
+!CHECK-NEXT: j (OmpPrivate): HostAssoc
+!CHECK-NEXT: k2 (OmpCriticalLock): Unknown
+program mn
+ integer :: j
+ j=2
+ !$omp parallel default(private)
+ !$omp critical(k2)
+ j=200
+ !$omp end critical(k2)
+ !$omp end parallel
+end
|
Member
|
@llvm/pr-subscribers-flang-semantics Author: Kiran Chandramohan (kiranchandramohan) ChangesFixes an issue where the compiler is trying to default privatize construct names. Fixes #112572 Full diff: https://github.com/llvm/llvm-project/pull/117886.diff 2 Files Affected:
diff --git a/flang/lib/Semantics/resolve-directives.cpp b/flang/lib/Semantics/resolve-directives.cpp
index 80e238f3476ac8..59013619cc689d 100644
--- a/flang/lib/Semantics/resolve-directives.cpp
+++ b/flang/lib/Semantics/resolve-directives.cpp
@@ -2112,7 +2112,7 @@ void OmpAttributeVisitor::Post(const parser::OpenMPAllocatorsConstruct &x) {
static bool IsPrivatizable(const Symbol *sym) {
auto *misc{sym->detailsIf<MiscDetails>()};
- return !IsProcedure(*sym) && !IsNamedConstant(*sym) &&
+ return IsVariableName(*sym) && !IsProcedure(*sym) && !IsNamedConstant(*sym) &&
!semantics::IsAssumedSizeArray(
*sym) && /* OpenMP 5.2, 5.1.1: Assumed-size arrays are shared*/
!sym->owner().IsDerivedType() &&
diff --git a/flang/test/Semantics/OpenMP/critical_within_default.f90 b/flang/test/Semantics/OpenMP/critical_within_default.f90
new file mode 100644
index 00000000000000..dd972e6e529492
--- /dev/null
+++ b/flang/test/Semantics/OpenMP/critical_within_default.f90
@@ -0,0 +1,17 @@
+! RUN: %flang_fc1 -fopenmp -fdebug-dump-symbols %s | FileCheck %s
+! Test that we do not make a private copy of the critical name
+
+!CHECK: MainProgram scope: mn
+!CHECK-NEXT: j size=4 offset=0: ObjectEntity type: INTEGER(4)
+!CHECK-NEXT: OtherConstruct scope:
+!CHECK-NEXT: j (OmpPrivate): HostAssoc
+!CHECK-NEXT: k2 (OmpCriticalLock): Unknown
+program mn
+ integer :: j
+ j=2
+ !$omp parallel default(private)
+ !$omp critical(k2)
+ j=200
+ !$omp end critical(k2)
+ !$omp end parallel
+end
|
| static bool IsPrivatizable(const Symbol *sym) { | ||
| auto *misc{sym->detailsIf<MiscDetails>()}; | ||
| return !IsProcedure(*sym) && !IsNamedConstant(*sym) && | ||
| return IsVariableName(*sym) && !IsProcedure(*sym) && !IsNamedConstant(*sym) && |
Contributor
Author
There was a problem hiding this comment.
This whole check can probably be simplified further in a separate patch.
Contributor
There was a problem hiding this comment.
Right, it should be OK to remove at least !IsNamedConstant(*sym), probably !IsProcedure(*sym) too.
Contributor
Author
There was a problem hiding this comment.
I will update in a separate patch.
luporl
approved these changes
Nov 27, 2024
Contributor
luporl
left a comment
luporl
left a comment
There was a problem hiding this comment.
LGTM, thanks!
When I looked at this I really didn't realize that the name was only identifying the critical construct.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes an issue where the compiler is trying to default privatize construct names.
Fixes #112572