Skip to content

Commit d62ff71

Browse files
skatrakskatrak
authored
[Flang][OpenMP] NFC: Check omp.loop_nest in compound construct lowering (#95404)
This patch updates tests containing compound loop constructs to also check for the `omp.loop_nest` operation. The "loop-combined.f90" test file is renamed to "loop-compound.f90" as well, to better indicate the types of constructs that are checked in it.
1 parent bd5fbab commit d62ff71

File tree

2 files changed

+71
-1
lines changed

2 files changed

+71
-1
lines changed

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ program main
3030
! CHECK: omp.wsloop
3131
! CHECK-NOT: if({{.*}})
3232
! CHECK-SAME: {
33+
! CHECK-NEXT: omp.loop_nest
3334
!$omp do simd
3435
do i = 1, 10
3536
end do
@@ -38,6 +39,7 @@ program main
3839
! CHECK: omp.wsloop
3940
! CHECK-NOT: if({{.*}})
4041
! CHECK-SAME: {
42+
! CHECK-NEXT: omp.loop_nest
4143
!$omp do simd if(.true.)
4244
do i = 1, 10
4345
end do
@@ -46,6 +48,7 @@ program main
4648
! CHECK: omp.wsloop
4749
! CHECK-NOT: if({{.*}})
4850
! CHECK-SAME: {
51+
! CHECK-NEXT: omp.loop_nest
4952
!$omp do simd if(simd: .true.)
5053
do i = 1, 10
5154
end do
@@ -79,20 +82,32 @@ program main
7982
! CHECK: omp.parallel
8083
! CHECK-NOT: if({{.*}})
8184
! CHECK-SAME: {
85+
! CHECK: omp.wsloop
86+
! CHECK-NOT: if({{.*}})
87+
! CHECK-SAME: {
88+
! CHECK-NEXT: omp.loop_nest
8289
!$omp parallel do
8390
do i = 1, 10
8491
end do
8592
!$omp end parallel do
8693

8794
! CHECK: omp.parallel
8895
! CHECK-SAME: if({{.*}})
96+
! CHECK: omp.wsloop
97+
! CHECK-NOT: if({{.*}})
98+
! CHECK-SAME: {
99+
! CHECK-NEXT: omp.loop_nest
89100
!$omp parallel do if(.true.)
90101
do i = 1, 10
91102
end do
92103
!$omp end parallel do
93104

94105
! CHECK: omp.parallel
95106
! CHECK-SAME: if({{.*}})
107+
! CHECK: omp.wsloop
108+
! CHECK-NOT: if({{.*}})
109+
! CHECK-SAME: {
110+
! CHECK-NEXT: omp.loop_nest
96111
!$omp parallel do if(parallel: .true.)
97112
do i = 1, 10
98113
end do
@@ -107,6 +122,7 @@ program main
107122
! CHECK: omp.wsloop
108123
! CHECK-NOT: if({{.*}})
109124
! CHECK-SAME: {
125+
! CHECK-NEXT: omp.loop_nest
110126
!$omp parallel do simd
111127
do i = 1, 10
112128
end do
@@ -117,6 +133,7 @@ program main
117133
! CHECK: omp.wsloop
118134
! CHECK-NOT: if({{.*}})
119135
! CHECK-SAME: {
136+
! CHECK-NEXT: omp.loop_nest
120137
!$omp parallel do simd if(.true.)
121138
do i = 1, 10
122139
end do
@@ -127,6 +144,7 @@ program main
127144
! CHECK: omp.wsloop
128145
! CHECK-NOT: if({{.*}})
129146
! CHECK-SAME: {
147+
! CHECK-NEXT: omp.loop_nest
130148
!$omp parallel do simd if(parallel: .true.) if(simd: .false.)
131149
do i = 1, 10
132150
end do
@@ -137,6 +155,7 @@ program main
137155
! CHECK: omp.wsloop
138156
! CHECK-NOT: if({{.*}})
139157
! CHECK-SAME: {
158+
! CHECK-NEXT: omp.loop_nest
140159
!$omp parallel do simd if(parallel: .true.)
141160
do i = 1, 10
142161
end do
@@ -148,6 +167,7 @@ program main
148167
! CHECK: omp.wsloop
149168
! CHECK-NOT: if({{.*}})
150169
! CHECK-SAME: {
170+
! CHECK-NEXT: omp.loop_nest
151171
!$omp parallel do simd if(simd: .true.)
152172
do i = 1, 10
153173
end do
@@ -159,20 +179,23 @@ program main
159179
! CHECK: omp.simd
160180
! CHECK-NOT: if({{.*}})
161181
! CHECK-SAME: {
182+
! CHECK-NEXT: omp.loop_nest
162183
!$omp simd
163184
do i = 1, 10
164185
end do
165186
!$omp end simd
166187

167188
! CHECK: omp.simd
168189
! CHECK-SAME: if({{.*}})
190+
! CHECK-NEXT: omp.loop_nest
169191
!$omp simd if(.true.)
170192
do i = 1, 10
171193
end do
172194
!$omp end simd
173195

174196
! CHECK: omp.simd
175197
! CHECK-SAME: if({{.*}})
198+
! CHECK-NEXT: omp.loop_nest
176199
!$omp simd if(simd: .true.)
177200
do i = 1, 10
178201
end do
@@ -257,6 +280,10 @@ program main
257280
! CHECK: omp.parallel
258281
! CHECK-NOT: if({{.*}})
259282
! CHECK-SAME: {
283+
! CHECK: omp.wsloop
284+
! CHECK-NOT: if({{.*}})
285+
! CHECK-SAME: {
286+
! CHECK-NEXT: omp.loop_nest
260287
!$omp target parallel do
261288
do i = 1, 10
262289
end do
@@ -266,6 +293,10 @@ program main
266293
! CHECK-SAME: if({{.*}})
267294
! CHECK: omp.parallel
268295
! CHECK-SAME: if({{.*}})
296+
! CHECK: omp.wsloop
297+
! CHECK-NOT: if({{.*}})
298+
! CHECK-SAME: {
299+
! CHECK-NEXT: omp.loop_nest
269300
!$omp target parallel do if(.true.)
270301
do i = 1, 10
271302
end do
@@ -275,6 +306,10 @@ program main
275306
! CHECK-SAME: if({{.*}})
276307
! CHECK: omp.parallel
277308
! CHECK-SAME: if({{.*}})
309+
! CHECK: omp.wsloop
310+
! CHECK-NOT: if({{.*}})
311+
! CHECK-SAME: {
312+
! CHECK-NEXT: omp.loop_nest
278313
!$omp target parallel do if(target: .true.) if(parallel: .false.)
279314
do i = 1, 10
280315
end do
@@ -285,6 +320,10 @@ program main
285320
! CHECK: omp.parallel
286321
! CHECK-NOT: if({{.*}})
287322
! CHECK-SAME: {
323+
! CHECK: omp.wsloop
324+
! CHECK-NOT: if({{.*}})
325+
! CHECK-SAME: {
326+
! CHECK-NEXT: omp.loop_nest
288327
!$omp target parallel do if(target: .true.)
289328
do i = 1, 10
290329
end do
@@ -295,6 +334,10 @@ program main
295334
! CHECK-SAME: {
296335
! CHECK: omp.parallel
297336
! CHECK-SAME: if({{.*}})
337+
! CHECK: omp.wsloop
338+
! CHECK-NOT: if({{.*}})
339+
! CHECK-SAME: {
340+
! CHECK-NEXT: omp.loop_nest
298341
!$omp target parallel do if(parallel: .true.)
299342
do i = 1, 10
300343
end do
@@ -312,6 +355,7 @@ program main
312355
! CHECK: omp.wsloop
313356
! CHECK-NOT: if({{.*}})
314357
! CHECK-SAME: {
358+
! CHECK-NEXT: omp.loop_nest
315359
!$omp target parallel do simd
316360
do i = 1, 10
317361
end do
@@ -324,6 +368,7 @@ program main
324368
! CHECK: omp.wsloop
325369
! CHECK-NOT: if({{.*}})
326370
! CHECK-SAME: {
371+
! CHECK-NEXT: omp.loop_nest
327372
!$omp target parallel do simd if(.true.)
328373
do i = 1, 10
329374
end do
@@ -336,6 +381,7 @@ program main
336381
! CHECK: omp.wsloop
337382
! CHECK-NOT: if({{.*}})
338383
! CHECK-SAME: {
384+
! CHECK-NEXT: omp.loop_nest
339385
!$omp target parallel do simd if(target: .true.) if(parallel: .false.) &
340386
!$omp& if(simd: .true.)
341387
do i = 1, 10
@@ -350,6 +396,7 @@ program main
350396
! CHECK: omp.wsloop
351397
! CHECK-NOT: if({{.*}})
352398
! CHECK-SAME: {
399+
! CHECK-NEXT: omp.loop_nest
353400
!$omp target parallel do simd if(target: .true.)
354401
do i = 1, 10
355402
end do
@@ -363,6 +410,7 @@ program main
363410
! CHECK: omp.wsloop
364411
! CHECK-NOT: if({{.*}})
365412
! CHECK-SAME: {
413+
! CHECK-NEXT: omp.loop_nest
366414
!$omp target parallel do simd if(parallel: .true.) if(simd: .false.)
367415
do i = 1, 10
368416
end do
@@ -424,6 +472,7 @@ program main
424472
! CHECK: omp.simd
425473
! CHECK-NOT: if({{.*}})
426474
! CHECK-SAME: {
475+
! CHECK-NEXT: omp.loop_nest
427476
!$omp target simd
428477
do i = 1, 10
429478
end do
@@ -433,6 +482,7 @@ program main
433482
! CHECK-SAME: if({{.*}})
434483
! CHECK: omp.simd
435484
! CHECK-SAME: if({{.*}})
485+
! CHECK-NEXT: omp.loop_nest
436486
!$omp target simd if(.true.)
437487
do i = 1, 10
438488
end do
@@ -442,6 +492,7 @@ program main
442492
! CHECK-SAME: if({{.*}})
443493
! CHECK: omp.simd
444494
! CHECK-SAME: if({{.*}})
495+
! CHECK-NEXT: omp.loop_nest
445496
!$omp target simd if(target: .true.) if(simd: .false.)
446497
do i = 1, 10
447498
end do
@@ -452,6 +503,7 @@ program main
452503
! CHECK: omp.simd
453504
! CHECK-NOT: if({{.*}})
454505
! CHECK-SAME: {
506+
! CHECK-NEXT: omp.loop_nest
455507
!$omp target simd if(target: .true.)
456508
do i = 1, 10
457509
end do
@@ -462,6 +514,7 @@ program main
462514
! CHECK-SAME: {
463515
! CHECK: omp.simd
464516
! CHECK-SAME: if({{.*}})
517+
! CHECK-NEXT: omp.loop_nest
465518
!$omp target simd if(simd: .true.)
466519
do i = 1, 10
467520
end do
@@ -479,6 +532,7 @@ program main
479532
! CHECK: omp.distribute
480533
! CHECK-NOT: if({{.*}})
481534
! CHECK-SAME: {
535+
! CHECK-NEXT: omp.loop_nest
482536
!$omp target teams distribute
483537
do i = 1, 10
484538
end do
@@ -491,6 +545,7 @@ program main
491545
! CHECK: omp.distribute
492546
! CHECK-NOT: if({{.*}})
493547
! CHECK-SAME: {
548+
! CHECK-NEXT: omp.loop_nest
494549
!$omp target teams distribute if(.true.)
495550
do i = 1, 10
496551
end do
@@ -503,6 +558,7 @@ program main
503558
! CHECK: omp.distribute
504559
! CHECK-NOT: if({{.*}})
505560
! CHECK-SAME: {
561+
! CHECK-NEXT: omp.loop_nest
506562
!$omp target teams distribute if(target: .true.) if(teams: .false.)
507563
do i = 1, 10
508564
end do
@@ -516,6 +572,7 @@ program main
516572
! CHECK: omp.distribute
517573
! CHECK-NOT: if({{.*}})
518574
! CHECK-SAME: {
575+
! CHECK-NEXT: omp.loop_nest
519576
!$omp target teams distribute if(target: .true.)
520577
do i = 1, 10
521578
end do
@@ -529,6 +586,7 @@ program main
529586
! CHECK: omp.distribute
530587
! CHECK-NOT: if({{.*}})
531588
! CHECK-SAME: {
589+
! CHECK-NEXT: omp.loop_nest
532590
!$omp target teams distribute if(teams: .true.)
533591
do i = 1, 10
534592
end do
@@ -609,6 +667,7 @@ program main
609667
! CHECK: omp.distribute
610668
! CHECK-NOT: if({{.*}})
611669
! CHECK-SAME: {
670+
! CHECK-NEXT: omp.loop_nest
612671
!$omp teams distribute
613672
do i = 1, 10
614673
end do
@@ -619,6 +678,7 @@ program main
619678
! CHECK: omp.distribute
620679
! CHECK-NOT: if({{.*}})
621680
! CHECK-SAME: {
681+
! CHECK-NEXT: omp.loop_nest
622682
!$omp teams distribute if(.true.)
623683
do i = 1, 10
624684
end do
@@ -629,6 +689,7 @@ program main
629689
! CHECK: omp.distribute
630690
! CHECK-NOT: if({{.*}})
631691
! CHECK-SAME: {
692+
! CHECK-NEXT: omp.loop_nest
632693
!$omp teams distribute if(teams: .true.)
633694
do i = 1, 10
634695
end do

‎flang/test/Lower/OpenMP/loop-combined.f90‎ renamed to ‎flang/test/Lower/OpenMP/loop-compound.f90‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
! This test checks lowering of OpenMP combined loop constructs.
1+
! This test checks lowering of OpenMP compound (combined and composite) loop
2+
! constructs.
23

34
! RUN: bbc -fopenmp -emit-hlfir %s -o - | FileCheck %s
45
! RUN: %flang_fc1 -fopenmp -emit-hlfir %s -o - | FileCheck %s
@@ -22,6 +23,7 @@ program main
2223
! DO SIMD
2324
! ----------------------------------------------------------------------------
2425
! CHECK: omp.wsloop
26+
! CHECK-NEXT: omp.loop_nest
2527
!$omp do simd
2628
do i = 1, 10
2729
end do
@@ -32,6 +34,7 @@ program main
3234
! ----------------------------------------------------------------------------
3335
! CHECK: omp.parallel
3436
! CHECK: omp.wsloop
37+
! CHECK-NEXT: omp.loop_nest
3538
!$omp parallel do simd
3639
do i = 1, 10
3740
end do
@@ -42,6 +45,7 @@ program main
4245
! ----------------------------------------------------------------------------
4346
! CHECK: omp.parallel
4447
! CHECK: omp.wsloop
48+
! CHECK-NEXT: omp.loop_nest
4549
!$omp parallel do
4650
do i = 1, 10
4751
end do
@@ -53,6 +57,7 @@ program main
5357
! CHECK: omp.target
5458
! CHECK: omp.parallel
5559
! CHECK: omp.wsloop
60+
! CHECK-NEXT: omp.loop_nest
5661
!$omp target parallel do simd
5762
do i = 1, 10
5863
end do
@@ -64,6 +69,7 @@ program main
6469
! CHECK: omp.target
6570
! CHECK: omp.parallel
6671
! CHECK: omp.wsloop
72+
! CHECK-NEXT: omp.loop_nest
6773
!$omp target parallel do
6874
do i = 1, 10
6975
end do
@@ -74,6 +80,7 @@ program main
7480
! ----------------------------------------------------------------------------
7581
! CHECK: omp.target
7682
! CHECK: omp.simd
83+
! CHECK-NEXT: omp.loop_nest
7784
!$omp target simd
7885
do i = 1, 10
7986
end do
@@ -86,6 +93,7 @@ program main
8693
! CHECK: omp.target
8794
! CHECK: omp.teams
8895
! CHECK: omp.distribute
96+
! CHECK-NEXT: omp.loop_nest
8997
!$omp target teams distribute
9098
do i = 1, 10
9199
end do
@@ -97,6 +105,7 @@ program main
97105

98106
! CHECK: omp.teams
99107
! CHECK: omp.distribute
108+
! CHECK-NEXT: omp.loop_nest
100109
!$omp teams distribute
101110
do i = 1, 10
102111
end do

0 commit comments

Comments
 (0)