Skip to content

Revert "[flang][OpenMP] Fix firstprivate not working with lastprivate in DO SIMD" #171646

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
tblah merged 1 commit into from
Dec 10, 2025
Merged

Revert "[flang][OpenMP] Fix firstprivate not working with lastprivate in DO SIMD" #171646

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
20 changes: 12 additions & 8 deletions flang/lib/Lower/OpenMP/OpenMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3314,12 +3314,17 @@ static mlir::omp::WsloopOp genCompositeDoSimd(
genSimdClauses(converter, semaCtx, simdItem->clauses, loc, simdClauseOps,
simdReductionSyms);

DataSharingProcessor wsloopItemDSP(converter, semaCtx, doItem->clauses, eval,
/*shouldCollectPreDeterminedSymbols=*/true,
/*useDelayedPrivatization=*/true,
symTable);
DataSharingProcessor wsloopItemDSP(
converter, semaCtx, doItem->clauses, eval,
/*shouldCollectPreDeterminedSymbols=*/false,
/*useDelayedPrivatization=*/true, symTable);
wsloopItemDSP.processStep1(&wsloopClauseOps);

DataSharingProcessor simdItemDSP(converter, semaCtx, simdItem->clauses, eval,
/*shouldCollectPreDeterminedSymbols=*/true,
/*useDelayedPrivatization=*/true, symTable);
simdItemDSP.processStep1(&simdClauseOps, simdItem->id);

// Pass the innermost leaf construct's clauses because that's where COLLAPSE
// is placed by construct decomposition.
mlir::omp::LoopNestOperands loopNestClauseOps;
Expand All @@ -3338,9 +3343,8 @@ static mlir::omp::WsloopOp genCompositeDoSimd(
wsloopOp.setComposite(/*val=*/true);

EntryBlockArgs simdArgs;
// For composite 'do simd', privatization is handled by the wsloop.
// The simd does not create separate private storage for variables already
// privatized by the worksharing construct.
simdArgs.priv.syms = simdItemDSP.getDelayedPrivSymbols();
simdArgs.priv.vars = simdClauseOps.privateVars;
simdArgs.reduction.syms = simdReductionSyms;
simdArgs.reduction.vars = simdClauseOps.reductionVars;
auto simdOp =
Expand All @@ -3350,7 +3354,7 @@ static mlir::omp::WsloopOp genCompositeDoSimd(
genLoopNestOp(converter, symTable, semaCtx, eval, loc, queue, simdItem,
loopNestClauseOps, iv,
{{wsloopOp, wsloopArgs}, {simdOp, simdArgs}},
llvm::omp::Directive::OMPD_do_simd, wsloopItemDSP);
llvm::omp::Directive::OMPD_do_simd, simdItemDSP);
return wsloopOp;
}

Expand Down
48 changes: 0 additions & 48 deletions flang/test/Integration/OpenMP/do-simd-firstprivate-lastprivate-runtime.f90
View file
Open in desktop

This file was deleted.

89 changes: 0 additions & 89 deletions flang/test/Lower/OpenMP/do-simd-firstprivate-lastprivate.f90
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions flang/test/Lower/OpenMP/order-clause.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ end subroutine do_order

!CHECK-LABEL: func.func @_QPdo_simd_order() {
subroutine do_simd_order
!CHECK: omp.wsloop order(reproducible:concurrent)
!CHECK: omp.wsloop order(reproducible:concurrent) {
!$omp do simd order(concurrent)
do i = 1, 10
end do
!CHECK: omp.wsloop order(reproducible:concurrent)
!CHECK: omp.wsloop order(reproducible:concurrent) {
!$omp do simd order(reproducible:concurrent)
do i = 1, 10
end do
!CHECK: omp.wsloop order(unconstrained:concurrent)
!CHECK: omp.wsloop order(unconstrained:concurrent) {
!$omp do simd order(unconstrained:concurrent)
do i = 1, 10
end do
Expand All @@ -53,7 +53,7 @@ end subroutine do_simd_order
!CHECK-LABEL: func.func @_QPdo_simd_order_parallel() {
subroutine do_simd_order_parallel
!CHECK: omp.parallel {
!CHECK: omp.wsloop order(reproducible:concurrent)
!CHECK: omp.wsloop order(reproducible:concurrent) {
!$omp parallel do simd order(reproducible:concurrent)
do i = 1, 10
end do
Expand Down
9 changes: 7 additions & 2 deletions flang/test/Lower/OpenMP/wsloop-simd.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,16 @@ end subroutine do_simd_reduction
subroutine do_simd_private()
integer, allocatable :: tmp
! CHECK: omp.wsloop
! CHECK-SAME: private(@[[PRIV_IVAR_SYM:.*]] %{{.*}} -> %[[PRIV_IVAR:.*]] : !fir.ref<i32>)
! CHECK-NEXT: omp.simd
! CHECK-SAME: private(@[[PRIV_BOX_SYM:.*]] %{{.*}} -> %[[PRIV_BOX:.*]], @[[PRIV_IVAR_SYM:.*]] %{{.*}} -> %[[PRIV_IVAR:.*]] : !fir.ref<!fir.box<!fir.heap<i32>>>, !fir.ref<i32>)
! CHECK-NEXT: omp.loop_nest (%[[IVAR:.*]]) : i32
!$omp do simd private(tmp)
do i=1, 10
! CHECK: %[[PRIV_BOX_DECL:.*]]:2 = hlfir.declare %[[PRIV_BOX]]
! CHECK: %[[PRIV_IVAR_DECL:.*]]:2 = hlfir.declare %[[PRIV_IVAR]]
! CHECK: hlfir.assign %[[IVAR]] to %[[PRIV_IVAR_DECL]]#0
! CHECK: %[[PRIV_BOX_LOAD:.*]] = fir.load %[[PRIV_BOX_DECL]]
! CHECK: hlfir.assign %{{.*}} to %[[PRIV_BOX_DECL]]#0
! CHECK: omp.yield
tmp = tmp + 1
end do
Expand All @@ -87,11 +90,13 @@ end subroutine do_simd_private
subroutine do_simd_lastprivate_firstprivate()
integer :: a
! CHECK: omp.wsloop
! CHECK-SAME: private(@[[FIRSTPRIVATE_A_SYM:.*]] %{{.*}} -> %[[FIRSTPRIVATE_A:.*]], @[[PRIVATE_I_SYM:.*]] %{{.*}} -> %[[PRIVATE_I:.*]] : !fir.ref<i32>, !fir.ref<i32>)
! CHECK-SAME: private(@[[FIRSTPRIVATE_A_SYM:.*]] %{{.*}} -> %[[FIRSTPRIVATE_A:.*]] : !fir.ref<i32>)
! CHECK-NEXT: omp.simd
! CHECK-SAME: private(@[[PRIVATE_A_SYM:.*]] %{{.*}} -> %[[PRIVATE_A:.*]], @[[PRIVATE_I_SYM:.*]] %{{.*}} -> %[[PRIVATE_I:.*]] : !fir.ref<i32>, !fir.ref<i32>)
!$omp do simd lastprivate(a) firstprivate(a)
do i = 1, 10
! CHECK: %[[FIRSTPRIVATE_A_DECL:.*]]:2 = hlfir.declare %[[FIRSTPRIVATE_A]]
! CHECK: %[[PRIVATE_A_DECL:.*]]:2 = hlfir.declare %[[PRIVATE_A]]
! CHECK: %[[PRIVATE_I_DECL:.*]]:2 = hlfir.declare %[[PRIVATE_I]]
a = a + 1
end do
Expand Down
Loading