Skip to content

[flang][NFC] Strip trailing whitespace from tests (5 of N) #167899

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
Nov 17, 2025
Merged

[flang][NFC] Strip trailing whitespace from tests (5 of N) #167899

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
6 changes: 3 additions & 3 deletions flang/test/Lower/OpenACC/Todo/do-loops-to-acc-loops-todo.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ subroutine nested_loop_with_inner_goto()
integer :: ii = 0, jj = 0
integer, parameter :: nn = 3
real, dimension(nn, nn) :: aa

aa = -1

! Nested loop with goto from inner loop - unstructured control flow is not converted.
!$acc kernels
do ii = 1, nn
Expand All @@ -88,4 +88,4 @@ subroutine nested_loop_with_inner_goto()

! CHECK4: not yet implemented: unstructured do loop in acc kernels

end subroutine
end subroutine
10 changes: 5 additions & 5 deletions flang/test/Lower/OpenACC/acc-atomic-capture.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ program acc_atomic_capture_test
!CHECK: }

!$acc atomic capture
y = x * y
y = x * y
x = y
!$acc end atomic

Expand All @@ -53,8 +53,8 @@ program acc_atomic_capture_test

!$acc atomic capture
x = y
y = 2 * 10 + (8 - x)
!$acc end atomic
y = 2 * 10 + (8 - x)
!$acc end atomic
end program


Expand Down Expand Up @@ -123,8 +123,8 @@ subroutine capture_with_convert_f32_to_i32()
! CHECK: }

subroutine capture_with_convert_i32_to_f64()
real(8) :: x
integer :: v, u
real(8) :: x
integer :: v, u
x = 1.0
v = 0
u = 1
Expand Down
6 changes: 3 additions & 3 deletions flang/test/Lower/OpenACC/acc-atomic-update-array.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ subroutine atomic_update_array1(r, n, x)
integer :: n
real :: r(n), x
integer :: i

!$acc data copy(r)

!$acc parallel loop
Expand Down Expand Up @@ -51,7 +51,7 @@ subroutine atomic_write_array1(r, n, x)
implicit none
integer :: n
real :: r(n), x

!$acc atomic write
x = r(n)
end subroutine
Expand All @@ -61,7 +61,7 @@ subroutine atomic_write_array1(r, n, x)
! CHECK: %[[DECL_X:.*]]:2 = hlfir.declare %[[ARG2]] dummy_scope %{{[0-9]+}} arg {{[0-9]+}} {uniq_name = "_QFatomic_write_array1Ex"} : (!fir.ref<f32>, !fir.dscope) -> (!fir.ref<f32>, !fir.ref<f32>)
! CHECK: %[[DECL_R:.*]]:2 = hlfir.declare %[[ARG0]](%{{.*}}) dummy_scope %{{[0-9]+}} arg {{[0-9]+}} {uniq_name = "_QFatomic_write_array1Er"} : (!fir.ref<!fir.array<?xf32>>, !fir.shape<1>, !fir.dscope) -> (!fir.box<!fir.array<?xf32>>, !fir.ref<!fir.array<?xf32>>)
! CHECK: %[[DES:.*]] = hlfir.designate %[[DECL_R]]#0 (%{{.*}}) : (!fir.box<!fir.array<?xf32>>, i64) -> !fir.ref<f32>
! CHECK: %[[LOAD:.*]] = fir.load %[[DES]] : !fir.ref<f32>
! CHECK: %[[LOAD:.*]] = fir.load %[[DES]] : !fir.ref<f32>
! CHECK: acc.atomic.write %[[DECL_X]]#0 = %[[LOAD]] : !fir.ref<f32>, f32

subroutine atomic_capture_array1(r, n, x, y)
Expand Down
6 changes: 3 additions & 3 deletions flang/test/Lower/OpenACC/acc-atomic-update.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ end function func
!CHECK: }

!$acc atomic update
a = a + b
a = a + b

!CHECK: {{.*}} = arith.constant 1 : i32
!CHECK: acc.atomic.update %[[Y_DECL]]#0 : !fir.ref<i32> {
Expand All @@ -56,10 +56,10 @@ end function func
!CHECK: %[[RESULT:.*]] = arith.muli %[[LOADED_X]], %[[ARG]] : i32
!CHECK: acc.yield %[[RESULT]] : i32
!CHECK: }
!$acc atomic
!$acc atomic
y = y + 1
!$acc atomic update
z = x * z
z = x * z

!CHECK: %[[C1_VAL:.*]] = arith.constant 1 : i32
!CHECK: acc.atomic.update %[[I1_DECL]]#0 : !fir.ref<i8> {
Expand Down
2 changes: 1 addition & 1 deletion flang/test/Lower/OpenACC/acc-bounds.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ subroutine acc_optional_data(a)
!$acc data attach(a)
!$acc end data
end subroutine

! CHECK-LABEL: func.func @_QMopenacc_boundsPacc_optional_data(
! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>> {fir.bindc_name = "a", fir.optional}) {
! CHECK: %[[ARG0_DECL:.*]]:2 = hlfir.declare %[[ARG0]] dummy_scope %{{[0-9]+}} arg {{[0-9]+}} {fortran_attrs = #fir.var_attrs<optional, pointer>, uniq_name = "_QMopenacc_boundsFacc_optional_dataEa"} : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.dscope) -> (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>)
Expand Down
2 changes: 1 addition & 1 deletion flang/test/Lower/OpenACC/acc-host-data.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ subroutine acc_host_data()
! CHECK: acc.host_data dataOperands(%[[DA0]], %[[DA1]] : !fir.ref<!fir.array<10xf32>>, !fir.ref<!fir.array<10xf32>>)
! CHECK: } attributes {ifPresent}

!$acc host_data use_device(a) if_present
!$acc host_data use_device(a) if_present
!$acc end host_data
! CHECK: acc.host_data dataOperands(%{{.*}}{{.*}} : !fir.ref<!fir.array<10xf32>>{{.*}}) {
! CHECK: } attributes {ifPresent}
Expand Down
8 changes: 4 additions & 4 deletions flang/test/Lower/OpenACC/acc-loop-exit.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ subroutine sub1(x, a)
end do

i = 2
end
end

! CHECK-LABEL: func.func @_QPsub1
! CHECK: %[[A:.*]]:2 = hlfir.declare %arg1 dummy_scope %{{[0-9]+}} arg {{[0-9]+}} {uniq_name = "_QFsub1Ea"} : (!fir.ref<i32>, !fir.dscope) -> (!fir.ref<i32>, !fir.ref<i32>)
Expand All @@ -20,9 +20,9 @@ subroutine sub1(x, a)
! CHECK: %[[I:.*]]:2 = hlfir.declare %{{[0-9]+}} {uniq_name = "_QFsub1Ei"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: ^bb{{.*}}:
! CHECK: ^bb{{.*}}:
! CHECK: %[[LOAD_I:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
! CHECK: %[[LOAD_I:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
! CHECK: %[[LOAD_A:.*]] = fir.load %[[A]]#0 : !fir.ref<i32>
! CHECK: %[[LOAD_I:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
! CHECK: %[[LOAD_I:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
! CHECK: %[[LOAD_A:.*]] = fir.load %[[A]]#0 : !fir.ref<i32>
! CHECK: %[[CMP:.*]] = arith.cmpi eq, %[[LOAD_I]], %[[LOAD_A]] : i32
! CHECK: cf.cond_br %[[CMP]], ^[[EARLY_RET:.*]], ^[[NO_RET:.*]]
! CHECK: ^[[EARLY_RET]]:
Expand Down
4 changes: 2 additions & 2 deletions flang/test/Lower/OpenACC/acc-loop.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ subroutine sub1(i, j, k)
! CHECK-SAME: %[[ARG_J:.*]]: !fir.ref<i32> {fir.bindc_name = "j"}
! CHECK-SAME: %[[ARG_K:.*]]: !fir.ref<i32> {fir.bindc_name = "k"}
! CHECK: %[[DC_I:.*]]:2 = hlfir.declare %[[ARG_I]] dummy_scope %0
! CHECK: %[[DC_J:.*]]:2 = hlfir.declare %[[ARG_J]] dummy_scope %0
! CHECK: %[[DC_K:.*]]:2 = hlfir.declare %[[ARG_K]] dummy_scope %0
! CHECK: %[[DC_J:.*]]:2 = hlfir.declare %[[ARG_J]] dummy_scope %0
! CHECK: %[[DC_K:.*]]:2 = hlfir.declare %[[ARG_K]] dummy_scope %0
! CHECK: acc.parallel combined(loop)
! CHECK: %[[P_I:.*]] = acc.private varPtr(%[[DC_I]]#0 : !fir.ref<i32>) -> !fir.ref<i32> {implicit = true, name = "i"}
! CHECK: %[[P_J:.*]] = acc.private varPtr(%[[DC_J]]#0 : !fir.ref<i32>) -> !fir.ref<i32> {implicit = true, name = "j"}
Expand Down
8 changes: 4 additions & 4 deletions flang/test/Lower/OpenACC/acc-private.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@
! CHECK-LABEL: acc.firstprivate.recipe @firstprivatization_ref_i32 : !fir.ref<i32> init {
! CHECK: ^bb0(%{{.*}}: !fir.ref<i32>):
! CHECK: %[[ALLOCA:.*]] = fir.alloca i32
! CHECK: %[[DECLARE:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "acc.private.init"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: acc.yield %[[DECLARE]]#0 : !fir.ref<i32>
! CHECK: %[[DECLARE:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "acc.private.init"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: acc.yield %[[DECLARE]]#0 : !fir.ref<i32>
! CHECK: } copy {
! CHECK: ^bb0(%[[SRC:.*]]: !fir.ref<i32>, %[[DST:.*]]: !fir.ref<i32>):
! CHECK: %[[VALUE:.*]] = fir.load %[[SRC]] : !fir.ref<i32>
Expand All @@ -223,8 +223,8 @@
! CHECK-LABEL: acc.private.recipe @privatization_ref_i32 : !fir.ref<i32> init {
! CHECK: ^bb0(%{{.*}}: !fir.ref<i32>):
! CHECK: %[[ALLOCA:.*]] = fir.alloca i32
! CHECK: %[[DECLARE:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "acc.private.init"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: acc.yield %[[DECLARE]]#0 : !fir.ref<i32>
! CHECK: %[[DECLARE:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "acc.private.init"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: acc.yield %[[DECLARE]]#0 : !fir.ref<i32>
! CHECK: }

program acc_private
Expand Down
2 changes: 1 addition & 1 deletion flang/test/Lower/OpenACC/acc-routine-named.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module acc_routines
subroutine acc1()
end subroutine

! CHECK-LABEL: func.func @_QMacc_routinesPacc1()
! CHECK-LABEL: func.func @_QMacc_routinesPacc1()
! CHECK-SAME:attributes {acc.routine_info = #acc.routine_info<[@[[r1]]]>}

subroutine acc2()
Expand Down
6 changes: 3 additions & 3 deletions flang/test/Lower/OpenACC/acc-routine.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ subroutine acc_routine16()
end subroutine

subroutine acc_routine17()
!$acc routine device_type(host) worker dtype(multicore) vector
!$acc routine device_type(host) worker dtype(multicore) vector
end subroutine

subroutine acc_routine18()
!$acc routine device_type(host) bind(acc_routine17) dtype(multicore) bind(acc_routine16)
!$acc routine device_type(host) bind(acc_routine17) dtype(multicore) bind(acc_routine16)
end subroutine

subroutine acc_routine19()
!$acc routine device_type(host,default) bind(acc_routine17) dtype(multicore) bind(acc_routine16)
!$acc routine device_type(host,default) bind(acc_routine17) dtype(multicore) bind(acc_routine16)
end subroutine
2 changes: 1 addition & 1 deletion flang/test/Lower/OpenACC/acc-routine02.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ program test

! CHECK-LABEL: acc.routine @acc_routine_0 func(@_QPsub1)

! CHECK: func.func @_QPsub1(%ar{{.*}}: !fir.ref<!fir.array<?xf32>> {fir.bindc_name = "a"}, %arg1: !fir.ref<i32> {fir.bindc_name = "n"}) attributes {acc.routine_info = #acc.routine_info<[@acc_routine_0]>}
! CHECK: func.func @_QPsub1(%ar{{.*}}: !fir.ref<!fir.array<?xf32>> {fir.bindc_name = "a"}, %arg1: !fir.ref<i32> {fir.bindc_name = "n"}) attributes {acc.routine_info = #acc.routine_info<[@acc_routine_0]>}
2 changes: 1 addition & 1 deletion flang/test/Lower/OpenACC/acc-routine03.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ subroutine sub1(a)
!$acc routine worker bind(sub2)
real :: a(:)
end subroutine

subroutine sub2(a)
!$acc routine worker nohost
real :: a(:)
Expand Down
8 changes: 4 additions & 4 deletions flang/test/Lower/OpenACC/acc-routine04.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ subroutine sub1(i)

program test_acc_routine
use dummy_mod

!$acc routine(sub2) seq

implicit none

integer :: i

contains
subroutine sub2()
end subroutine

end program

! CHECK: acc.routine @acc_routine_1 func(@_QFPsub2) seq
Expand Down
4 changes: 2 additions & 2 deletions flang/test/Lower/OpenACC/acc-shutdown.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ subroutine acc_shutdown

!$acc shutdown device_num(1) device_type(default, nvidia)
!CHECK: [[DEVNUM:%.*]] = arith.constant 1 : i32
!CHECK: acc.shutdown device_num([[DEVNUM]] : i32) attributes {device_types = [#acc.device_type<default>, #acc.device_type<nvidia>]}
!CHECK: acc.shutdown device_num([[DEVNUM]] : i32) attributes {device_types = [#acc.device_type<default>, #acc.device_type<nvidia>]}

!$acc shutdown device_type(default) device_type(nvidia)
!CHECK: acc.shutdown attributes {device_types = [#acc.device_type<default>, #acc.device_type<nvidia>]}
!CHECK: acc.shutdown attributes {device_types = [#acc.device_type<default>, #acc.device_type<nvidia>]}

end subroutine acc_shutdown
2 changes: 1 addition & 1 deletion flang/test/Lower/OpenACC/acc-terminator.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ program main
!$acc data copyin(a(:,:,i),b(:,:,i),c(:,:,i)) copyout(c2(:,:,i))

!$acc host_data use_device(a(:,:,i),b(:,:,i),c(:,:,i))

!$acc end host_data

if ( stat .ne. 0 ) then
Expand Down
4 changes: 2 additions & 2 deletions flang/test/Lower/OpenACC/acc-use-device.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ subroutine test()
! CHECK: %[[A0:.*]] = fir.alloca !fir.array<?xf64>, %{{.*}} {bindc_name = "b", uniq_name = "_QFtestEb"}
! CHECK: %[[A1:.*]] = fir.shape_shift {{.*}} : (index, index) -> !fir.shapeshift<1>
! CHECK: %[[A:.*]]:2 = hlfir.declare %[[A0]](%[[A1]]) {uniq_name = "_QFtestEb"} : (!fir.ref<!fir.array<?xf64>>, !fir.shapeshift<1>) -> (!fir.box<!fir.array<?xf64>>, !fir.ref<!fir.array<?xf64>>)

!$acc data copy(b)
! CHECK: %[[B:.*]] = acc.copyin var(%[[A]]#0 : !fir.box<!fir.array<?xf64>>) -> !fir.box<!fir.array<?xf64>> {dataClause = #acc<data_clause acc_copy>, name = "b"}
! CHECK: acc.data dataOperands(%[[B]] : !fir.box<!fir.array<?xf64>>) {
Expand All @@ -23,7 +23,7 @@ subroutine test()
! CHECK: fir.call @_QPvadd(%[[A]]#1) fastmath<contract> : (!fir.ref<!fir.array<?xf64>>) -> ()
!$acc end data
! CHECK: acc.copyout accVar(%[[B]] : !fir.box<!fir.array<?xf64>>) to var(%[[A]]#0 : !fir.box<!fir.array<?xf64>>) {dataClause = #acc<data_clause acc_copy>, name = "b"}
end
end

! Test for allocatable, pointer and assumed-shape variables appearing in use_device clause.
subroutine test2(a, b, c)
Expand Down
14 changes: 6 additions & 8 deletions flang/test/Lower/OpenACC/locations.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ subroutine if_clause_expr_location(arr)
subroutine atomic_read_loc()
integer(4) :: x
integer(8) :: y

!$acc atomic read
y = x
end
Expand All @@ -123,10 +123,10 @@ subroutine atomic_read_loc()
subroutine atomic_capture_loc()
implicit none
integer :: k, v, i

k = 1
v = 0

!$acc atomic capture
v = k
k = (i + 1) * 3.14
Expand All @@ -142,13 +142,13 @@ subroutine atomic_capture_loc()
subroutine atomic_update_loc()
implicit none
integer :: x, y, z
!$acc atomic

!$acc atomic
y = y + 1
! CHECK: acc.atomic.update %{{.*}} : !fir.ref<i32> {
! CHECK: ^bb0(%{{.*}}: i32 loc("{{.*}}locations.f90":142:3)):
! CHECK: } loc("{{.*}}locations.f90":142:3)

!$acc atomic update
z = x * z
end subroutine
Expand Down Expand Up @@ -183,5 +183,3 @@ subroutine data_end_locations(arr)
!CHECK-SAME: loc("{{.*}}locations.f90":181:11)
end subroutine
end module


Loading