Skip to content

Commit 149a269

Browse files
skatrakskatrak
committed
Fix post-merge issues
1 parent a968d1f commit 149a269

File tree

13 files changed

+97
-104
lines changed

13 files changed

+97
-104
lines changed

‎flang/lib/Optimizer/OpenMP/DoConcurrentConversion.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -954,8 +954,6 @@ class DoConcurrentConversion : public mlir::OpConversionPattern<fir::DoLoopOp> {
954954
loc, /*clauses=*/mlir::omp::DistributeOperands{});
955955

956956
rewriter.createBlock(&distOp.getRegion());
957-
rewriter.setInsertionPoint(rewriter.create<mlir::omp::TerminatorOp>(loc));
958-
959957
return distOp;
960958
}
961959

@@ -1011,8 +1009,6 @@ class DoConcurrentConversion : public mlir::OpConversionPattern<fir::DoLoopOp> {
10111009
auto wsloopOp = rewriter.create<mlir::omp::WsloopOp>(doLoop.getLoc());
10121010
wsloopOp.setComposite(isComposite);
10131011
rewriter.createBlock(&wsloopOp.getRegion());
1014-
rewriter.setInsertionPoint(
1015-
rewriter.create<mlir::omp::TerminatorOp>(wsloopOp.getLoc()));
10161012

10171013
auto loopNestOp =
10181014
rewriter.create<mlir::omp::LoopNestOp>(doLoop.getLoc(), clauseOps);

‎flang/test/Integration/OpenMP/parallel-private-reduction-worstcase.f90‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -72,97 +72,97 @@ subroutine worst_case(a, b, c, d)
7272
! CHECK-NEXT: br label %omp.private.copy
7373

7474
! CHECK: omp.private.copy: ; preds = %omp.region.cont
75-
! CHECK-NEXT: br label %omp.private.copy10
75+
! CHECK-NEXT: br label %omp.private.copy11
7676

77-
! CHECK: omp.private.copy10: ; preds = %omp.private.copy
77+
! CHECK: omp.private.copy11: ; preds = %omp.private.copy
7878
! [begin firstprivate copy for first var]
7979
! [read the length, is it non-zero?]
80-
! CHECK: br i1 %{{.*}}, label %omp.private.copy11, label %omp.private.copy12
80+
! CHECK: br i1 %{{.*}}, label %omp.private.copy12, label %omp.private.copy13
8181

82-
! CHECK: omp.private.copy12: ; preds = %omp.private.copy11, %omp.private.copy10
83-
! CHECK-NEXT: br label %omp.region.cont9
82+
! CHECK: omp.private.copy13: ; preds = %omp.private.copy12, %omp.private.copy11
83+
! CHECK-NEXT: br label %omp.region.cont10
8484

85-
! CHECK: omp.region.cont9: ; preds = %omp.private.copy12
85+
! CHECK: omp.region.cont10: ; preds = %omp.private.copy13
8686
! CHECK-NEXT: %{{.*}} = phi ptr
87-
! CHECK-NEXT: br label %omp.private.copy14
87+
! CHECK-NEXT: br label %omp.private.copy15
8888

89-
! CHECK: omp.private.copy14: ; preds = %omp.region.cont9
89+
! CHECK: omp.private.copy15: ; preds = %omp.region.cont10
9090
! [begin firstprivate copy for second var]
9191
! [read the length, is it non-zero?]
92-
! CHECK: br i1 %{{.*}}, label %omp.private.copy15, label %omp.private.copy16
92+
! CHECK: br i1 %{{.*}}, label %omp.private.copy16, label %omp.private.copy17
9393

94-
! CHECK: omp.private.copy16: ; preds = %omp.private.copy15, %omp.private.copy14
95-
! CHECK-NEXT: br label %omp.region.cont13
94+
! CHECK: omp.private.copy17: ; preds = %omp.private.copy16, %omp.private.copy15
95+
! CHECK-NEXT: br label %omp.region.cont14
9696

97-
! CHECK: omp.region.cont13: ; preds = %omp.private.copy16
97+
! CHECK: omp.region.cont14: ; preds = %omp.private.copy17
9898
! CHECK-NEXT: %{{.*}} = phi ptr
9999
! CHECK-NEXT: br label %omp.reduction.init
100100

101-
! CHECK: omp.reduction.init: ; preds = %omp.region.cont13
101+
! CHECK: omp.reduction.init: ; preds = %omp.region.cont14
102102
! [deffered stores for results of reduction alloc regions]
103103
! CHECK: br label %[[VAL_96:.*]]
104104

105105
! CHECK: omp.reduction.neutral: ; preds = %omp.reduction.init
106106
! [start of reduction initialization region]
107107
! [null check:]
108-
! CHECK: br i1 %{{.*}}, label %omp.reduction.neutral18, label %omp.reduction.neutral19
108+
! CHECK: br i1 %{{.*}}, label %omp.reduction.neutral19, label %omp.reduction.neutral20
109109

110-
! CHECK: omp.reduction.neutral19: ; preds = %omp.reduction.neutral
110+
! CHECK: omp.reduction.neutral20: ; preds = %omp.reduction.neutral
111111
! [malloc and assign the default value to the reduction variable]
112-
! CHECK: br label %omp.reduction.neutral20
112+
! CHECK: br label %omp.reduction.neutral21
113113

114-
! CHECK: omp.reduction.neutral20: ; preds = %omp.reduction.neutral18, %omp.reduction.neutral19
115-
! CHECK-NEXT: br label %omp.region.cont17
114+
! CHECK: omp.reduction.neutral21: ; preds = %omp.reduction.neutral19, %omp.reduction.neutral20
115+
! CHECK-NEXT: br label %omp.region.cont18
116116

117-
! CHECK: omp.region.cont17: ; preds = %omp.reduction.neutral20
117+
! CHECK: omp.region.cont18: ; preds = %omp.reduction.neutral21
118118
! CHECK-NEXT: %{{.*}} = phi ptr
119-
! CHECK-NEXT: br label %omp.reduction.neutral22
119+
! CHECK-NEXT: br label %omp.reduction.neutral23
120120

121-
! CHECK: omp.reduction.neutral22: ; preds = %omp.region.cont17
121+
! CHECK: omp.reduction.neutral23: ; preds = %omp.region.cont18
122122
! [start of reduction initialization region]
123123
! [null check:]
124-
! CHECK: br i1 %{{.*}}, label %omp.reduction.neutral23, label %omp.reduction.neutral24
124+
! CHECK: br i1 %{{.*}}, label %omp.reduction.neutral24, label %omp.reduction.neutral25
125125

126-
! CHECK: omp.reduction.neutral24: ; preds = %omp.reduction.neutral22
126+
! CHECK: omp.reduction.neutral25: ; preds = %omp.reduction.neutral23
127127
! [malloc and assign the default value to the reduction variable]
128-
! CHECK: br label %omp.reduction.neutral25
128+
! CHECK: br label %omp.reduction.neutral26
129129

130-
! CHECK: omp.reduction.neutral25: ; preds = %omp.reduction.neutral23, %omp.reduction.neutral24
131-
! CHECK-NEXT: br label %omp.region.cont21
130+
! CHECK: omp.reduction.neutral26: ; preds = %omp.reduction.neutral24, %omp.reduction.neutral25
131+
! CHECK-NEXT: br label %omp.region.cont22
132132

133-
! CHECK: omp.region.cont21: ; preds = %omp.reduction.neutral25
133+
! CHECK: omp.region.cont22: ; preds = %omp.reduction.neutral26
134134
! CHECK-NEXT: %{{.*}} = phi ptr
135135
! CHECK-NEXT: br label %omp.par.region
136136

137-
! CHECK: omp.par.region: ; preds = %omp.region.cont21
138-
! CHECK-NEXT: br label %omp.par.region27
137+
! CHECK: omp.par.region: ; preds = %omp.region.cont22
138+
! CHECK-NEXT: br label %omp.par.region28
139139

140-
! CHECK: omp.par.region27: ; preds = %omp.par.region
140+
! CHECK: omp.par.region28: ; preds = %omp.par.region
141141
! [call SUM runtime function]
142142
! [if (sum(a) == 1)]
143-
! CHECK: br i1 %{{.*}}, label %omp.par.region28, label %omp.par.region29
143+
! CHECK: br i1 %{{.*}}, label %omp.par.region29, label %omp.par.region30
144144

145-
! CHECK: omp.par.region29: ; preds = %omp.par.region27
146-
! CHECK-NEXT: br label %omp.region.cont26
145+
! CHECK: omp.par.region30: ; preds = %omp.par.region28
146+
! CHECK-NEXT: br label %omp.region.cont27
147147

148-
! CHECK: omp.region.cont26: ; preds = %omp.par.region28, %omp.par.region29
148+
! CHECK: omp.region.cont27: ; preds = %omp.par.region29, %omp.par.region30
149149
! [omp parallel region done, call into the runtime to complete reduction]
150150
! CHECK: %[[VAL_233:.*]] = call i32 @__kmpc_reduce(
151151
! CHECK: switch i32 %[[VAL_233]], label %reduce.finalize [
152152
! CHECK-NEXT: i32 1, label %reduce.switch.nonatomic
153153
! CHECK-NEXT: i32 2, label %reduce.switch.atomic
154154
! CHECK-NEXT: ]
155155

156-
! CHECK: reduce.switch.atomic: ; preds = %omp.region.cont26
156+
! CHECK: reduce.switch.atomic: ; preds = %omp.region.cont27
157157
! CHECK-NEXT: unreachable
158158

159-
! CHECK: reduce.switch.nonatomic: ; preds = %omp.region.cont26
159+
! CHECK: reduce.switch.nonatomic: ; preds = %omp.region.cont27
160160
! CHECK-NEXT: %[[red_private_value_0:.*]] = load ptr, ptr %{{.*}}, align 8
161161
! CHECK-NEXT: br label %omp.reduction.nonatomic.body
162162

163163
! [various blocks implementing the reduction]
164164

165-
! CHECK: omp.region.cont35: ; preds =
165+
! CHECK: omp.region.cont36: ; preds =
166166
! CHECK-NEXT: %{{.*}} = phi ptr
167167
! CHECK-NEXT: call void @__kmpc_end_reduce(
168168
! CHECK-NEXT: br label %reduce.finalize
@@ -176,79 +176,79 @@ subroutine worst_case(a, b, c, d)
176176

177177
! CHECK: omp.reduction.cleanup: ; preds = %omp.par.pre_finalize
178178
! [null check]
179-
! CHECK: br i1 %{{.*}}, label %omp.reduction.cleanup41, label %omp.reduction.cleanup42
179+
! CHECK: br i1 %{{.*}}, label %omp.reduction.cleanup42, label %omp.reduction.cleanup43
180180

181-
! CHECK: omp.reduction.cleanup42: ; preds = %omp.reduction.cleanup41, %omp.reduction.cleanup
182-
! CHECK-NEXT: br label %omp.region.cont40
181+
! CHECK: omp.reduction.cleanup43: ; preds = %omp.reduction.cleanup42, %omp.reduction.cleanup
182+
! CHECK-NEXT: br label %omp.region.cont41
183183

184-
! CHECK: omp.region.cont40: ; preds = %omp.reduction.cleanup42
184+
! CHECK: omp.region.cont41: ; preds = %omp.reduction.cleanup43
185185
! CHECK-NEXT: %{{.*}} = load ptr, ptr
186-
! CHECK-NEXT: br label %omp.reduction.cleanup44
186+
! CHECK-NEXT: br label %omp.reduction.cleanup45
187187

188-
! CHECK: omp.reduction.cleanup44: ; preds = %omp.region.cont40
188+
! CHECK: omp.reduction.cleanup45: ; preds = %omp.region.cont41
189189
! [null check]
190-
! CHECK: br i1 %{{.*}}, label %omp.reduction.cleanup45, label %omp.reduction.cleanup46
190+
! CHECK: br i1 %{{.*}}, label %omp.reduction.cleanup46, label %omp.reduction.cleanup47
191191

192-
! CHECK: omp.reduction.cleanup46: ; preds = %omp.reduction.cleanup45, %omp.reduction.cleanup44
193-
! CHECK-NEXT: br label %omp.region.cont43
192+
! CHECK: omp.reduction.cleanup47: ; preds = %omp.reduction.cleanup46, %omp.reduction.cleanup45
193+
! CHECK-NEXT: br label %omp.region.cont44
194194

195-
! CHECK: omp.region.cont43: ; preds = %omp.reduction.cleanup46
195+
! CHECK: omp.region.cont44: ; preds = %omp.reduction.cleanup47
196196
! CHECK-NEXT: br label %omp.private.dealloc
197197

198-
! CHECK: omp.private.dealloc: ; preds = %omp.region.cont43
198+
! CHECK: omp.private.dealloc: ; preds = %omp.region.cont44
199199
! [null check]
200-
! CHECK: br i1 %{{.*}}, label %omp.private.dealloc48, label %omp.private.dealloc49
200+
! CHECK: br i1 %{{.*}}, label %omp.private.dealloc49, label %omp.private.dealloc50
201201

202-
! CHECK: omp.private.dealloc49: ; preds = %omp.private.dealloc48, %omp.private.dealloc
203-
! CHECK-NEXT: br label %omp.region.cont47
202+
! CHECK: omp.private.dealloc50: ; preds = %omp.private.dealloc49, %omp.private.dealloc
203+
! CHECK-NEXT: br label %omp.region.cont48
204204

205-
! CHECK: omp.region.cont47: ; preds = %omp.private.dealloc49
206-
! CHECK-NEXT: br label %omp.private.dealloc51
205+
! CHECK: omp.region.cont48: ; preds = %omp.private.dealloc50
206+
! CHECK-NEXT: br label %omp.private.dealloc52
207207

208-
! CHECK: omp.private.dealloc51: ; preds = %omp.region.cont47
208+
! CHECK: omp.private.dealloc52: ; preds = %omp.region.cont48
209209
! [null check]
210-
! CHECK: br i1 %{{.*}}, label %omp.private.dealloc52, label %omp.private.dealloc53
210+
! CHECK: br i1 %{{.*}}, label %omp.private.dealloc53, label %omp.private.dealloc54
211211

212-
! CHECK: omp.private.dealloc53: ; preds = %omp.private.dealloc52, %omp.private.dealloc51
213-
! CHECK-NEXT: br label %omp.region.cont50
212+
! CHECK: omp.private.dealloc54: ; preds = %omp.private.dealloc53, %omp.private.dealloc52
213+
! CHECK-NEXT: br label %omp.region.cont51
214214

215-
! CHECK: omp.region.cont50: ; preds = %omp.private.dealloc53
215+
! CHECK: omp.region.cont51: ; preds = %omp.private.dealloc54
216216
! CHECK-NEXT: br label %omp.par.outlined.exit.exitStub
217217

218-
! CHECK: omp.private.dealloc52: ; preds = %omp.private.dealloc51
218+
! CHECK: omp.private.dealloc53: ; preds = %omp.private.dealloc52
219219
! [dealloc memory]
220-
! CHECK: br label %omp.private.dealloc53
220+
! CHECK: br label %omp.private.dealloc54
221221

222-
! CHECK: omp.private.dealloc48: ; preds = %omp.private.dealloc
222+
! CHECK: omp.private.dealloc49: ; preds = %omp.private.dealloc
223223
! [dealloc memory]
224-
! CHECK: br label %omp.private.dealloc49
224+
! CHECK: br label %omp.private.dealloc50
225225

226-
! CHECK: omp.reduction.cleanup45: ; preds = %omp.reduction.cleanup44
226+
! CHECK: omp.reduction.cleanup46: ; preds = %omp.reduction.cleanup45
227227
! CHECK-NEXT: call void @free(
228-
! CHECK-NEXT: br label %omp.reduction.cleanup46
228+
! CHECK-NEXT: br label %omp.reduction.cleanup47
229229

230-
! CHECK: omp.reduction.cleanup41: ; preds = %omp.reduction.cleanup
230+
! CHECK: omp.reduction.cleanup42: ; preds = %omp.reduction.cleanup
231231
! CHECK-NEXT: call void @free(
232-
! CHECK-NEXT: br label %omp.reduction.cleanup42
232+
! CHECK-NEXT: br label %omp.reduction.cleanup43
233233

234-
! CHECK: omp.par.region28: ; preds = %omp.par.region27
234+
! CHECK: omp.par.region29: ; preds = %omp.par.region28
235235
! CHECK-NEXT: call {} @_FortranAStopStatement
236236

237-
! CHECK: omp.reduction.neutral23: ; preds = %omp.reduction.neutral22
237+
! CHECK: omp.reduction.neutral24: ; preds = %omp.reduction.neutral23
238238
! [source length was zero: finish initializing array]
239-
! CHECK: br label %omp.reduction.neutral25
239+
! CHECK: br label %omp.reduction.neutral26
240240

241-
! CHECK: omp.reduction.neutral18: ; preds = %omp.reduction.neutral
241+
! CHECK: omp.reduction.neutral19: ; preds = %omp.reduction.neutral
242242
! [source length was zero: finish initializing array]
243-
! CHECK: br label %omp.reduction.neutral20
243+
! CHECK: br label %omp.reduction.neutral21
244244

245-
! CHECK: omp.private.copy15: ; preds = %omp.private.copy14
245+
! CHECK: omp.private.copy16: ; preds = %omp.private.copy15
246246
! [source length was non-zero: call assign runtime]
247-
! CHECK: br label %omp.private.copy16
247+
! CHECK: br label %omp.private.copy17
248248

249-
! CHECK: omp.private.copy11: ; preds = %omp.private.copy10
249+
! CHECK: omp.private.copy12: ; preds = %omp.private.copy11
250250
! [source length was non-zero: call assign runtime]
251-
! CHECK: br label %omp.private.copy12
251+
! CHECK: br label %omp.private.copy13
252252

253253
! CHECK: omp.private.alloc1: ; preds = %omp.private.alloc
254254
! [var extent was non-zero: malloc a private array]
@@ -258,5 +258,5 @@ subroutine worst_case(a, b, c, d)
258258
! [var extent was non-zero: malloc a private array]
259259
! CHECK: br label %omp.private.alloc8
260260

261-
! CHECK: omp.par.outlined.exit.exitStub: ; preds = %omp.region.cont50
261+
! CHECK: omp.par.outlined.exit.exitStub: ; preds = %omp.region.cont51
262262
! CHECK-NEXT: ret void

‎flang/test/Lower/OpenMP/hlfir-to-fir-conv-omp.mlir‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ func.func @_QPfoo() {
4949
// CHECK: omp.yield
5050
omp.yield
5151
}
52-
// CHECK: omp.terminator
53-
omp.terminator
5452
} {omp.composite}
55-
// CHECK: omp.terminator
56-
omp.terminator
5753
} {omp.composite}
5854
// CHECK: omp.terminator
5955
omp.terminator

‎flang/test/Lower/OpenMP/target_private.f90‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,9 @@ subroutine omp_target_target_do_simd()
6060
!CHECK: hlfir.assign {{.*}} to %[[VAR_DECL]]#0
6161
!CHECK: omp.yield
6262
!CHECK-NEXT: }
63-
!CHECK-NEXT: omp.terminator
64-
!CHECK-NEXT: }
65-
!CHECK-NEXT: omp.terminator
66-
!CHECK-NEXT: }
67-
!CHECK-NEXT: omp.terminator
68-
!CHECK-NEXT: }
63+
!CHECK-NEXT: } {omp.composite}
64+
!CHECK-NEXT: } {omp.composite}
65+
!CHECK-NEXT: } {omp.composite}
6966
!CHECK-NEXT: omp.terminator
7067
!CHECK-NEXT: }
7168
!CHECK-NEXT: omp.terminator

‎flang/test/Transforms/DoConcurrent/basic_device.f90‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,10 @@ program do_concurrent_basic
6666
! CHECK-NEXT: omp.yield
6767
! CHECK-NEXT: }
6868

69+
! CHECK-NEXT: } {omp.composite}
70+
! CHECK-NEXT: } {omp.composite}
6971
! CHECK-NEXT: omp.terminator
70-
! CHECK-NEXT: }
71-
! CHECK-NEXT: omp.terminator
72-
! CHECK-NEXT: }
73-
! CHECK-NEXT: omp.terminator
74-
! CHECK-NEXT: }
72+
! CHECK-NEXT: } {omp.composite}
7573
! CHECK-NEXT: omp.terminator
7674
! CHECK-NEXT: }
7775
! CHECK-NEXT: omp.terminator

‎flang/test/Transforms/DoConcurrent/basic_host.f90‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ program do_concurrent_basic
3737
! CHECK-NEXT: hlfir.assign %[[IV_VAL1]] to %[[ARR_ACCESS]] : i32, !fir.ref<i32>
3838
! CHECK-NEXT: omp.yield
3939
! CHECK-NEXT: }
40-
! CHECK-NEXT: omp.terminator
4140
! CHECK-NEXT: }
4241

4342
! CHECK-NEXT: omp.terminator

‎flang/test/Transforms/DoConcurrent/basic_host.mlir‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ func.func @do_concurrent_basic() attributes {fir.bindc_name = "do_concurrent_bas
4242
// CHECK-NEXT: hlfir.assign %[[IV_VAL1]] to %[[ARR_ACCESS]] : i32, !fir.ref<i32>
4343
// CHECK-NEXT: omp.yield
4444
// CHECK-NEXT: }
45-
// CHECK-NEXT: omp.terminator
4645
// CHECK-NEXT: }
4746

4847
// CHECK-NEXT: omp.terminator

‎flang/test/Transforms/DoConcurrent/locally_destroyed_temp.f90‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ end program main
6666
! COMMON: fir.call @_FortranADestroy(%[[CONVERTED_LOCAL]])
6767
! COMMON: omp.yield
6868
! COMMON: }
69-
! COMMON: omp.terminator
7069
! COMMON: }
71-
! DEVICE: omp.terminator
7270
! DEVICE: }
7371
! COMMON: omp.terminator
7472
! COMMON: }

‎flang/test/Transforms/DoConcurrent/multiple_iteration_ranges.f90‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ program main
114114

115115
! COMMON: omp.yield
116116
! COMMON-NEXT: }
117-
! COMMON-NEXT: omp.terminator
118117
! COMMON-NEXT: }
119118

120119
! HOST-NEXT: omp.terminator

‎flang/test/Transforms/DoConcurrent/non_const_bounds.f90‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ end program main
3838
! CHECK: omp.loop_nest (%{{.*}}) : index = (%[[LB]]) to (%[[UB]]) inclusive step (%{{.*}}) {
3939
! CHECK: omp.yield
4040
! CHECK: }
41-
! CHECK: omp.terminator
4241
! CHECK: }
4342
! CHECK: omp.terminator
4443
! CHECK: }

0 commit comments

Comments
 (0)