Skip to content

Commit 48b460f

Browse files
skatrakskatrak
committed
Revert changes to omp.target_data and cleanup
1 parent 49947f8 commit 48b460f

File tree

12 files changed

+58
-58
lines changed

12 files changed

+58
-58
lines changed

‎flang/lib/Lower/OpenMP/OpenMP.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -873,11 +873,11 @@ genTargetDataOp(Fortran::lower::AbstractConverter &converter,
873873
}
874874

875875
template <typename OpTy>
876-
static OpTy
877-
genTargetEnterExitUpdateDataOp(Fortran::lower::AbstractConverter &converter,
878-
Fortran::semantics::SemanticsContext &semaCtx,
879-
mlir::Location currentLocation,
880-
const Fortran::parser::OmpClauseList &clauseList) {
876+
static OpTy genTargetEnterExitDataUpdateOp(
877+
Fortran::lower::AbstractConverter &converter,
878+
Fortran::semantics::SemanticsContext &semaCtx,
879+
mlir::Location currentLocation,
880+
const Fortran::parser::OmpClauseList &clauseList) {
881881
fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
882882
Fortran::lower::StatementContext stmtCtx;
883883
mlir::Value ifClauseOperand, deviceOperand;
@@ -1383,15 +1383,15 @@ genOmpSimpleStandalone(Fortran::lower::AbstractConverter &converter,
13831383
opClauseList);
13841384
break;
13851385
case llvm::omp::Directive::OMPD_target_enter_data:
1386-
genTargetEnterExitUpdateDataOp<mlir::omp::TargetEnterDataOp>(
1386+
genTargetEnterExitDataUpdateOp<mlir::omp::TargetEnterDataOp>(
13871387
converter, semaCtx, currentLocation, opClauseList);
13881388
break;
13891389
case llvm::omp::Directive::OMPD_target_exit_data:
1390-
genTargetEnterExitUpdateDataOp<mlir::omp::TargetExitDataOp>(
1390+
genTargetEnterExitDataUpdateOp<mlir::omp::TargetExitDataOp>(
13911391
converter, semaCtx, currentLocation, opClauseList);
13921392
break;
13931393
case llvm::omp::Directive::OMPD_target_update:
1394-
genTargetEnterExitUpdateDataOp<mlir::omp::TargetUpdateOp>(
1394+
genTargetEnterExitDataUpdateOp<mlir::omp::TargetUpdateOp>(
13951395
converter, semaCtx, currentLocation, opClauseList);
13961396
break;
13971397
case llvm::omp::Directive::OMPD_ordered:

‎flang/test/Fir/convert-to-llvm-openmp-and-fir.fir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ func.func @_QPopenmp_target_data_region() {
332332
%c2 = arith.subi %c1024, %c3 : index
333333
%bound = omp.map.bounds lower_bound(%c0 : index) upper_bound(%c2 : index) extent(%c1024 : index) stride(%c3 : index) start_idx(%c3 : index)
334334
%entry = omp.map.info var_ptr(%0 : !fir.ref<!fir.array<1024xi32>>, !fir.array<1024xi32>) map_clauses(tofrom) capture(ByRef) bounds(%bound) -> !fir.ref<!fir.array<1024xi32>> {name = "a"}
335-
omp.target.data map_entries(%entry : !fir.ref<!fir.array<1024xi32>>) {
335+
omp.target_data map_entries(%entry : !fir.ref<!fir.array<1024xi32>>) {
336336
%c1_i32 = arith.constant 1 : i32
337337
%2 = fir.convert %c1_i32 : (i32) -> index
338338
%c1024_i32 = arith.constant 1024 : i32
@@ -371,7 +371,7 @@ func.func @_QPopenmp_target_data_region() {
371371
// CHECK: %[[VAL_UPPER:.*]] = llvm.mlir.constant(1023 : index) : i64
372372
// CHECK: %[[VAL_BOUNDS:.*]] = omp.map.bounds lower_bound(%[[VAL_ZERO]] : i64) upper_bound(%[[VAL_UPPER]] : i64) extent(%[[VAL_MAX]] : i64) stride(%[[VAL_ONE]] : i64) start_idx(%[[VAL_ONE]] : i64)
373373
// CHECK: %[[VAL_MAP:.*]] = omp.map.info var_ptr(%[[VAL_1]] : !llvm.ptr, !llvm.array<1024 x i32>) map_clauses(tofrom) capture(ByRef) bounds(%[[VAL_BOUNDS]]) -> !llvm.ptr {name = "a"}
374-
// CHECK: omp.target.data map_entries(%[[VAL_MAP]] : !llvm.ptr) {
374+
// CHECK: omp.target_data map_entries(%[[VAL_MAP]] : !llvm.ptr) {
375375
// CHECK: %[[VAL_4:.*]] = llvm.mlir.constant(1 : i32) : i32
376376
// CHECK: %[[VAL_5:.*]] = llvm.sext %[[VAL_4]] : i32 to i64
377377
// CHECK: %[[VAL_6:.*]] = llvm.mlir.constant(1024 : i32) : i32
@@ -413,13 +413,13 @@ func.func @_QPopenmp_target_data_region() {
413413

414414
func.func @_QPomp_target_data_empty() {
415415
%0 = fir.alloca !fir.array<1024xi32> {bindc_name = "a", uniq_name = "_QFomp_target_data_emptyEa"}
416-
omp.target.data use_device_addr(%0 : !fir.ref<!fir.array<1024xi32>>) {
416+
omp.target_data use_device_addr(%0 : !fir.ref<!fir.array<1024xi32>>) {
417417
}
418418
return
419419
}
420420

421421
// CHECK-LABEL: llvm.func @_QPomp_target_data_empty
422-
// CHECK: omp.target.data use_device_addr(%1 : !llvm.ptr) {
422+
// CHECK: omp.target_data use_device_addr(%1 : !llvm.ptr) {
423423
// CHECK: }
424424

425425
// -----

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,18 +191,18 @@ program main
191191
! ----------------------------------------------------------------------------
192192
! TARGET DATA
193193
! ----------------------------------------------------------------------------
194-
! CHECK: omp.target.data
194+
! CHECK: omp.target_data
195195
! CHECK-NOT: if({{.*}})
196196
! CHECK-SAME: {
197197
!$omp target data map(tofrom: i)
198198
!$omp end target data
199199

200-
! CHECK: omp.target.data
200+
! CHECK: omp.target_data
201201
! CHECK-SAME: if({{.*}})
202202
!$omp target data map(tofrom: i) if(.true.)
203203
!$omp end target data
204204

205-
! CHECK: omp.target.data
205+
! CHECK: omp.target_data
206206
! CHECK-SAME: if({{.*}})
207207
!$omp target data map(tofrom: i) if(target data: .true.)
208208
!$omp end target data

‎flang/test/Lower/OpenMP/FIR/target.f90

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ subroutine omp_target_data
237237
integer :: a(1024)
238238
!CHECK: %[[BOUNDS:.*]] = omp.map.bounds lower_bound({{.*}}) upper_bound({{.*}}) extent({{.*}}) stride({{.*}}) start_idx({{.*}})
239239
!CHECK: %[[MAP:.*]] = omp.map.info var_ptr(%[[VAL_0]] : !fir.ref<!fir.array<1024xi32>>, !fir.array<1024xi32>) map_clauses(tofrom) capture(ByRef) bounds(%[[BOUNDS]]) -> !fir.ref<!fir.array<1024xi32>> {name = "a"}
240-
!CHECK: omp.target.data map_entries(%[[MAP]] : !fir.ref<!fir.array<1024xi32>>) {
240+
!CHECK: omp.target_data map_entries(%[[MAP]] : !fir.ref<!fir.array<1024xi32>>) {
241241
!$omp target data map(tofrom: a)
242242
!CHECK: %[[VAL_1:.*]] = arith.constant 10 : i32
243243
!CHECK: %[[VAL_2:.*]] = arith.constant 1 : i64
@@ -259,14 +259,14 @@ subroutine omp_target_data_mt
259259
!CHECK: %[[VAR_B:.*]] = fir.alloca !fir.array<1024xi32> {bindc_name = "b", uniq_name = "_QFomp_target_data_mtEb"}
260260
!CHECK: %[[BOUNDS_A:.*]] = omp.map.bounds lower_bound({{.*}}) upper_bound({{.*}}) extent({{.*}}) stride({{.*}}) start_idx({{.*}})
261261
!CHECK: %[[MAP_A:.*]] = omp.map.info var_ptr(%[[VAR_A]] : !fir.ref<!fir.array<1024xi32>>, !fir.array<1024xi32>) map_clauses(tofrom) capture(ByRef) bounds(%[[BOUNDS_A]]) -> !fir.ref<!fir.array<1024xi32>> {name = "a"}
262-
!CHECK: omp.target.data map_entries(%[[MAP_A]] : !fir.ref<!fir.array<1024xi32>>) {
262+
!CHECK: omp.target_data map_entries(%[[MAP_A]] : !fir.ref<!fir.array<1024xi32>>) {
263263
!$omp target data map(a)
264264
!CHECK: omp.terminator
265265
!$omp end target data
266266
!CHECK: }
267267
!CHECK: %[[BOUNDS_B:.*]] = omp.map.bounds lower_bound({{.*}}) upper_bound({{.*}}) extent({{.*}}) stride({{.*}}) start_idx({{.*}})
268268
!CHECK: %[[MAP_B:.*]] = omp.map.info var_ptr(%[[VAR_B]] : !fir.ref<!fir.array<1024xi32>>, !fir.array<1024xi32>) map_clauses(always, from) capture(ByRef) bounds(%[[BOUNDS_B]]) -> !fir.ref<!fir.array<1024xi32>> {name = "b"}
269-
!CHECK: omp.target.data map_entries(%[[MAP_B]] : !fir.ref<!fir.array<1024xi32>>) {
269+
!CHECK: omp.target_data map_entries(%[[MAP_B]] : !fir.ref<!fir.array<1024xi32>>) {
270270
!$omp target data map(always, from : b)
271271
!CHECK: omp.terminator
272272
!$omp end target data
@@ -432,7 +432,7 @@ subroutine omp_target_device_ptr
432432
type(c_ptr) :: a
433433
integer, target :: b
434434
!CHECK: %[[MAP:.*]] = omp.map.info var_ptr({{.*}}) map_clauses(tofrom) capture(ByRef) -> {{.*}} {name = "a"}
435-
!CHECK: omp.target.data map_entries(%[[MAP]]{{.*}}
435+
!CHECK: omp.target_data map_entries(%[[MAP]]{{.*}}
436436
!$omp target data map(tofrom: a) use_device_ptr(a)
437437
!CHECK: ^bb0(%[[VAL_1:.*]]: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>):
438438
!CHECK: {{.*}} = fir.coordinate_of %[[VAL_1:.*]], {{.*}} : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, !fir.field) -> !fir.ref<i64>
@@ -452,7 +452,7 @@ subroutine omp_target_device_addr
452452
!CHECK: %[[VAL_0:.*]] = fir.alloca !fir.box<!fir.ptr<i32>> {bindc_name = "a", uniq_name = "_QFomp_target_device_addrEa"}
453453
!CHECK: %[[MAP_MEMBERS:.*]] = omp.map.info var_ptr({{.*}} : !fir.ref<!fir.box<!fir.ptr<i32>>>, i32) var_ptr_ptr({{.*}} : !fir.llvm_ptr<!fir.ref<i32>>) map_clauses(tofrom) capture(ByRef) -> !fir.llvm_ptr<!fir.ref<i32>> {name = ""}
454454
!CHECK: %[[MAP:.*]] = omp.map.info var_ptr({{.*}} : !fir.ref<!fir.box<!fir.ptr<i32>>>, !fir.box<!fir.ptr<i32>>) map_clauses(tofrom) capture(ByRef) members(%[[MAP_MEMBERS]] : !fir.llvm_ptr<!fir.ref<i32>>) -> !fir.ref<!fir.box<!fir.ptr<i32>>> {name = "a"}
455-
!CHECK: omp.target.data map_entries(%[[MAP_MEMBERS]], %[[MAP]] : {{.*}}) use_device_addr(%[[VAL_0]] : !fir.ref<!fir.box<!fir.ptr<i32>>>) {
455+
!CHECK: omp.target_data map_entries(%[[MAP_MEMBERS]], %[[MAP]] : {{.*}}) use_device_addr(%[[VAL_0]] : !fir.ref<!fir.box<!fir.ptr<i32>>>) {
456456
!$omp target data map(tofrom: a) use_device_addr(a)
457457
!CHECK: ^bb0(%[[VAL_1:.*]]: !fir.ref<!fir.box<!fir.ptr<i32>>>):
458458
!CHECK: {{.*}} = fir.load %[[VAL_1]] : !fir.ref<!fir.box<!fir.ptr<i32>>>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,18 +191,18 @@ program main
191191
! ----------------------------------------------------------------------------
192192
! TARGET DATA
193193
! ----------------------------------------------------------------------------
194-
! CHECK: omp.target.data
194+
! CHECK: omp.target_data
195195
! CHECK-NOT: if({{.*}})
196196
! CHECK-SAME: {
197197
!$omp target data map(tofrom: i)
198198
!$omp end target data
199199

200-
! CHECK: omp.target.data
200+
! CHECK: omp.target_data
201201
! CHECK-SAME: if({{.*}})
202202
!$omp target data map(tofrom: i) if(.true.)
203203
!$omp end target data
204204

205-
! CHECK: omp.target.data
205+
! CHECK: omp.target_data
206206
! CHECK-SAME: if({{.*}})
207207
!$omp target data map(tofrom: i) if(target data: .true.)
208208
!$omp end target data

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ subroutine omp_target_data
292292
integer :: a(1024)
293293
!CHECK: %[[BOUNDS:.*]] = omp.map.bounds lower_bound({{.*}}) upper_bound({{.*}}) extent({{.*}}) stride({{.*}}) start_idx({{.*}})
294294
!CHECK: %[[MAP:.*]] = omp.map.info var_ptr(%[[A_DECL]]#0 : !fir.ref<!fir.array<1024xi32>>, !fir.array<1024xi32>) map_clauses(tofrom) capture(ByRef) bounds(%[[BOUNDS]]) -> !fir.ref<!fir.array<1024xi32>> {name = "a"}
295-
!CHECK: omp.target.data map_entries(%[[MAP]] : !fir.ref<!fir.array<1024xi32>>) {
295+
!CHECK: omp.target_data map_entries(%[[MAP]] : !fir.ref<!fir.array<1024xi32>>) {
296296
!$omp target data map(tofrom: a)
297297
!CHECK: %[[C10:.*]] = arith.constant 10 : i32
298298
!CHECK: %[[C1:.*]] = arith.constant 1 : index
@@ -314,14 +314,14 @@ subroutine omp_target_data_mt
314314
!CHECK: %[[VAR_B_DECL:.*]]:2 = hlfir.declare %[[VAR_B]](%{{.*}}) {uniq_name = "_QFomp_target_data_mtEb"} : (!fir.ref<!fir.array<1024xi32>>, !fir.shape<1>) -> (!fir.ref<!fir.array<1024xi32>>, !fir.ref<!fir.array<1024xi32>>)
315315
!CHECK: %[[BOUNDS_A:.*]] = omp.map.bounds lower_bound({{.*}}) upper_bound({{.*}}) extent({{.*}}) stride({{.*}}) start_idx({{.*}})
316316
!CHECK: %[[MAP_A:.*]] = omp.map.info var_ptr(%[[VAR_A_DECL]]#0 : !fir.ref<!fir.array<1024xi32>>, !fir.array<1024xi32>) map_clauses(tofrom) capture(ByRef) bounds(%[[BOUNDS_A]]) -> !fir.ref<!fir.array<1024xi32>> {name = "a"}
317-
!CHECK: omp.target.data map_entries(%[[MAP_A]] : !fir.ref<!fir.array<1024xi32>>) {
317+
!CHECK: omp.target_data map_entries(%[[MAP_A]] : !fir.ref<!fir.array<1024xi32>>) {
318318
!$omp target data map(a)
319319
!CHECK: omp.terminator
320320
!$omp end target data
321321
!CHECK: }
322322
!CHECK: %[[BOUNDS_B:.*]] = omp.map.bounds lower_bound({{.*}}) upper_bound({{.*}}) extent({{.*}}) stride({{.*}}) start_idx({{.*}})
323323
!CHECK: %[[MAP_B:.*]] = omp.map.info var_ptr(%[[VAR_B_DECL]]#0 : !fir.ref<!fir.array<1024xi32>>, !fir.array<1024xi32>) map_clauses(always, from) capture(ByRef) bounds(%[[BOUNDS_B]]) -> !fir.ref<!fir.array<1024xi32>> {name = "b"}
324-
!CHECK: omp.target.data map_entries(%[[MAP_B]] : !fir.ref<!fir.array<1024xi32>>) {
324+
!CHECK: omp.target_data map_entries(%[[MAP_B]] : !fir.ref<!fir.array<1024xi32>>) {
325325
!$omp target data map(always, from : b)
326326
!CHECK: omp.terminator
327327
!$omp end target data
@@ -511,7 +511,7 @@ subroutine omp_target_device_ptr
511511
type(c_ptr) :: a
512512
integer, target :: b
513513
!CHECK: %[[MAP:.*]] = omp.map.info var_ptr({{.*}}) map_clauses(tofrom) capture(ByRef) -> {{.*}} {name = "a"}
514-
!CHECK: omp.target.data map_entries(%[[MAP]]{{.*}}
514+
!CHECK: omp.target_data map_entries(%[[MAP]]{{.*}}
515515
!$omp target data map(tofrom: a) use_device_ptr(a)
516516
!CHECK: ^bb0(%[[VAL_1:.*]]: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>):
517517
!CHECK: {{.*}} = fir.coordinate_of %[[VAL_1:.*]], {{.*}} : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, !fir.field) -> !fir.ref<i64>
@@ -532,7 +532,7 @@ subroutine omp_target_device_addr
532532
!CHECK: %[[VAL_0_DECL:.*]]:2 = hlfir.declare %0 {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFomp_target_device_addrEa"} : (!fir.ref<!fir.box<!fir.ptr<i32>>>) -> (!fir.ref<!fir.box<!fir.ptr<i32>>>, !fir.ref<!fir.box<!fir.ptr<i32>>>)
533533
!CHECK: %[[MAP_MEMBERS:.*]] = omp.map.info var_ptr({{.*}} : !fir.ref<!fir.box<!fir.ptr<i32>>>, i32) var_ptr_ptr({{.*}} : !fir.llvm_ptr<!fir.ref<i32>>) map_clauses(tofrom) capture(ByRef) -> !fir.llvm_ptr<!fir.ref<i32>> {name = ""}
534534
!CHECK: %[[MAP:.*]] = omp.map.info var_ptr({{.*}} : !fir.ref<!fir.box<!fir.ptr<i32>>>, !fir.box<!fir.ptr<i32>>) map_clauses(tofrom) capture(ByRef) members(%[[MAP_MEMBERS]] : !fir.llvm_ptr<!fir.ref<i32>>) -> !fir.ref<!fir.box<!fir.ptr<i32>>> {name = "a"}
535-
!CHECK: omp.target.data map_entries(%[[MAP_MEMBERS]], %[[MAP]] : {{.*}}) use_device_addr(%[[VAL_0_DECL]]#1 : !fir.ref<!fir.box<!fir.ptr<i32>>>) {
535+
!CHECK: omp.target_data map_entries(%[[MAP_MEMBERS]], %[[MAP]] : {{.*}}) use_device_addr(%[[VAL_0_DECL]]#1 : !fir.ref<!fir.box<!fir.ptr<i32>>>) {
536536
!$omp target data map(tofrom: a) use_device_addr(a)
537537
!CHECK: ^bb0(%[[VAL_1:.*]]: !fir.ref<!fir.box<!fir.ptr<i32>>>):
538538
!CHECK: %[[VAL_1_DECL:.*]]:2 = hlfir.declare %[[VAL_1]] {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFomp_target_device_addrEa"} : (!fir.ref<!fir.box<!fir.ptr<i32>>>) -> (!fir.ref<!fir.box<!fir.ptr<i32>>>, !fir.ref<!fir.box<!fir.ptr<i32>>>)
@@ -554,7 +554,7 @@ end subroutine omp_target_device_addr
554554
subroutine sb
555555
integer :: i = 1
556556
integer :: j = 11
557-
!CHECK: omp.target.data map_entries(%{{.*}}, %{{.*}} : !fir.ref<i32>, !fir.ref<i32>)
557+
!CHECK: omp.target_data map_entries(%{{.*}}, %{{.*}} : !fir.ref<i32>, !fir.ref<i32>)
558558
!$omp target data map(tofrom: i, j)
559559
j = j - 1
560560
!CHECK: %[[J_VAL:.*]] = arith.subi

‎flang/test/Lower/OpenMP/use-device-ptr-to-use-device-addr.f90

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
! functionality
88

99
!CHECK: func.func @{{.*}}only_use_device_ptr()
10-
!CHECK: omp.target.data use_device_ptr(%{{.*}} : !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) use_device_addr(%{{.*}}, %{{.*}} : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) {
10+
!CHECK: omp.target_data use_device_ptr(%{{.*}} : !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) use_device_addr(%{{.*}}, %{{.*}} : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) {
1111
!CHECK: ^bb0(%{{.*}}: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, %{{.*}}: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, %{{.*}}: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>):
1212
subroutine only_use_device_ptr
1313
use iso_c_binding
@@ -20,7 +20,7 @@ subroutine only_use_device_ptr
2020
end subroutine
2121

2222
!CHECK: func.func @{{.*}}mix_use_device_ptr_and_addr()
23-
!CHECK: omp.target.data use_device_ptr({{.*}} : !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) use_device_addr(%{{.*}}, %{{.*}} : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>) {
23+
!CHECK: omp.target_data use_device_ptr({{.*}} : !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) use_device_addr(%{{.*}}, %{{.*}} : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>) {
2424
!CHECK: ^bb0(%{{.*}}: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, %{{.*}}: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, %{{.*}}: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>):
2525
subroutine mix_use_device_ptr_and_addr
2626
use iso_c_binding
@@ -33,7 +33,7 @@ subroutine mix_use_device_ptr_and_addr
3333
end subroutine
3434

3535
!CHECK: func.func @{{.*}}only_use_device_addr()
36-
!CHECK: omp.target.data use_device_addr(%{{.*}}, %{{.*}}, %{{.*}} : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) {
36+
!CHECK: omp.target_data use_device_addr(%{{.*}}, %{{.*}}, %{{.*}} : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) {
3737
!CHECK: ^bb0(%{{.*}}: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, %{{.*}}: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, %{{.*}}: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>):
3838
subroutine only_use_device_addr
3939
use iso_c_binding
@@ -46,7 +46,7 @@ subroutine only_use_device_addr
4646
end subroutine
4747

4848
!CHECK: func.func @{{.*}}mix_use_device_ptr_and_addr_and_map()
49-
!CHECK: omp.target.data map_entries(%{{.*}}, %{{.*}} : !fir.ref<i32>, !fir.ref<i32>) use_device_ptr(%{{.*}} : !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) use_device_addr(%{{.*}}, %{{.*}} : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>) {
49+
!CHECK: omp.target_data map_entries(%{{.*}}, %{{.*}} : !fir.ref<i32>, !fir.ref<i32>) use_device_ptr(%{{.*}} : !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) use_device_addr(%{{.*}}, %{{.*}} : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>) {
5050
!CHECK: ^bb0(%{{.*}}: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, %{{.*}}: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, %{{.*}}: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>):
5151
subroutine mix_use_device_ptr_and_addr_and_map
5252
use iso_c_binding
@@ -60,7 +60,7 @@ subroutine mix_use_device_ptr_and_addr_and_map
6060
end subroutine
6161

6262
!CHECK: func.func @{{.*}}only_use_map()
63-
!CHECK: omp.target.data map_entries(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}} : !fir.llvm_ptr<!fir.ref<!fir.array<?xf32>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, !fir.llvm_ptr<!fir.ref<!fir.array<?xi32>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) {
63+
!CHECK: omp.target_data map_entries(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}} : !fir.llvm_ptr<!fir.ref<!fir.array<?xf32>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>, !fir.llvm_ptr<!fir.ref<!fir.array<?xi32>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) {
6464
subroutine only_use_map
6565
use iso_c_binding
6666
integer, pointer, dimension(:) :: array

‎mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -625,9 +625,9 @@ def WsloopOp : OpenMP_Op<"wsloop", [AttrSizedOperandSegments,
625625
|`byref` $byref
626626
|`ordered` `(` $ordered_val `)`
627627
|`order` `(` custom<ClauseAttr>($order_val) `)`
628-
) custom<Wsloop>($region, $lowerBound, $upperBound, $step,
629-
type($step), $reduction_vars, type($reduction_vars), $reductions,
630-
$inclusive) attr-dict
628+
) custom<Wsloop>($region, $lowerBound, $upperBound, $step, type($step),
629+
$reduction_vars, type($reduction_vars), $reductions,
630+
$inclusive) attr-dict
631631
}];
632632
let hasVerifier = 1;
633633
}
@@ -1391,7 +1391,7 @@ def MapInfoOp : OpenMP_Op<"map.info", [AttrSizedOperandSegments]> {
13911391
// 2.14.2 target data Construct
13921392
//===---------------------------------------------------------------------===//
13931393

1394-
def TargetDataOp: OpenMP_Op<"target.data", [AttrSizedOperandSegments,
1394+
def TargetDataOp: OpenMP_Op<"target_data", [AttrSizedOperandSegments,
13951395
MapClauseOwningOpInterface]>{
13961396
let summary = "target data construct";
13971397
let description = [{

0 commit comments

Comments
 (0)