diff --git a/flang/lib/Optimizer/Transforms/CUFOpConversion.cpp b/flang/lib/Optimizer/Transforms/CUFOpConversion.cpp index 9de20f0f0d45e..17699dadc7511 100644 --- a/flang/lib/Optimizer/Transforms/CUFOpConversion.cpp +++ b/flang/lib/Optimizer/Transforms/CUFOpConversion.cpp @@ -654,7 +654,7 @@ struct CUFDataTransferOpConversion loc, builder); } auto materializeBoxIfNeeded = [&](mlir::Value val) -> mlir::Value { - if (mlir::isa(val.getDefiningOp())) { + if (mlir::isa(val.getDefiningOp())) { // Materialize the box to memory to be able to call the runtime. mlir::Value box = builder.createTemporary(loc, val.getType()); builder.create(loc, val, box); diff --git a/flang/test/Fir/CUDA/cuda-data-transfer.fir b/flang/test/Fir/CUDA/cuda-data-transfer.fir index 1ee44f3c6d97c..5f10dc0562d17 100644 --- a/flang/test/Fir/CUDA/cuda-data-transfer.fir +++ b/flang/test/Fir/CUDA/cuda-data-transfer.fir @@ -466,4 +466,51 @@ func.func @_QPlogical_cst() { // CHECK: %[[BOX_NONE:.*]] = fir.convert %[[DESC]] : (!fir.ref>>) -> !fir.ref> // CHECK: fir.call @_FortranACUFDataTransferCstDesc(%{{.*}}, %[[BOX_NONE]], %{{.*}}, %{{.*}}, %{{.*}}) : (!fir.ref>, !fir.ref>, i32, !fir.ref, i32) -> none +func.func @_QPcallkernel(%arg0: !fir.box>> {fir.bindc_name = "a"}, %arg1: !fir.ref {fir.bindc_name = "b"}, %arg2: !fir.ref {fir.bindc_name = "c"}) { + %c0_i64 = arith.constant 0 : i64 + %c1_i32 = arith.constant 1 : i32 + %c0_i32 = arith.constant 0 : i32 + %c1 = arith.constant 1 : index + %c0 = arith.constant 0 : index + %0 = fir.dummy_scope : !fir.dscope + %1 = fir.declare %arg0 dummy_scope %0 {uniq_name = "_QFcallkernelEa"} : (!fir.box>>, !fir.dscope) -> !fir.box>> + %2 = fir.rebox %1 : (!fir.box>>) -> !fir.box>> + %3 = cuf.alloc !fir.box>>> {bindc_name = "adev", data_attr = #cuf.cuda, uniq_name = "_QFcallkernelEadev"} -> !fir.ref>>>> + %7 = fir.declare %3 {data_attr = #cuf.cuda, fortran_attrs = #fir.var_attrs, uniq_name = "_QFcallkernelEadev"} : (!fir.ref>>>>) -> !fir.ref>>>> + %8 = fir.declare %arg1 dummy_scope %0 {uniq_name = "_QFcallkernelEb"} : (!fir.ref, !fir.dscope) -> !fir.ref + %9 = fir.declare %arg2 dummy_scope %0 {uniq_name = "_QFcallkernelEc"} : (!fir.ref, !fir.dscope) -> !fir.ref + %10 = fir.alloca i32 {bindc_name = "m", uniq_name = "_QFcallkernelEm"} + %11 = fir.declare %10 {uniq_name = "_QFcallkernelEm"} : (!fir.ref) -> !fir.ref + %12 = fir.alloca i32 {bindc_name = "n", uniq_name = "_QFcallkernelEn"} + %13 = fir.declare %12 {uniq_name = "_QFcallkernelEn"} : (!fir.ref) -> !fir.ref + %14:3 = fir.box_dims %2, %c0 : (!fir.box>>, index) -> (index, index, index) + %15 = fir.convert %14#1 : (index) -> i32 + fir.store %15 to %13 : !fir.ref + %16:3 = fir.box_dims %2, %c1 : (!fir.box>>, index) -> (index, index, index) + %27 = fir.load %13 : !fir.ref + %28 = fir.convert %27 : (i32) -> index + %29 = arith.cmpi sgt, %28, %c0 : index + %30 = arith.select %29, %28, %c0 : index + %31 = fir.load %11 : !fir.ref + %32 = fir.convert %31 : (i32) -> index + %33 = arith.cmpi sgt, %32, %c0 : index + %34 = arith.select %33, %32, %c0 : index + %35 = fir.shape %30, %34 : (index, index) -> !fir.shape<2> + %36 = fir.undefined index + %37 = fir.slice %c1, %28, %c1, %c1, %32, %c1 : (index, index, index, index, index, index) -> !fir.slice<2> + %38 = fir.rebox %2 [%37] : (!fir.box>>, !fir.slice<2>) -> !fir.box>> + cuf.data_transfer %38 to %7 {transfer_kind = #cuf.cuda_transfer} : !fir.box>>, !fir.ref>>>> + return +} + +// CHECK-LABEL: func.func @_QPcallkernel( +// CHECK-SAME: %[[ARG0:.*]]: !fir.box>> {fir.bindc_name = "a"} +// CHECK: %[[ALLOCA:.*]] = fir.alloca !fir.box>> +// CHECK: %[[DECL_ARG0:.*]] = fir.declare %[[ARG0]] dummy_scope %{{.*}} {uniq_name = "_QFcallkernelEa"} : (!fir.box>>, !fir.dscope) -> !fir.box>> +// CHECK: %[[REBOX0:.*]] = fir.rebox %[[DECL_ARG0]] : (!fir.box>>) -> !fir.box>> +// CHECK: %[[REBOX1:.*]] = fir.rebox %[[REBOX0]] [%{{.*}}] : (!fir.box>>, !fir.slice<2>) -> !fir.box>> +// CHECK: fir.store %[[REBOX1]] to %[[ALLOCA]] : !fir.ref>>> +// CHECK: %[[BOX_NONE:.*]] = fir.convert %[[ALLOCA]] : (!fir.ref>>>) -> !fir.ref> +// CHECK: fir.call @_FortranACUFDataTransferDescDesc(%{{.*}}, %[[BOX_NONE]], %{{.*}}, %{{.*}}, %{{.*}}) : (!fir.ref>, !fir.ref>, i32, !fir.ref, i32) -> none + } // end of module