Skip to content

Commit 63295bc

Browse files
skatrakskatrak
committed
Update tests
1 parent cab2249 commit 63295bc

File tree

4 files changed

+114
-62
lines changed

4 files changed

+114
-62
lines changed

‎flang/test/Lower/OpenMP/FIR/if-clause.f90

Lines changed: 55 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
! This test checks lowering of OpenMP IF clauses.
22

3-
! RUN: bbc -fopenmp -emit-fir %s -o - | FileCheck %s
4-
! RUN: %flang_fc1 -fopenmp -emit-fir %s -o - | FileCheck %s
3+
! RUN: bbc -fopenmp -emit-hlfir %s -o - | FileCheck %s
4+
! RUN: %flang_fc1 -fopenmp -emit-hlfir %s -o - | FileCheck %s
55

66
program main
77
integer :: i
@@ -12,6 +12,7 @@ program main
1212
! - TARGET UPDATE
1313
! - TASKLOOP
1414
! - TASKLOOP SIMD
15+
! TODO Update worksharing-loop SIMD tests to expect 'if' clause
1516

1617
! ----------------------------------------------------------------------------
1718
! DISTRIBUTE PARALLEL DO SIMD
@@ -23,7 +24,7 @@ program main
2324
! CHECK: omp.parallel
2425
! CHECK-NOT: if({{.*}})
2526
! CHECK-SAME: {
26-
! CHECK: omp.simdloop
27+
! CHECK: omp.wsloop
2728
! CHECK-NOT: if({{.*}})
2829
! CHECK-SAME: {
2930
!$omp distribute parallel do simd
@@ -35,8 +36,9 @@ program main
3536
! CHECK-NOT: if({{.*}})
3637
! CHECK: omp.parallel
3738
! CHECK-SAME: if({{.*}})
38-
! CHECK: omp.simdloop
39-
! CHECK-SAME: if({{.*}})
39+
! CHECK: omp.wsloop
40+
! CHECK-NOT: if({{.*}})
41+
! CHECK-SAME: {
4042
!$omp distribute parallel do simd if(.true.)
4143
do i = 1, 10
4244
end do
@@ -46,8 +48,9 @@ program main
4648
! CHECK-NOT: if({{.*}})
4749
! CHECK: omp.parallel
4850
! CHECK-SAME: if({{.*}})
49-
! CHECK: omp.simdloop
50-
! CHECK-SAME: if({{.*}})
51+
! CHECK: omp.wsloop
52+
! CHECK-NOT: if({{.*}})
53+
! CHECK-SAME: {
5154
!$omp distribute parallel do simd if(parallel: .true.) if(simd: .false.)
5255
do i = 1, 10
5356
end do
@@ -57,7 +60,7 @@ program main
5760
! CHECK-NOT: if({{.*}})
5861
! CHECK: omp.parallel
5962
! CHECK-SAME: if({{.*}})
60-
! CHECK: omp.simdloop
63+
! CHECK: omp.wsloop
6164
! CHECK-NOT: if({{.*}})
6265
! CHECK-SAME: {
6366
!$omp distribute parallel do simd if(parallel: .true.)
@@ -70,8 +73,9 @@ program main
7073
! CHECK: omp.parallel
7174
! CHECK-NOT: if({{.*}})
7275
! CHECK-SAME: {
73-
! CHECK: omp.simdloop
74-
! CHECK-SAME: if({{.*}})
76+
! CHECK: omp.wsloop
77+
! CHECK-NOT: if({{.*}})
78+
! CHECK-SAME: {
7579
!$omp distribute parallel do simd if(simd: .true.)
7680
do i = 1, 10
7781
end do
@@ -161,12 +165,16 @@ program main
161165
!$omp end do simd
162166

163167
! CHECK: omp.wsloop
168+
! CHECK-NOT: if({{.*}})
169+
! CHECK-SAME: {
164170
!$omp do simd if(.true.)
165171
do i = 1, 10
166172
end do
167173
!$omp end do simd
168174

169175
! CHECK: omp.wsloop
176+
! CHECK-NOT: if({{.*}})
177+
! CHECK-SAME: {
170178
!$omp do simd if(simd: .true.)
171179
do i = 1, 10
172180
end do
@@ -236,6 +244,8 @@ program main
236244
! CHECK: omp.parallel
237245
! CHECK-SAME: if({{.*}})
238246
! CHECK: omp.wsloop
247+
! CHECK-NOT: if({{.*}})
248+
! CHECK-SAME: {
239249
!$omp parallel do simd if(.true.)
240250
do i = 1, 10
241251
end do
@@ -244,6 +254,8 @@ program main
244254
! CHECK: omp.parallel
245255
! CHECK-SAME: if({{.*}})
246256
! CHECK: omp.wsloop
257+
! CHECK-NOT: if({{.*}})
258+
! CHECK-SAME: {
247259
!$omp parallel do simd if(parallel: .true.) if(simd: .false.)
248260
do i = 1, 10
249261
end do
@@ -263,6 +275,8 @@ program main
263275
! CHECK-NOT: if({{.*}})
264276
! CHECK-SAME: {
265277
! CHECK: omp.wsloop
278+
! CHECK-NOT: if({{.*}})
279+
! CHECK-SAME: {
266280
!$omp parallel do simd if(simd: .true.)
267281
do i = 1, 10
268282
end do
@@ -438,6 +452,8 @@ program main
438452
! CHECK: omp.parallel
439453
! CHECK-SAME: if({{.*}})
440454
! CHECK: omp.wsloop
455+
! CHECK-NOT: if({{.*}})
456+
! CHECK-SAME: {
441457
!$omp target parallel do simd if(.true.)
442458
do i = 1, 10
443459
end do
@@ -448,6 +464,8 @@ program main
448464
! CHECK: omp.parallel
449465
! CHECK-SAME: if({{.*}})
450466
! CHECK: omp.wsloop
467+
! CHECK-NOT: if({{.*}})
468+
! CHECK-SAME: {
451469
!$omp target parallel do simd if(target: .true.) if(parallel: .false.) &
452470
!$omp& if(simd: .true.)
453471
do i = 1, 10
@@ -473,6 +491,8 @@ program main
473491
! CHECK: omp.parallel
474492
! CHECK-SAME: if({{.*}})
475493
! CHECK: omp.wsloop
494+
! CHECK-NOT: if({{.*}})
495+
! CHECK-SAME: {
476496
!$omp target parallel do simd if(parallel: .true.) if(simd: .false.)
477497
do i = 1, 10
478498
end do
@@ -755,7 +775,7 @@ program main
755775
! CHECK: omp.parallel
756776
! CHECK-NOT: if({{.*}})
757777
! CHECK-SAME: {
758-
! CHECK: omp.simdloop
778+
! CHECK: omp.wsloop
759779
! CHECK-NOT: if({{.*}})
760780
! CHECK-SAME: {
761781
!$omp target teams distribute parallel do simd
@@ -772,8 +792,9 @@ program main
772792
! CHECK-SAME: {
773793
! CHECK: omp.parallel
774794
! CHECK-SAME: if({{.*}})
775-
! CHECK: omp.simdloop
776-
! CHECK-SAME: if({{.*}})
795+
! CHECK: omp.wsloop
796+
! CHECK-NOT: if({{.*}})
797+
! CHECK-SAME: {
777798
!$omp target teams distribute parallel do simd if(.true.)
778799
do i = 1, 10
779800
end do
@@ -788,8 +809,9 @@ program main
788809
! CHECK-SAME: {
789810
! CHECK: omp.parallel
790811
! CHECK-SAME: if({{.*}})
791-
! CHECK: omp.simdloop
792-
! CHECK-SAME: if({{.*}})
812+
! CHECK: omp.wsloop
813+
! CHECK-NOT: if({{.*}})
814+
! CHECK-SAME: {
793815
!$omp target teams distribute parallel do simd if(target: .true.) if(teams: .false.) if(parallel: .true.) if(simd: .false.)
794816
do i = 1, 10
795817
end do
@@ -806,7 +828,7 @@ program main
806828
! CHECK: omp.parallel
807829
! CHECK-NOT: if({{.*}})
808830
! CHECK-SAME: {
809-
! CHECK: omp.simdloop
831+
! CHECK: omp.wsloop
810832
! CHECK-NOT: if({{.*}})
811833
! CHECK-SAME: {
812834
!$omp target teams distribute parallel do simd if(target: .true.)
@@ -825,7 +847,7 @@ program main
825847
! CHECK: omp.parallel
826848
! CHECK-NOT: if({{.*}})
827849
! CHECK-SAME: {
828-
! CHECK: omp.simdloop
850+
! CHECK: omp.wsloop
829851
! CHECK-NOT: if({{.*}})
830852
! CHECK-SAME: {
831853
!$omp target teams distribute parallel do simd if(teams: .true.)
@@ -844,7 +866,7 @@ program main
844866
! CHECK-SAME: {
845867
! CHECK: omp.parallel
846868
! CHECK-SAME: if({{.*}})
847-
! CHECK: omp.simdloop
869+
! CHECK: omp.wsloop
848870
! CHECK-NOT: if({{.*}})
849871
! CHECK-SAME: {
850872
!$omp target teams distribute parallel do simd if(parallel: .true.)
@@ -864,8 +886,9 @@ program main
864886
! CHECK: omp.parallel
865887
! CHECK-NOT: if({{.*}})
866888
! CHECK-SAME: {
867-
! CHECK: omp.simdloop
868-
! CHECK-SAME: if({{.*}})
889+
! CHECK: omp.wsloop
890+
! CHECK-NOT: if({{.*}})
891+
! CHECK-SAME: {
869892
!$omp target teams distribute parallel do simd if(simd: .true.)
870893
do i = 1, 10
871894
end do
@@ -1146,7 +1169,7 @@ program main
11461169
! CHECK: omp.parallel
11471170
! CHECK-NOT: if({{.*}})
11481171
! CHECK-SAME: {
1149-
! CHECK: omp.simdloop
1172+
! CHECK: omp.wsloop
11501173
! CHECK-NOT: if({{.*}})
11511174
! CHECK-SAME: {
11521175
!$omp teams distribute parallel do simd
@@ -1161,8 +1184,9 @@ program main
11611184
! CHECK-SAME: {
11621185
! CHECK: omp.parallel
11631186
! CHECK-SAME: if({{.*}})
1164-
! CHECK: omp.simdloop
1165-
! CHECK-SAME: if({{.*}})
1187+
! CHECK: omp.wsloop
1188+
! CHECK-NOT: if({{.*}})
1189+
! CHECK-SAME: {
11661190
!$omp teams distribute parallel do simd if(.true.)
11671191
do i = 1, 10
11681192
end do
@@ -1175,8 +1199,9 @@ program main
11751199
! CHECK-SAME: {
11761200
! CHECK: omp.parallel
11771201
! CHECK-SAME: if({{.*}})
1178-
! CHECK: omp.simdloop
1179-
! CHECK-SAME: if({{.*}})
1202+
! CHECK: omp.wsloop
1203+
! CHECK-NOT: if({{.*}})
1204+
! CHECK-SAME: {
11801205
!$omp teams distribute parallel do simd if(teams: .false.) if(parallel: .true.) if(simd: .false.)
11811206
do i = 1, 10
11821207
end do
@@ -1190,7 +1215,7 @@ program main
11901215
! CHECK: omp.parallel
11911216
! CHECK-NOT: if({{.*}})
11921217
! CHECK-SAME: {
1193-
! CHECK: omp.simdloop
1218+
! CHECK: omp.wsloop
11941219
! CHECK-NOT: if({{.*}})
11951220
! CHECK-SAME: {
11961221
!$omp teams distribute parallel do simd if(teams: .true.)
@@ -1206,7 +1231,7 @@ program main
12061231
! CHECK-SAME: {
12071232
! CHECK: omp.parallel
12081233
! CHECK-SAME: if({{.*}})
1209-
! CHECK: omp.simdloop
1234+
! CHECK: omp.wsloop
12101235
! CHECK-NOT: if({{.*}})
12111236
! CHECK-SAME: {
12121237
!$omp teams distribute parallel do simd if(parallel: .true.)
@@ -1223,8 +1248,9 @@ program main
12231248
! CHECK: omp.parallel
12241249
! CHECK-NOT: if({{.*}})
12251250
! CHECK-SAME: {
1226-
! CHECK: omp.simdloop
1227-
! CHECK-SAME: if({{.*}})
1251+
! CHECK: omp.wsloop
1252+
! CHECK-NOT: if({{.*}})
1253+
! CHECK-SAME: {
12281254
!$omp teams distribute parallel do simd if(simd: .true.)
12291255
do i = 1, 10
12301256
end do

‎flang/test/Lower/OpenMP/FIR/loop-combined.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ program main
1515

1616
! CHECK: omp.distribute
1717
! CHECK: omp.parallel
18-
! CHECK: omp.simdloop
18+
! CHECK: omp.wsloop
1919
!$omp distribute parallel do simd
2020
do i = 1, 10
2121
end do
@@ -111,7 +111,7 @@ program main
111111
! CHECK: omp.teams
112112
! CHECK: omp.distribute
113113
! CHECK: omp.parallel
114-
! CHECK: omp.simdloop
114+
! CHECK: omp.wsloop
115115
!$omp target teams distribute parallel do simd
116116
do i = 1, 10
117117
end do
@@ -174,7 +174,7 @@ program main
174174
! CHECK: omp.teams
175175
! CHECK: omp.distribute
176176
! CHECK: omp.parallel
177-
! CHECK: omp.simdloop
177+
! CHECK: omp.wsloop
178178
!$omp teams distribute parallel do simd
179179
do i = 1, 10
180180
end do

0 commit comments

Comments
 (0)