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 @@ -177,6 +177,26 @@ } }; +struct ApplyOpConversion : public mlir::OpConversionPattern { + using mlir::OpConversionPattern::OpConversionPattern; + explicit ApplyOpConversion(mlir::MLIRContext *ctx) + : mlir::OpConversionPattern{ctx} {} + mlir::LogicalResult + matchAndRewrite(hlfir::ApplyOp apply, OpAdaptor adaptor, + mlir::ConversionPatternRewriter &rewriter) const override { + mlir::Location loc = apply->getLoc(); + hlfir::Entity bufferizedExpr{getBufferizedExprStorage(adaptor.getExpr())}; + mlir::Type resultType = hlfir::getVariableElementType(bufferizedExpr); + mlir::Value result = rewriter.create( + loc, resultType, bufferizedExpr, adaptor.getIndices(), + adaptor.getTypeparams()); + if (fir::isa_trivial(apply.getType())) + result = rewriter.create(loc, result); + rewriter.replaceOp(apply, result); + return mlir::success(); + } +}; + struct AssignOpConversion : public mlir::OpConversionPattern { using mlir::OpConversionPattern::OpConversionPattern; explicit AssignOpConversion(mlir::MLIRContext *ctx) @@ -398,12 +418,12 @@ auto module = this->getOperation(); auto *context = &getContext(); mlir::RewritePatternSet patterns(context); - patterns - .insert(context); + patterns.insert(context); mlir::ConversionTarget target(*context); - target.addIllegalOp(); target.markUnknownOpDynamicallyLegal([](mlir::Operation *op) { return llvm::all_of( diff --git a/flang/test/HLFIR/apply-codegen.fir b/flang/test/HLFIR/apply-codegen.fir new file mode 100644 --- /dev/null +++ b/flang/test/HLFIR/apply-codegen.fir @@ -0,0 +1,27 @@ +// Test hlfir.apply code generation +// RUN: fir-opt %s -bufferize-hlfir | FileCheck %s + +func.func @numeric_apply(%arg0 : !fir.ref>) { + %expr = hlfir.as_expr %arg0 : (!fir.ref>) -> !hlfir.expr<100xi32> + %c42 = arith.constant 42 : index + %elem = hlfir.apply %expr, %c42 : (!hlfir.expr<100xi32>, index) -> i32 + return +} +// CHECK-LABEL: func.func @numeric_apply( +// CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %{{.*}}(%{{.*}}) {uniq_name = ".tmp"} +// CHECK: %[[VAL_9:.*]] = arith.constant 42 : index +// CHECK: %[[VAL_10:.*]] = hlfir.designate %[[VAL_5]]#0 (%[[VAL_9]]) : (!fir.heap>, index) -> !fir.ref +// CHECK: %[[VAL_11:.*]] = fir.load %[[VAL_10]] : !fir.ref + +func.func @character_apply(%arg0 : !fir.ref>>, %l: index, %n: index) { + %shape = fir.shape %n : (index) -> !fir.shape<1> + %c:2 = hlfir.declare %arg0(%shape) typeparams %l {uniq_name = "c"} : (!fir.ref>>, !fir.shape<1>, index) -> (!fir.box>>, !fir.ref>>) + %expr = hlfir.as_expr %c#0 : (!fir.box>>) -> !hlfir.expr> + %c42 = arith.constant 42 : index + %elem = hlfir.apply %expr, %c42 typeparams %l: (!hlfir.expr>, index, index) -> !hlfir.expr> + return +} +// CHECK-LABEL: func.func @character_apply( +// CHECK: %[[VAL_7:.*]]:2 = hlfir.declare %{{.*}}(%{{.*}}) typeparams %[[VAL_1:.*]] {uniq_name = ".tmp"} +// CHECK: %[[VAL_11:.*]] = arith.constant 42 : index +// CHECK: %[[VAL_12:.*]] = hlfir.designate %[[VAL_7]]#0 (%[[VAL_11]]) typeparams %[[VAL_1]] : (!fir.box>>, index, index) -> !fir.boxchar<2>