Skip to content

Commit 29e7b4f

Browse files
authored
[flang][NFC] Strip trailing whitespace from tests (5 of N)
Only the fortran source files in flang/test/Lower/OpenACC have been modified. The other files in flang/test will be cleaned up in subsequent commits
1 parent e70e9ec commit 29e7b4f

18 files changed

+47
-49
lines changed

flang/test/Lower/OpenACC/Todo/do-loops-to-acc-loops-todo.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ subroutine nested_loop_with_inner_goto()
7272
integer :: ii = 0, jj = 0
7373
integer, parameter :: nn = 3
7474
real, dimension(nn, nn) :: aa
75-
75+
7676
aa = -1
77-
77+
7878
! Nested loop with goto from inner loop - unstructured control flow is not converted.
7979
!$acc kernels
8080
do ii = 1, nn
@@ -88,4 +88,4 @@ subroutine nested_loop_with_inner_goto()
8888

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

91-
end subroutine
91+
end subroutine

flang/test/Lower/OpenACC/acc-atomic-capture.f90

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ program acc_atomic_capture_test
3636
!CHECK: }
3737

3838
!$acc atomic capture
39-
y = x * y
39+
y = x * y
4040
x = y
4141
!$acc end atomic
4242

@@ -53,8 +53,8 @@ program acc_atomic_capture_test
5353

5454
!$acc atomic capture
5555
x = y
56-
y = 2 * 10 + (8 - x)
57-
!$acc end atomic
56+
y = 2 * 10 + (8 - x)
57+
!$acc end atomic
5858
end program
5959

6060

@@ -123,8 +123,8 @@ subroutine capture_with_convert_f32_to_i32()
123123
! CHECK: }
124124

125125
subroutine capture_with_convert_i32_to_f64()
126-
real(8) :: x
127-
integer :: v, u
126+
real(8) :: x
127+
integer :: v, u
128128
x = 1.0
129129
v = 0
130130
u = 1

flang/test/Lower/OpenACC/acc-atomic-update-array.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ subroutine atomic_update_array1(r, n, x)
55
integer :: n
66
real :: r(n), x
77
integer :: i
8-
8+
99
!$acc data copy(r)
1010

1111
!$acc parallel loop
@@ -51,7 +51,7 @@ subroutine atomic_write_array1(r, n, x)
5151
implicit none
5252
integer :: n
5353
real :: r(n), x
54-
54+
5555
!$acc atomic write
5656
x = r(n)
5757
end subroutine
@@ -61,7 +61,7 @@ subroutine atomic_write_array1(r, n, x)
6161
! 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>)
6262
! 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>>)
6363
! CHECK: %[[DES:.*]] = hlfir.designate %[[DECL_R]]#0 (%{{.*}}) : (!fir.box<!fir.array<?xf32>>, i64) -> !fir.ref<f32>
64-
! CHECK: %[[LOAD:.*]] = fir.load %[[DES]] : !fir.ref<f32>
64+
! CHECK: %[[LOAD:.*]] = fir.load %[[DES]] : !fir.ref<f32>
6565
! CHECK: acc.atomic.write %[[DECL_X]]#0 = %[[LOAD]] : !fir.ref<f32>, f32
6666

6767
subroutine atomic_capture_array1(r, n, x, y)

flang/test/Lower/OpenACC/acc-atomic-update.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ end function func
4242
!CHECK: }
4343

4444
!$acc atomic update
45-
a = a + b
45+
a = a + b
4646

4747
!CHECK: {{.*}} = arith.constant 1 : i32
4848
!CHECK: acc.atomic.update %[[Y_DECL]]#0 : !fir.ref<i32> {
@@ -56,10 +56,10 @@ end function func
5656
!CHECK: %[[RESULT:.*]] = arith.muli %[[LOADED_X]], %[[ARG]] : i32
5757
!CHECK: acc.yield %[[RESULT]] : i32
5858
!CHECK: }
59-
!$acc atomic
59+
!$acc atomic
6060
y = y + 1
6161
!$acc atomic update
62-
z = x * z
62+
z = x * z
6363

6464
!CHECK: %[[C1_VAL:.*]] = arith.constant 1 : i32
6565
!CHECK: acc.atomic.update %[[I1_DECL]]#0 : !fir.ref<i8> {

flang/test/Lower/OpenACC/acc-bounds.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ subroutine acc_optional_data(a)
114114
!$acc data attach(a)
115115
!$acc end data
116116
end subroutine
117-
117+
118118
! CHECK-LABEL: func.func @_QMopenacc_boundsPacc_optional_data(
119119
! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>> {fir.bindc_name = "a", fir.optional}) {
120120
! 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>>>>)

flang/test/Lower/OpenACC/acc-host-data.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ subroutine acc_host_data()
2626
! CHECK: acc.host_data dataOperands(%[[DA0]], %[[DA1]] : !fir.ref<!fir.array<10xf32>>, !fir.ref<!fir.array<10xf32>>)
2727
! CHECK: } attributes {ifPresent}
2828

29-
!$acc host_data use_device(a) if_present
29+
!$acc host_data use_device(a) if_present
3030
!$acc end host_data
3131
! CHECK: acc.host_data dataOperands(%{{.*}}{{.*}} : !fir.ref<!fir.array<10xf32>>{{.*}}) {
3232
! CHECK: } attributes {ifPresent}

flang/test/Lower/OpenACC/acc-loop-exit.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ subroutine sub1(x, a)
1111
end do
1212

1313
i = 2
14-
end
14+
end
1515

1616
! CHECK-LABEL: func.func @_QPsub1
1717
! 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>)
@@ -20,9 +20,9 @@ subroutine sub1(x, a)
2020
! CHECK: %[[I:.*]]:2 = hlfir.declare %{{[0-9]+}} {uniq_name = "_QFsub1Ei"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
2121
! CHECK: ^bb{{.*}}:
2222
! CHECK: ^bb{{.*}}:
23-
! CHECK: %[[LOAD_I:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
24-
! CHECK: %[[LOAD_I:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
25-
! CHECK: %[[LOAD_A:.*]] = fir.load %[[A]]#0 : !fir.ref<i32>
23+
! CHECK: %[[LOAD_I:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
24+
! CHECK: %[[LOAD_I:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
25+
! CHECK: %[[LOAD_A:.*]] = fir.load %[[A]]#0 : !fir.ref<i32>
2626
! CHECK: %[[CMP:.*]] = arith.cmpi eq, %[[LOAD_I]], %[[LOAD_A]] : i32
2727
! CHECK: cf.cond_br %[[CMP]], ^[[EARLY_RET:.*]], ^[[NO_RET:.*]]
2828
! CHECK: ^[[EARLY_RET]]:

flang/test/Lower/OpenACC/acc-loop.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,8 @@ subroutine sub1(i, j, k)
376376
! CHECK-SAME: %[[ARG_J:.*]]: !fir.ref<i32> {fir.bindc_name = "j"}
377377
! CHECK-SAME: %[[ARG_K:.*]]: !fir.ref<i32> {fir.bindc_name = "k"}
378378
! CHECK: %[[DC_I:.*]]:2 = hlfir.declare %[[ARG_I]] dummy_scope %0
379-
! CHECK: %[[DC_J:.*]]:2 = hlfir.declare %[[ARG_J]] dummy_scope %0
380-
! CHECK: %[[DC_K:.*]]:2 = hlfir.declare %[[ARG_K]] dummy_scope %0
379+
! CHECK: %[[DC_J:.*]]:2 = hlfir.declare %[[ARG_J]] dummy_scope %0
380+
! CHECK: %[[DC_K:.*]]:2 = hlfir.declare %[[ARG_K]] dummy_scope %0
381381
! CHECK: acc.parallel combined(loop)
382382
! CHECK: %[[P_I:.*]] = acc.private varPtr(%[[DC_I]]#0 : !fir.ref<i32>) -> !fir.ref<i32> {implicit = true, name = "i"}
383383
! CHECK: %[[P_J:.*]] = acc.private varPtr(%[[DC_J]]#0 : !fir.ref<i32>) -> !fir.ref<i32> {implicit = true, name = "j"}

flang/test/Lower/OpenACC/acc-private.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@
195195
! CHECK-LABEL: acc.firstprivate.recipe @firstprivatization_ref_i32 : !fir.ref<i32> init {
196196
! CHECK: ^bb0(%{{.*}}: !fir.ref<i32>):
197197
! CHECK: %[[ALLOCA:.*]] = fir.alloca i32
198-
! CHECK: %[[DECLARE:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "acc.private.init"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
199-
! CHECK: acc.yield %[[DECLARE]]#0 : !fir.ref<i32>
198+
! CHECK: %[[DECLARE:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "acc.private.init"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
199+
! CHECK: acc.yield %[[DECLARE]]#0 : !fir.ref<i32>
200200
! CHECK: } copy {
201201
! CHECK: ^bb0(%[[SRC:.*]]: !fir.ref<i32>, %[[DST:.*]]: !fir.ref<i32>):
202202
! CHECK: %[[VALUE:.*]] = fir.load %[[SRC]] : !fir.ref<i32>
@@ -223,8 +223,8 @@
223223
! CHECK-LABEL: acc.private.recipe @privatization_ref_i32 : !fir.ref<i32> init {
224224
! CHECK: ^bb0(%{{.*}}: !fir.ref<i32>):
225225
! CHECK: %[[ALLOCA:.*]] = fir.alloca i32
226-
! CHECK: %[[DECLARE:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "acc.private.init"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
227-
! CHECK: acc.yield %[[DECLARE]]#0 : !fir.ref<i32>
226+
! CHECK: %[[DECLARE:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "acc.private.init"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
227+
! CHECK: acc.yield %[[DECLARE]]#0 : !fir.ref<i32>
228228
! CHECK: }
229229

230230
program acc_private

flang/test/Lower/OpenACC/acc-routine-named.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module acc_routines
1414
subroutine acc1()
1515
end subroutine
1616

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

2020
subroutine acc2()

0 commit comments

Comments
 (0)