Skip to content

[Flang][OpenMP] Skip threadprivate HostAssoc symbols for default privatization #127754

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
Feb 19, 2025
Merged

[Flang][OpenMP] Skip threadprivate HostAssoc symbols for default privatization #127754

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 @@ -2309,7 +2309,7 @@ void OmpAttributeVisitor::Post(const parser::Name &name) {
}

if (Symbol * found{currScope().FindSymbol(name.source)}) {
if (found->test(semantics::Symbol::Flag::OmpThreadprivate))
if (found->GetUltimate().test(semantics::Symbol::Flag::OmpThreadprivate))
return;
}

Expand Down
54 changes: 52 additions & 2 deletions flang/test/Lower/OpenMP/threadprivate-hlfir.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
!CHECK: %{{.*}} = fir.call @_FortranAioOutputInteger32(%{{.*}}, %[[TP_VAL]]) fastmath<contract> : (!fir.ref<i8>, i32) -> i1
!CHECK: omp.terminator

!CHECK: fir.global internal @_QFsubEa : i32

subroutine sub()
integer, save:: a
!$omp threadprivate(a)
Expand All @@ -25,3 +23,55 @@ subroutine sub()
!$omp end parallel
end subroutine

!CHECK-LABEL: func.func @_QPsub_02()
subroutine sub_02()
integer, save :: a
!$omp threadprivate(a)
!CHECK: %[[ADDR_02:.*]] = fir.address_of(@_QFsub_02Ea) : !fir.ref<i32>
!CHECK: %[[DECL_02:.*]]:2 = hlfir.declare %[[ADDR_02]] {{{.*}} uniq_name = "_QFsub_02Ea"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
!CHECK: %[[TP_02:.*]] = omp.threadprivate %[[DECL_02]]#1 : !fir.ref<i32> -> !fir.ref<i32>
!CHECK: %[[TP_DECL_02:.*]]:2 = hlfir.declare %[[TP_02]] {{{.*}} uniq_name = "_QFsub_02Ea"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
call sub_03
!CHECK: fir.call @_QFsub_02Psub_03() fastmath<contract> : () -> ()
!CHECK: return

contains

!CHECK-LABEL: func.func private @_QFsub_02Psub_03()
subroutine sub_03()
!CHECK: %[[ADDR_03:.*]] = fir.address_of(@_QFsub_02Ea) : !fir.ref<i32>
!CHECK: %[[DECL_03:.*]]:2 = hlfir.declare %[[ADDR_03]] {uniq_name = "_QFsub_02Ea"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
!CHECK: %[[TP_03:.*]] = omp.threadprivate %[[DECL_03]]#1 : !fir.ref<i32> -> !fir.ref<i32>
!CHECK: %[[TP_DECL_03:.*]]:2 = hlfir.declare %[[TP_03]] {uniq_name = "_QFsub_02Ea"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
!$omp parallel default(private)
!CHECK: omp.parallel
!CHECK: %[[TP_04:.*]] = omp.threadprivate %[[DECL_03]]#1 : !fir.ref<i32> -> !fir.ref<i32>
!CHECK: %[[TP_DECL_04:.*]]:2 = hlfir.declare %[[TP_04]] {uniq_name = "_QFsub_02Ea"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
print *, a
!CHECK: omp.terminator
!$omp end parallel
end subroutine
end subroutine

module mod_01
integer, save :: a
!CHECK: fir.global @_QMmod_01Ea : i32
!$omp threadprivate(a)
end module

!CHECK-LABEL: func.func @_QPsub_05()
subroutine sub_05()
use mod_01, only: a
!$omp parallel default(private)
!CHECK: omp.parallel {
!CHECK: %[[TP_05:.*]] = omp.threadprivate %{{.*}} : !fir.ref<i32> -> !fir.ref<i32>
!CHECK: %{{.*}} = hlfir.declare %[[TP_05]] {uniq_name = "_QMmod_01Ea"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
print *, a
!CHECK: omp.terminator
!$omp end parallel
end subroutine


!CHECK: fir.global internal @_QFsubEa : i32

!CHECK: fir.global internal @_QFsub_02Ea : i32