Skip to content

[flang][OpenMP] Set isNewBlock directly on OpenMP constructs #144593

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
Jun 23, 2025
Merged

[flang][OpenMP] Set isNewBlock directly on OpenMP constructs #144593

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
10 changes: 10 additions & 0 deletions flang/include/flang/Lower/PFTBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@ static constexpr bool isExecutableDirective{common::HasMember<
A, std::tuple<parser::CompilerDirective, parser::OpenACCConstruct,
parser::OpenMPConstruct, parser::CUFKernelDoConstruct>>};

template <typename A>
static constexpr bool isOpenMPDirective{
common::HasMember<A, std::tuple<parser::OpenMPConstruct,
parser::OpenMPDeclarativeConstruct>>};

template <typename A>
static constexpr bool isFunctionLike{common::HasMember<
A, std::tuple<parser::MainProgram, parser::FunctionSubprogram,
Expand Down Expand Up @@ -267,6 +272,11 @@ struct Evaluation : EvaluationVariant {
return pft::isExecutableDirective<std::decay_t<decltype(r)>>;
}});
}
constexpr bool isOpenMPDirective() const {
return visit(common::visitors{[](auto &r) {
return pft::isOpenMPDirective<std::decay_t<decltype(r)>>;
}});
}

/// Return the predicate: "This is a non-initial, non-terminal construct
/// statement." For an IfConstruct, this is ElseIfStmt and ElseStmt.
Expand Down
4 changes: 3 additions & 1 deletion flang/lib/Lower/PFTBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,7 +1096,9 @@ class PFTBuilder {

// The first executable statement in the subprogram is preceded by a
// branch to the entry point, so it starts a new block.
if (initialEval->hasNestedEvaluations())
// OpenMP directives can generate code around the nested evaluations.
if (initialEval->hasNestedEvaluations() &&
!initialEval->isOpenMPDirective())
initialEval = &initialEval->getFirstNestedEvaluation();
else if (initialEval->isA<Fortran::parser::EntryStmt>())
initialEval = initialEval->lexicalSuccessor;
Expand Down
46 changes: 46 additions & 0 deletions flang/test/Lower/OpenMP/multiple-entry-points.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
!RUN: %flang_fc1 -emit-hlfir -fopenmp %s -o - | FileCheck %s

! Check the first entry point
!CHECK: func.func @_QPprocess_a
!CHECK: omp.parallel
!CHECK: omp.wsloop
!CHECK: %[[V0:[0-9]+]] = fir.load %{{[0-9]+}} : !fir.ref<f32>
!CHECK: %[[V1:[a-z_0-9]+]] = arith.constant 2.000000e+00 : f32
!CHECK: = arith.mulf %[[V0]], %[[V1]] fastmath<contract> : f32
!CHECK: omp.terminator
!CHECK-NOT: omp
!CHECK: return

! Check the second entry point
!CHECK: func.func @_QPprocess_b
!CHECK: omp.parallel
!CHECK: fir.do_loop
!CHECK: %[[V3:[0-9]+]] = fir.load %[[V2:[0-9]+]]#0 : !fir.ref<i32>
!CHECK: %[[V4:[0-9]+]] = fir.load %[[V2]]#0 : !fir.ref<i32>
!CHECK: = arith.muli %[[V3]], %[[V4]] : i32
!CHECK: omp.terminator
!CHECK-NOT: omp
!CHECK: return

subroutine process_a(n, a)
integer, intent(in) :: n
real, intent(inout) :: a(n)
integer :: i

!$omp parallel do
do i = 1, n
a(i) = a(i) * 2.0
end do
!$omp end parallel do

return

entry process_b(n, b)

!$omp parallel
do i = 1, n
a(i) = i * i
end do
!$omp end parallel

end subroutine process_a
Loading