Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

[flang][OpenMP] Fix offsets for EQUIVALENCE in firstprivate(/block/) (#156492)

Browse source 
When a common block appears in firstprivate, its contents become host
associations, which the symbol offset computation code for equivalences
wasn't expecting. Add a GetUltimate() call, and extend symbol dumping
for HostAssocDetails.
This commit is contained in:
Peter Klausler 2025-09-03 11:07:10 -07:00 committed by GitHub
parent 2b9328c788
commit 83c1cf6251
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flang/lib/Semantics/compute-offsets.cpp
View file

@ -239,7 +239,9 @@ void ComputeOffsetsHelper::DoCommonBlock(Symbol &commonBlock) {
std::size_t minAlignment{0};
UnorderedSymbolSet previous;
for (auto object : details.objects()) {
Symbol &symbol{*object};
// Allow for host association when the common block is
// OpenMP firstprivate.
Symbol &symbol{object->GetUltimate()};
auto errorSite{
commonBlock.name().empty() ? symbol.name() : commonBlock.name()};
if (std::size_t padding{DoSymbol(symbol.GetUltimate())}) {

2
flang/lib/Semantics/symbol.cpp
View file

@ -611,7 +611,7 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &os, const Details &details) {
sep = ',';
}
},
[](const HostAssocDetails &) {},
[&os](const HostAssocDetails &x) { os << " => " << x.symbol(); },
[&](const ProcBindingDetails &x) {
os << " => " << x.symbol().name();
DumpOptional(os, "passName", x.passName());

4
flang/test/Semantics/cuf-device-procedures01.cuf
View file

@ -40,5 +40,5 @@ subroutine host()
end subroutine
! CHECK-LABEL: Subprogram scope: host
! CHECK: atomicadd, EXTERNAL: HostAssoc{{$}}
! CHECK: syncthreads, EXTERNAL: HostAssoc{{$}}
! CHECK: atomicadd, EXTERNAL: HostAssoc => atomicadd, EXTERNAL (Function, Implicit): ProcEntity REAL(4){{$}}
! CHECK: syncthreads, EXTERNAL: HostAssoc => syncthreads, EXTERNAL (Subroutine): ProcEntity{{$}}

20
flang/test/Semantics/offsets05.f90 Normal file
View file

@ -0,0 +1,20 @@
!RUN: %flang_fc1 -fdebug-dump-symbols -fopenmp %s | FileCheck %s
subroutine sub
common /block/ a
equivalence (b,c), (d,e), (a,f)
!$omp parallel firstprivate(/block/)
!$omp end parallel
end subroutine
!CHECK: a (Implicit, InCommonBlock) size=4 offset=0: ObjectEntity type: REAL(4)
!CHECK: b (Implicit) size=4 offset=0: ObjectEntity type: REAL(4)
!CHECK: c (Implicit) size=4 offset=0: ObjectEntity type: REAL(4)
!CHECK: d (Implicit) size=4 offset=4: ObjectEntity type: REAL(4)
!CHECK: e (Implicit) size=4 offset=4: ObjectEntity type: REAL(4)
!CHECK: f (Implicit) size=4 offset=0: ObjectEntity type: REAL(4)
!CHECK: sub (Subroutine): HostAssoc => sub (Subroutine): Subprogram ()
!CHECK: Equivalence Sets: (b,c) (d,e) (a,f)
!CHECK: block size=4 offset=0: CommonBlockDetails alignment=4: a
!CHECK: OtherConstruct scope:
!CHECK: a (OmpFirstPrivate, OmpExplicit): HostAssoc => a (Implicit, InCommonBlock) size=4 offset=0: ObjectEntity type: REAL(4)