Skip to content

[Flang][OpenMP] Use simdloop operation only for omp simd pragma #79559

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 2 commits into from
Jan 29, 2024
Merged

[Flang][OpenMP] Use simdloop operation only for omp simd pragma #79559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5630ec5
[Flang][OpenMP] Use simdloop operation only for omp simd pragma
DominikAdamski Jan 23, 2024
7b2d7f7
Applied Sergio's remark
DominikAdamski Jan 26, 2024
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
32 changes: 30 additions & 2 deletions flang/lib/Lower/OpenMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3311,6 +3311,29 @@ static void createWsLoop(Fortran::lower::AbstractConverter &converter,
/*outer=*/false, &dsp);
}

static void createSimdWsLoop(
Fortran::lower::AbstractConverter &converter,
Fortran::lower::pft::Evaluation &eval, llvm::omp::Directive ompDirective,
const Fortran::parser::OmpClauseList &beginClauseList,
const Fortran::parser::OmpClauseList *endClauseList, mlir::Location loc) {
ClauseProcessor cp(converter, beginClauseList);
cp.processTODO<
Fortran::parser::OmpClause::Aligned, Fortran::parser::OmpClause::Allocate,
Fortran::parser::OmpClause::Linear, Fortran::parser::OmpClause::Safelen,
Fortran::parser::OmpClause::Simdlen, Fortran::parser::OmpClause::Order>(
loc, ompDirective);
// TODO: Add support for vectorization - add vectorization hints inside loop
// body.
// OpenMP standard does not specify the length of vector instructions.
// Currently we safely assume that for !$omp do simd pragma the SIMD length
// is equal to 1 (i.e. we generate standard workshare loop).
// When support for vectorization is enabled, then we need to add handling of
// if clause. Currently if clause can be skipped because we always assume
// SIMD length = 1.
createWsLoop(converter, eval, ompDirective, beginClauseList, endClauseList,
loc);
}

static void genOMP(Fortran::lower::AbstractConverter &converter,
Fortran::lower::SymMap &symTable,
Fortran::semantics::SemanticsContext &semanticsContext,
Expand Down Expand Up @@ -3377,8 +3400,13 @@ static void genOMP(Fortran::lower::AbstractConverter &converter,
")");
}

// 2.9.3.1 SIMD construct
if (llvm::omp::allSimdSet.test(ompDirective)) {
if (llvm::omp::allDoSimdSet.test(ompDirective)) {
// 2.9.3.2 Workshare SIMD construct
createSimdWsLoop(converter, eval, ompDirective, loopOpClauseList,
endClauseList, currentLocation);

} else if (llvm::omp::allSimdSet.test(ompDirective)) {
// 2.9.3.1 SIMD construct
createSimdLoop(converter, eval, ompDirective, loopOpClauseList,
currentLocation);
} else {
Expand Down
34 changes: 13 additions & 21 deletions flang/test/Lower/OpenMP/FIR/if-clause.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,21 @@ program main
! ----------------------------------------------------------------------------
! DO SIMD
! ----------------------------------------------------------------------------
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp do simd
do i = 1, 10
end do
!$omp end do simd

! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp do simd if(.true.)
do i = 1, 10
end do
!$omp end do simd

! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp do simd if(simd: .true.)
do i = 1, 10
end do
Expand Down Expand Up @@ -103,7 +101,7 @@ program main
! CHECK: omp.parallel
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp parallel do simd
Expand All @@ -113,25 +111,23 @@ program main

! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp parallel do simd if(.true.)
do i = 1, 10
end do
!$omp end parallel do simd

! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp parallel do simd if(parallel: .true.) if(simd: .false.)
do i = 1, 10
end do
!$omp end parallel do simd

! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp parallel do simd if(parallel: .true.)
Expand All @@ -142,8 +138,7 @@ program main
! CHECK: omp.parallel
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp parallel do simd if(simd: .true.)
do i = 1, 10
end do
Expand Down Expand Up @@ -306,7 +301,7 @@ program main
! CHECK: omp.parallel
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp target parallel do simd
Expand All @@ -318,8 +313,7 @@ program main
! CHECK-SAME: if({{.*}})
! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp target parallel do simd if(.true.)
do i = 1, 10
end do
Expand All @@ -329,8 +323,7 @@ program main
! CHECK-SAME: if({{.*}})
! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp target parallel do simd if(target: .true.) if(parallel: .false.) &
!$omp& if(simd: .true.)
do i = 1, 10
Expand All @@ -342,7 +335,7 @@ program main
! CHECK: omp.parallel
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp target parallel do simd if(target: .true.)
Expand All @@ -355,8 +348,7 @@ program main
! CHECK-SAME: {
! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp target parallel do simd if(parallel: .true.) if(simd: .false.)
do i = 1, 10
end do
Expand Down
6 changes: 3 additions & 3 deletions flang/test/Lower/OpenMP/FIR/loop-combined.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ program main
! ----------------------------------------------------------------------------
! DO SIMD
! ----------------------------------------------------------------------------
! CHECK: omp.simdloop
! CHECK: omp.wsloop
!$omp do simd
do i = 1, 10
end do
Expand All @@ -33,7 +33,7 @@ program main
! PARALLEL DO SIMD
! ----------------------------------------------------------------------------
! CHECK: omp.parallel
! CHECK: omp.simdloop
! CHECK: omp.wsloop
!$omp parallel do simd
do i = 1, 10
end do
Expand All @@ -54,7 +54,7 @@ program main
! ----------------------------------------------------------------------------
! CHECK: omp.target
! CHECK: omp.parallel
! CHECK: omp.simdloop
! CHECK: omp.wsloop
!$omp target parallel do simd
do i = 1, 10
end do
Expand Down
16 changes: 16 additions & 0 deletions flang/test/Lower/OpenMP/Todo/omp-do-simd-aligned.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
! This test checks lowering of OpenMP do simd aligned() pragma

! RUN: %not_todo_cmd bbc -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
subroutine testDoSimdAligned(int_array)
use iso_c_binding
type(c_ptr) :: int_array
!CHECK: not yet implemented: Unhandled clause ALIGNED in DO SIMD construct
!$omp do simd aligned(int_array)
do index_ = 1, 10
call c_test_call(int_array)
end do
!$omp end do simd

end subroutine testDoSimdAligned

14 changes: 14 additions & 0 deletions flang/test/Lower/OpenMP/Todo/omp-do-simd-linear.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
! This test checks lowering of OpenMP do simd linear() pragma

! RUN: %not_todo_cmd bbc -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
subroutine testDoSimdLinear(int_array)
integer :: int_array(*)
!CHECK: not yet implemented: Unhandled clause LINEAR in DO SIMD construct
!$omp do simd linear(int_array)
do index_ = 1, 10
end do
!$omp end do simd

end subroutine testDoSimdLinear

14 changes: 14 additions & 0 deletions flang/test/Lower/OpenMP/Todo/omp-do-simd-safelen.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
! This test checks lowering of OpenMP do simd safelen() pragma

! RUN: %not_todo_cmd bbc -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
subroutine testDoSimdSafelen(int_array)
integer :: int_array(*)
!CHECK: not yet implemented: Unhandled clause SAFELEN in DO SIMD construct
!$omp do simd safelen(4)
do index_ = 1, 10
end do
!$omp end do simd

end subroutine testDoSimdSafelen

14 changes: 14 additions & 0 deletions flang/test/Lower/OpenMP/Todo/omp-do-simd-simdlen.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
! This test checks lowering of OpenMP do simd simdlen() pragma

! RUN: %not_todo_cmd bbc -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
subroutine testDoSimdSimdlen(int_array)
integer :: int_array(*)
!CHECK: not yet implemented: Unhandled clause SIMDLEN in DO SIMD construct
!$omp do simd simdlen(4)
do index_ = 1, 10
end do
!$omp end do simd

end subroutine testDoSimdSimdlen

34 changes: 13 additions & 21 deletions flang/test/Lower/OpenMP/if-clause.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,21 @@ program main
! ----------------------------------------------------------------------------
! DO SIMD
! ----------------------------------------------------------------------------
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp do simd
do i = 1, 10
end do
!$omp end do simd

! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp do simd if(.true.)
do i = 1, 10
end do
!$omp end do simd

! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp do simd if(simd: .true.)
do i = 1, 10
end do
Expand Down Expand Up @@ -103,7 +101,7 @@ program main
! CHECK: omp.parallel
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp parallel do simd
Expand All @@ -113,25 +111,23 @@ program main

! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp parallel do simd if(.true.)
do i = 1, 10
end do
!$omp end parallel do simd

! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp parallel do simd if(parallel: .true.) if(simd: .false.)
do i = 1, 10
end do
!$omp end parallel do simd

! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp parallel do simd if(parallel: .true.)
Expand All @@ -142,8 +138,7 @@ program main
! CHECK: omp.parallel
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp parallel do simd if(simd: .true.)
do i = 1, 10
end do
Expand Down Expand Up @@ -306,7 +301,7 @@ program main
! CHECK: omp.parallel
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp target parallel do simd
Expand All @@ -318,8 +313,7 @@ program main
! CHECK-SAME: if({{.*}})
! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp target parallel do simd if(.true.)
do i = 1, 10
end do
Expand All @@ -329,8 +323,7 @@ program main
! CHECK-SAME: if({{.*}})
! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp target parallel do simd if(target: .true.) if(parallel: .false.) &
!$omp& if(simd: .true.)
do i = 1, 10
Expand All @@ -342,7 +335,7 @@ program main
! CHECK: omp.parallel
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
! CHECK: omp.simdloop
! CHECK: omp.wsloop
! CHECK-NOT: if({{.*}})
! CHECK-SAME: {
!$omp target parallel do simd if(target: .true.)
Expand All @@ -355,8 +348,7 @@ program main
! CHECK-SAME: {
! CHECK: omp.parallel
! CHECK-SAME: if({{.*}})
! CHECK: omp.simdloop
! CHECK-SAME: if({{.*}})
! CHECK: omp.wsloop
!$omp target parallel do simd if(parallel: .true.) if(simd: .false.)
do i = 1, 10
end do
Expand Down
Loading