diff --git a/flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp b/flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp --- a/flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp +++ b/flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp @@ -691,6 +691,38 @@ } }; +class TransposeOpConversion + : public HlfirIntrinsicConversion { + using HlfirIntrinsicConversion::HlfirIntrinsicConversion; + + mlir::LogicalResult + matchAndRewrite(hlfir::TransposeOp transpose, OpAdaptor adaptor, + mlir::ConversionPatternRewriter &rewriter) const override { + fir::KindMapping kindMapping{rewriter.getContext()}; + fir::FirOpBuilder builder{rewriter, kindMapping}; + const mlir::Location &loc = transpose->getLoc(); + HLFIRListener listener{builder, rewriter}; + builder.setListener(&listener); + + mlir::Value arg = transpose.getArray(); + llvm::SmallVector inArgs; + inArgs.push_back({arg, arg.getType()}); + + auto *argLowering = fir::getIntrinsicArgumentLowering("transpose"); + llvm::SmallVector args = + lowerArguments(transpose, inArgs, rewriter, argLowering); + + mlir::Type scalarResultType = + hlfir::getFortranElementType(transpose.getType()); + + auto [resultExv, mustBeFreed] = fir::genIntrinsicCall( + builder, loc, "transpose", scalarResultType, args); + + processReturnValue(transpose, resultExv, mustBeFreed, builder, rewriter); + return mlir::success(); + } +}; + class BufferizeHLFIR : public hlfir::impl::BufferizeHLFIRBase { public: void runOnOperation() override { @@ -704,11 +736,13 @@ auto module = this->getOperation(); auto *context = &getContext(); mlir::RewritePatternSet patterns(context); - patterns.insert< - ApplyOpConversion, AsExprOpConversion, AssignOpConversion, - AssociateOpConversion, ConcatOpConversion, DestroyOpConversion, - ElementalOpConversion, EndAssociateOpConversion, MatmulOpConversion, - NoReassocOpConversion, SetLengthOpConversion, SumOpConversion>(context); + patterns + .insert( + context); mlir::ConversionTarget target(*context); target.addIllegalOp> {fir.bindc_name = "m"}, %arg1: !fir.ref> {fir.bindc_name = "res"}) { + %c1 = arith.constant 1 : index + %c2 = arith.constant 2 : index + %0 = fir.shape %c1, %c2 : (index, index) -> !fir.shape<2> + %1:2 = hlfir.declare %arg0(%0) {uniq_name = "_QFtranspose1Em"} : (!fir.ref>, !fir.shape<2>) -> (!fir.ref>, !fir.ref>) + %c2_0 = arith.constant 2 : index + %c1_1 = arith.constant 1 : index + %2 = fir.shape %c2_0, %c1_1 : (index, index) -> !fir.shape<2> + %3:2 = hlfir.declare %arg1(%2) {uniq_name = "_QFtranspose1Eres"} : (!fir.ref>, !fir.shape<2>) -> (!fir.ref>, !fir.ref>) + %4 = hlfir.transpose %1#0 : (!fir.ref>) -> !hlfir.expr<2x1xi32> + hlfir.assign %4 to %3#0 : !hlfir.expr<2x1xi32>, !fir.ref> + hlfir.destroy %4 : !hlfir.expr<2x1xi32> + return +} +// CHECK-LABEL: func.func @_QPtranspose1( +// CHECK: %[[ARG0:.*]]: !fir.ref> {fir.bindc_name = "m"} +// CHECK: %[[ARG1:.*]]: !fir.ref> {fir.bindc_name = "res"} +// CHECK-DAG: %[[M_VAR:.*]]:2 = hlfir.declare %[[ARG0]] +// CHECK-DAG: %[[RES_VAR:.*]]:2 = hlfir.declare %[[ARG1]] + +// CHECK-DAG: %[[RET_BOX:.*]] = fir.alloca !fir.box>> +// CHECK-DAG: %[[RET_ADDR:.*]] = fir.zero_bits !fir.heap> +// CHECK-DAG: %[[C0:.*]] = arith.constant 0 : index +// CHECK-DAG: %[[RET_SHAPE:.*]] = fir.shape %[[C0]], %[[C0]] : (index, index) -> !fir.shape<2> +// CHECK-DAG: %[[RET_EMBOX:.*]] = fir.embox %[[RET_ADDR]](%[[RET_SHAPE]]) +// CHECK-DAG: fir.store %[[RET_EMBOX]] to %[[RET_BOX]] + +// CHECK-DAG: %[[M_BOX:.*]] = fir.embox %[[M_VAR]]#1(%[[M_SHAPE:.*]]) + +// CHECK: %[[RET_ARG:.*]] = fir.convert %[[RET_BOX]] : (!fir.ref>>>) +// CHECK: %[[M_ARG:.*]] = fir.convert %[[M_BOX]] : (!fir.box>) -> !fir.box +// CHECK: %[[NONE:.*]] = fir.call @_FortranATranspose(%[[RET_ARG]], %[[M_ARG]], %[[LOC_STR:.*]], %[[LOC_N:.*]]) + +// CHECK: %[[RET:.*]] = fir.load %[[RET_BOX]] +// CHECK-DAG: %[[BOX_DIMS:.*]]:3 = fir.box_dims %[[RET]] +// CHECK-DAG: %[[ADDR:.*]] = fir.box_addr %[[RET]] +// CHECK-NEXT: %[[SHIFT:.*]] = fir.shape_shift %[[BOX_DIMS]]#0, %[[BOX_DIMS]]#1 +// TODO: fix alias analysis in hlfir.assign bufferization +// CHECK-NEXT: %[[TMP:.*]]:2 = hlfir.declare %[[ADDR]](%[[SHIFT]]) {uniq_name = ".tmp.intrinsic_result"} +// CHECK: %[[TUPLE0:.*]] = fir.undefined tuple>, i1> +// CHECK: %[[TUPLE1:.*]] = fir.insert_value %[[TUPLE0]], %[[TRUE:.*]], [1 : index] +// CHECK: %[[TUPLE2:.*]] = fir.insert_value %[[TUPLE1]], %[[TMP]]#0, [0 : index] +// CHECK: hlfir.assign %[[TMP]]#0 to %[[RES_VAR]]#0 +// CHECK: fir.freemem %[[TMP]]#1 +// CHECK-NEXT: return +// CHECK-NEXT: }