From e525245fba629632db4d026f2cac29f032f02320 Mon Sep 17 00:00:00 2001 From: Kiran Chandramohan Date: Thu, 17 Mar 2022 13:05:16 +0000 Subject: [PATCH] [Flang] Lower the transpose intrinsic Tranpose intrinsic performs the transpose matrix operation for arrays of rank 2. The intrinsic is lowered to a runtime call. This is part of the upstreaming effort from the fir-dev branch in [1]. [1] https://github.com/flang-compiler/f18-llvm-project Reviewed By: clementval Differential Revision: https://reviews.llvm.org/D121895 Co-authored-by: Valentin Clement Co-authored-by: Jean Perier --- flang/lib/Lower/IntrinsicCall.cpp | 31 +++++++++++++++++++++++ flang/test/Lower/Intrinsics/transpose.f90 | 24 ++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 flang/test/Lower/Intrinsics/transpose.f90 diff --git a/flang/lib/Lower/IntrinsicCall.cpp b/flang/lib/Lower/IntrinsicCall.cpp index d4fbf554c2de..669878cfab1d 100644 --- a/flang/lib/Lower/IntrinsicCall.cpp +++ b/flang/lib/Lower/IntrinsicCall.cpp @@ -505,6 +505,8 @@ struct IntrinsicLibrary { void genSystemClock(llvm::ArrayRef); fir::ExtendedValue genTransfer(mlir::Type, llvm::ArrayRef); + fir::ExtendedValue genTranspose(mlir::Type, + llvm::ArrayRef); fir::ExtendedValue genTrim(mlir::Type, llvm::ArrayRef); fir::ExtendedValue genUbound(mlir::Type, llvm::ArrayRef); fir::ExtendedValue genUnpack(mlir::Type, llvm::ArrayRef); @@ -805,6 +807,10 @@ static constexpr IntrinsicHandler handlers[]{ &I::genTransfer, {{{"source", asAddr}, {"mold", asAddr}, {"size", asValue}}}, /*isElemental=*/false}, + {"transpose", + &I::genTranspose, + {{{"matrix", asAddr}}}, + /*isElemental=*/false}, {"trim", &I::genTrim, {{{"string", asAddr}}}, /*isElemental=*/false}, {"ubound", &I::genUbound, @@ -3063,6 +3069,30 @@ IntrinsicLibrary::genUbound(mlir::Type resultType, return mlir::Value(); } +// TRANSPOSE +fir::ExtendedValue +IntrinsicLibrary::genTranspose(mlir::Type resultType, + llvm::ArrayRef args) { + + assert(args.size() == 1); + + // Handle source argument + mlir::Value source = builder.createBox(loc, args[0]); + + // Create mutable fir.box to be passed to the runtime for the result. + mlir::Type resultArrayType = builder.getVarLenSeqTy(resultType, 2); + fir::MutableBoxValue resultMutableBox = + fir::factory::createTempMutableBox(builder, loc, resultArrayType); + mlir::Value resultIrBox = + fir::factory::getMutableIRBox(builder, loc, resultMutableBox); + // Call runtime. The runtime is allocating the result. + fir::runtime::genTranspose(builder, loc, resultIrBox, source); + // Read result from mutable fir.box and add it to the list of temps to be + // finalized by the StatementContext. + return readAndAddCleanUp(resultMutableBox, resultType, + "unexpected result for TRANSPOSE"); +} + // TRIM fir::ExtendedValue IntrinsicLibrary::genTrim(mlir::Type resultType, @@ -3080,6 +3110,7 @@ IntrinsicLibrary::genTrim(mlir::Type resultType, // finalized by the StatementContext. return readAndAddCleanUp(resultMutableBox, resultType, "TRIM"); } + // UNPACK fir::ExtendedValue IntrinsicLibrary::genUnpack(mlir::Type resultType, diff --git a/flang/test/Lower/Intrinsics/transpose.f90 b/flang/test/Lower/Intrinsics/transpose.f90 new file mode 100644 index 000000000000..62bea3964898 --- /dev/null +++ b/flang/test/Lower/Intrinsics/transpose.f90 @@ -0,0 +1,24 @@ +! RUN: bbc -emit-fir %s -o - | FileCheck %s + +! CHECK-LABEL: func @_QPtranspose_test( +! CHECK-SAME: %[[source:.*]]: !fir.ref>{{.*}}) { +subroutine transpose_test(mat) +! CHECK: %[[resultDescr:.*]] = fir.alloca !fir.box>> + real :: mat(2,3) + call bar_transpose_test(transpose(mat)) +! CHECK: %[[sourceBox:.*]] = fir.embox %[[source]]({{.*}}) : (!fir.ref>, !fir.shape<2>) -> !fir.box> +! CHECK: %[[zeroArray:.*]] = fir.zero_bits !fir.heap +! CHECK: %[[c0:.*]] = arith.constant 0 : index +! CHECK: %[[shapeResult:.*]] = fir.shape %[[c0]], %[[c0]] : (index, index) -> !fir.shape<2> +! CHECK: %[[resultBox:.*]] = fir.embox %[[zeroArray]](%[[shapeResult]]) : (!fir.heap>, !fir.shape<2>) -> !fir.box>> +! CHECK: fir.store %[[resultBox]] to %[[resultDescr]] : !fir.ref>>> +! CHECK: %[[resultOpaque:.*]] = fir.convert %[[resultDescr]] : (!fir.ref>>>) -> !fir.ref> +! CHECK: %[[sourceOpaque:.*]] = fir.convert %[[sourceBox]] : (!fir.box>) -> !fir.box +! CHECK: %{{.*}} = fir.call @_FortranATranspose(%[[resultOpaque]], %[[sourceOpaque]], %{{.*}}, %{{.*}}) : (!fir.ref>, !fir.box, !fir.ref, i32) -> none +! CHECK: %[[tmp1:.*]] = fir.load %[[resultDescr]] : !fir.ref>>> +! CHECK: %[[tmp2:.*]] = fir.box_addr %[[tmp1]] : (!fir.box>>) -> !fir.heap> +! CHECK: %[[tmp3:.*]] = fir.convert %[[tmp2]] : (!fir.heap>) -> !fir.ref> +! CHECK: fir.call @_QPbar_transpose_test(%[[tmp3]]) : (!fir.ref>) -> () +! CHECK: fir.freemem %[[tmp2]] : +end subroutine +