Tom Eccles
2162da3e36
Revert #196094 and its follow-up #209701. The expression override mechanism does not preserve reduction-object identity across all data environments, leading to incorrect lowering for procedure-local and nested private arrays. Restore the pre-#196094 lowering. Keep coverage showing that array-element constructs compile through the boxed-array reduction path. This was in response to this comment: https://github.com/llvm/llvm-project/pull/196094#issuecomment-5248085956 Fixing exactly the bug in the comment wasn't hard but AI code review found a large number of follow on bugs so I think the design needs a rethink, and definitely shouldn't be included in the LLVM release. Assisted-by: Codex
142 lines
5.6 KiB
Fortran
142 lines
5.6 KiB
Fortran
! RUN: %flang_fc1 -emit-hlfir -fopenmp -fopenmp-version=50 %s -o - | FileCheck %s --implicit-check-not=omp.reduction.element
|
|
|
|
! Array-element reductions currently use the whole-array boxed reduction path.
|
|
! Keep lowering coverage for these constructs so that this limitation does not
|
|
! hide failures to compile them.
|
|
|
|
! CHECK: omp.declare_reduction @[[BOX_RED:add_reduction_byref_box_4xi32]] : !fir.ref<!fir.box<!fir.array<4xi32>>>
|
|
|
|
subroutine reduction_literal(a, n)
|
|
integer :: a(4), n
|
|
!$omp parallel do reduction(+: a(2))
|
|
do i = 1, n
|
|
a(2) = a(2) + i
|
|
end do
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPreduction_literal
|
|
! CHECK: omp.wsloop {{.*}} reduction(byref @[[BOX_RED]] {{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: hlfir.declare %{{.*}} {uniq_name = "_QFreduction_literalEa"} : (!fir.ref<!fir.box<!fir.array<4xi32>>>)
|
|
! CHECK: fir.load %{{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>
|
|
! CHECK: hlfir.designate %{{.*}} (%c2) {{.*}} -> !fir.ref<i32>
|
|
|
|
subroutine reduction_multiple(a, n)
|
|
integer :: a(4), n
|
|
!$omp parallel do reduction(+: a(2), a(3))
|
|
do i = 1, n
|
|
a(2) = a(2) + i
|
|
a(3) = a(3) + i
|
|
end do
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPreduction_multiple
|
|
! CHECK: omp.wsloop {{.*}} reduction(byref @[[BOX_RED]] {{.*}}, byref @[[BOX_RED]] {{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>, !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: hlfir.designate %{{.*}} (%c2) {{.*}} -> !fir.ref<i32>
|
|
! CHECK: hlfir.designate %{{.*}} (%c3) {{.*}} -> !fir.ref<i32>
|
|
|
|
subroutine reduction_arrays(a, b, n)
|
|
integer :: a(4), b(4), n
|
|
!$omp parallel do reduction(+: a(2), b(2))
|
|
do i = 1, n
|
|
a(2) = a(2) + b(2) + i
|
|
end do
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPreduction_arrays
|
|
! CHECK: omp.wsloop {{.*}} reduction(byref @[[BOX_RED]] {{.*}}, byref @[[BOX_RED]] {{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>, !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: hlfir.declare %{{.*}} {uniq_name = "_QFreduction_arraysEa"} : (!fir.ref<!fir.box<!fir.array<4xi32>>>)
|
|
! CHECK: hlfir.declare %{{.*}} {uniq_name = "_QFreduction_arraysEb"} : (!fir.ref<!fir.box<!fir.array<4xi32>>>)
|
|
! CHECK: hlfir.designate %{{.*}} (%c2{{.*}}) {{.*}} -> !fir.ref<i32>
|
|
|
|
subroutine reduction_variable(a, n, j)
|
|
integer :: a(4), n, j
|
|
!$omp parallel do reduction(+: a(j))
|
|
do i = 1, n
|
|
a(j) = a(j) + i
|
|
end do
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPreduction_variable
|
|
! CHECK: omp.wsloop {{.*}} reduction(byref @[[BOX_RED]] {{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: hlfir.declare %{{.*}} {uniq_name = "_QFreduction_variableEa"} : (!fir.ref<!fir.box<!fir.array<4xi32>>>)
|
|
! CHECK: hlfir.designate %{{.*}} (%{{.*}}) {{.*}} -> !fir.ref<i32>
|
|
|
|
subroutine reduction_do_simd(a, n)
|
|
integer :: a(4), n
|
|
!$omp parallel do simd reduction(+: a(2))
|
|
do i = 1, n
|
|
a(2) = a(2) + i
|
|
end do
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPreduction_do_simd
|
|
! CHECK: omp.wsloop reduction(byref @[[BOX_RED]] {{.*}} -> %[[WSARG:.*]] : !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: omp.simd {{.*}} reduction(byref @[[BOX_RED]] %[[WSARG]] -> %{{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: hlfir.designate %{{.*}} (%c2) {{.*}} -> !fir.ref<i32>
|
|
|
|
subroutine task_reduction_element(a)
|
|
integer :: a(4)
|
|
!$omp taskgroup task_reduction(+: a(2))
|
|
!$omp task in_reduction(+: a(2))
|
|
a(2) = a(2) + 1
|
|
!$omp end task
|
|
!$omp end taskgroup
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPtask_reduction_element
|
|
! CHECK: omp.taskgroup task_reduction(byref @[[BOX_RED]] {{.*}} -> %{{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: omp.task in_reduction(byref @[[BOX_RED]] {{.*}} -> %{{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>) private({{.*}}_firstprivate_box_4xi32
|
|
! CHECK: hlfir.designate %{{.*}} (%c2) {{.*}} -> !fir.ref<i32>
|
|
|
|
subroutine taskloop_in_reduction_element(a, n)
|
|
integer :: a(4), n
|
|
!$omp taskloop in_reduction(+: a(2))
|
|
do i = 1, n
|
|
a(2) = a(2) + i
|
|
end do
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPtaskloop_in_reduction_element
|
|
! CHECK: omp.taskloop.context in_reduction(byref @[[BOX_RED]] {{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>) private({{.*}}_firstprivate_box_4xi32
|
|
! CHECK: hlfir.designate %{{.*}} (%c2) {{.*}} -> !fir.ref<i32>
|
|
|
|
subroutine taskloop_reduction_element(a, n)
|
|
integer :: a(4), n
|
|
!$omp taskloop reduction(+: a(2))
|
|
do i = 1, n
|
|
a(2) = a(2) + i
|
|
end do
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPtaskloop_reduction_element
|
|
! CHECK: omp.taskloop.context private({{.*}}_firstprivate_box_4xi32{{.*}}) reduction(byref @[[BOX_RED]] {{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: hlfir.designate %{{.*}} (%c2) {{.*}} -> !fir.ref<i32>
|
|
|
|
subroutine taskloop_reduction_mixed_use(a, n)
|
|
integer :: a(4), n
|
|
!$omp taskloop reduction(+: a(2))
|
|
do i = 1, n
|
|
a(2) = a(2) + i
|
|
a(1) = a(1) + 1
|
|
end do
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPtaskloop_reduction_mixed_use
|
|
! CHECK: omp.taskloop.context private({{.*}}_firstprivate_box_4xi32{{.*}}) reduction(byref @[[BOX_RED]] {{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: hlfir.designate %{{.*}} (%c2) {{.*}} -> !fir.ref<i32>
|
|
! CHECK: hlfir.designate %{{.*}} (%c1) {{.*}} -> !fir.ref<i32>
|
|
|
|
subroutine taskloop_reduction_nested_index_use(a, b, n)
|
|
integer :: a(4), b(4), n
|
|
!$omp taskloop reduction(+: a(2))
|
|
do i = 1, n
|
|
a(2) = a(2) + i
|
|
b(a(1)) = b(a(1)) + 1
|
|
end do
|
|
end subroutine
|
|
|
|
! CHECK-LABEL: func.func @_QPtaskloop_reduction_nested_index_use
|
|
! CHECK: omp.taskloop.context private({{.*}}_firstprivate_box_4xi32{{.*}}) reduction(byref @[[BOX_RED]] {{.*}} : !fir.ref<!fir.box<!fir.array<4xi32>>>) {
|
|
! CHECK: hlfir.designate %{{.*}} (%c2) {{.*}} -> !fir.ref<i32>
|
|
! CHECK: hlfir.designate %{{.*}} (%{{.*}}) {{.*}} -> !fir.ref<i32>
|