Skip to content

[Flang][OpenMP] Do not default privatize symbols that are not variables #117886

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
Nov 28, 2024
Merged

[Flang][OpenMP] Do not default privatize symbols that are not variables #117886

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
2 changes: 1 addition & 1 deletion flang/lib/Semantics/resolve-directives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Copy link
Contributor Author

@kiranchandramohan kiranchandramohan Nov 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole check can probably be simplified further in a separate patch.

Copy link
Contributor

@luporl luporl Nov 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, it should be OK to remove at least !IsNamedConstant(*sym), probably !IsProcedure(*sym) too.

Copy link
Contributor Author

@kiranchandramohan kiranchandramohan Nov 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will update in a separate patch.

!semantics::IsAssumedSizeArray(
*sym) && /* OpenMP 5.2, 5.1.1: Assumed-size arrays are shared*/
!sym->owner().IsDerivedType() &&
Expand Down
17 changes: 17 additions & 0 deletions flang/test/Semantics/OpenMP/critical_within_default.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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