Skip to content

Commit 853d52b

Browse files
authored
[flang][cuda] Support derived type in cuf.data_transfer conversion (#115557)
Support derived type in `cuf.data_transfer` conversion by computing their size in bytes.
1 parent 3431d13 commit 853d52b

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
lines changed

flang/lib/Optimizer/Transforms/CUFOpConversion.cpp

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,11 @@ struct CUFDataTransferOpConversion
507507
using OpRewritePattern::OpRewritePattern;
508508

509509
CUFDataTransferOpConversion(mlir::MLIRContext *context,
510-
const mlir::SymbolTable &symtab)
511-
: OpRewritePattern(context), symtab{symtab} {}
510+
const mlir::SymbolTable &symtab,
511+
mlir::DataLayout *dl,
512+
const fir::LLVMTypeConverter *typeConverter)
513+
: OpRewritePattern(context), symtab{symtab}, dl{dl},
514+
typeConverter{typeConverter} {}
512515

513516
mlir::LogicalResult
514517
matchAndRewrite(cuf::DataTransferOp op,
@@ -576,7 +579,13 @@ struct CUFDataTransferOpConversion
576579
nbElement = builder.createIntegerConstant(
577580
loc, i64Ty, seqTy.getConstantArraySize());
578581
}
579-
int width = computeWidth(loc, dstTy, kindMap);
582+
unsigned width = 0;
583+
if (fir::isa_derived(dstTy)) {
584+
mlir::Type structTy = typeConverter->convertType(dstTy);
585+
width = dl->getTypeSizeInBits(structTy) / 8;
586+
} else {
587+
width = computeWidth(loc, dstTy, kindMap);
588+
}
580589
mlir::Value widthValue = rewriter.create<mlir::arith::ConstantOp>(
581590
loc, i64Ty, rewriter.getIntegerAttr(i64Ty, width));
582591
mlir::Value bytes =
@@ -647,6 +656,8 @@ struct CUFDataTransferOpConversion
647656

648657
private:
649658
const mlir::SymbolTable &symtab;
659+
mlir::DataLayout *dl;
660+
const fir::LLVMTypeConverter *typeConverter;
650661
};
651662

652663
struct CUFLaunchOpConversion
@@ -749,6 +760,7 @@ void cuf::populateCUFToFIRConversionPatterns(
749760
patterns.insert<CUFAllocOpConversion>(patterns.getContext(), &dl, &converter);
750761
patterns.insert<CUFAllocateOpConversion, CUFDeallocateOpConversion,
751762
CUFFreeOpConversion>(patterns.getContext());
752-
patterns.insert<CUFDataTransferOpConversion, CUFLaunchOpConversion>(
753-
patterns.getContext(), symtab);
763+
patterns.insert<CUFDataTransferOpConversion>(patterns.getContext(), symtab,
764+
&dl, &converter);
765+
patterns.insert<CUFLaunchOpConversion>(patterns.getContext(), symtab);
754766
}

flang/test/Fir/CUDA/cuda-data-transfer.fir

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,4 +295,17 @@ func.func @_QPscalar_to_array() {
295295
// CHECK-LABEL: func.func @_QPscalar_to_array()
296296
// CHECK: _FortranACUFDataTransferDescDescNoRealloc
297297

298+
func.func @_QPtest_type() {
299+
%0 = cuf.alloc !fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}> {bindc_name = "a", data_attr = #cuf.cuda<device>, uniq_name = "_QFtest_typeEa"} -> !fir.ref<!fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}>>
300+
%1 = fir.declare %0 {data_attr = #cuf.cuda<device>, uniq_name = "_QFtest_typeEa"} : (!fir.ref<!fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}>>) -> !fir.ref<!fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}>>
301+
%2 = fir.alloca !fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}> {bindc_name = "b", uniq_name = "_QFtest_typeEb"}
302+
%3 = fir.declare %2 {uniq_name = "_QFtest_typeEb"} : (!fir.ref<!fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}>>) -> !fir.ref<!fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}>>
303+
cuf.data_transfer %3 to %1 {transfer_kind = #cuf.cuda_transfer<host_device>} : !fir.ref<!fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}>>, !fir.ref<!fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}>>
304+
cuf.free %1 : !fir.ref<!fir.type<_QMbarTcmplx{id:i32,c:complex<f32>}>> {data_attr = #cuf.cuda<device>}
305+
return
306+
}
307+
308+
// CHECK-LABEL: func.func @_QPtest_type()
309+
// CHECK: fir.call @_FortranACUFDataTransferPtrPtr(%{{.*}}, %{{.*}}, %c12{{.*}}, %c0{{.*}}, %{{.*}}, %{{.*}}) : (!fir.llvm_ptr<i8>, !fir.llvm_ptr<i8>, i64, i32, !fir.ref<i8>, i32) -> none
310+
298311
} // end of module

0 commit comments

Comments
 (0)