This is an archive of the discontinued LLVM Phabricator instance.

Differential D139117

[flang] Lower power to HLFIR
ClosedPublic

Authored by jeanPerier on Dec 1 2022, 7:48 AM.

Details

Reviewers
clementval
PeteSteinfeld
sscalpone
Commits
rG89af7de9de10: [flang] Lower power to HLFIR
Summary

Depends on D139108

Diff Detail

Event Timeline

jeanPerier created this revision.Dec 1 2022, 7:48 AM
Herald added a reviewer: sscalpone. · View Herald TranscriptDec 1 2022, 7:48 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: mehdi_amini, jdoerfert. · View Herald Transcript
jeanPerier requested review of this revision.Dec 1 2022, 7:48 AM
clementval accepted this revision.Dec 1 2022, 8:16 AM

LGTM

This revision is now accepted and ready to land.Dec 1 2022, 8:16 AM
Harbormaster completed remote builds in B200529: Diff 479296.Dec 1 2022, 8:41 AM
Closed by commit rG89af7de9de10: [flang] Lower power to HLFIR (authored by jeanPerier). · Explain WhyDec 1 2022, 8:50 AM
This revision was automatically updated to reflect the committed changes.
jeanPerier added a commit: rG89af7de9de10: [flang] Lower power to HLFIR.

Revision Contents

PathSize
flang/
lib/
Lower/
26 lines
test/
Lower/
HLFIR/
61 lines

Diff 479315

flang/lib/Lower/ConvertExprToHLFIR.cpp

Show All 11 Lines
#include "flang/Lower/ConvertExprToHLFIR.h" #include "flang/Lower/ConvertExprToHLFIR.h"
#include "flang/Evaluate/shape.h" #include "flang/Evaluate/shape.h"
#include "flang/Lower/AbstractConverter.h" #include "flang/Lower/AbstractConverter.h"
#include "flang/Lower/CallInterface.h" #include "flang/Lower/CallInterface.h"
#include "flang/Lower/ConvertCall.h" #include "flang/Lower/ConvertCall.h"
#include "flang/Lower/ConvertConstant.h" #include "flang/Lower/ConvertConstant.h"
#include "flang/Lower/ConvertType.h" #include "flang/Lower/ConvertType.h"
#include "flang/Lower/IntrinsicCall.h"
#include "flang/Lower/StatementContext.h" #include "flang/Lower/StatementContext.h"
#include "flang/Lower/SymbolMap.h" #include "flang/Lower/SymbolMap.h"
#include "flang/Optimizer/Builder/Todo.h" #include "flang/Optimizer/Builder/Todo.h"
#include "flang/Optimizer/HLFIR/HLFIROps.h" #include "flang/Optimizer/HLFIR/HLFIROps.h"
namespace { namespace {
/// Lower Designators to HLFIR. /// Lower Designators to HLFIR.
▲ Show 20 Lines • Show All 251 Lines • ▼ Show 20 Lines
GENBIN(Subtract, Complex, fir::SubcOp) GENBIN(Subtract, Complex, fir::SubcOp)
GENBIN(Multiply, Integer, mlir::arith::MulIOp) GENBIN(Multiply, Integer, mlir::arith::MulIOp)
GENBIN(Multiply, Real, mlir::arith::MulFOp) GENBIN(Multiply, Real, mlir::arith::MulFOp)
GENBIN(Multiply, Complex, fir::MulcOp) GENBIN(Multiply, Complex, fir::MulcOp)
GENBIN(Divide, Integer, mlir::arith::DivSIOp) GENBIN(Divide, Integer, mlir::arith::DivSIOp)
GENBIN(Divide, Real, mlir::arith::DivFOp) GENBIN(Divide, Real, mlir::arith::DivFOp)
GENBIN(Divide, Complex, fir::DivcOp) GENBIN(Divide, Complex, fir::DivcOp)
template <Fortran::common::TypeCategory TC, int KIND>
struct BinaryOp<Fortran::evaluate::Power<Fortran::evaluate::Type<TC, KIND>>> {
static hlfir::EntityWithAttributes gen(mlir::Location loc,
fir::FirOpBuilder &builder,
hlfir::Entity lhs, hlfir::Entity rhs) {
mlir::Type ty = Fortran::lower::getFIRType(builder.getContext(), TC, KIND,
/*params=*/llvm::None);
return hlfir::EntityWithAttributes{
Fortran::lower::genPow(builder, loc, ty, lhs, rhs)};
}
};
template <Fortran::common::TypeCategory TC, int KIND>
struct BinaryOp<
Fortran::evaluate::RealToIntPower<Fortran::evaluate::Type<TC, KIND>>> {
static hlfir::EntityWithAttributes gen(mlir::Location loc,
fir::FirOpBuilder &builder,
hlfir::Entity lhs, hlfir::Entity rhs) {
mlir::Type ty = Fortran::lower::getFIRType(builder.getContext(), TC, KIND,
/*params=*/llvm::None);
return hlfir::EntityWithAttributes{
Fortran::lower::genPow(builder, loc, ty, lhs, rhs)};
}
};
/// Lower Expr to HLFIR. /// Lower Expr to HLFIR.
class HlfirBuilder { class HlfirBuilder {
public: public:
HlfirBuilder(mlir::Location loc, Fortran::lower::AbstractConverter &converter, HlfirBuilder(mlir::Location loc, Fortran::lower::AbstractConverter &converter,
Fortran::lower::SymMap &symMap, Fortran::lower::SymMap &symMap,
Fortran::lower::StatementContext &stmtCtx) Fortran::lower::StatementContext &stmtCtx)
: converter{converter}, symMap{symMap}, stmtCtx{stmtCtx}, loc{loc} {} : converter{converter}, symMap{symMap}, stmtCtx{stmtCtx}, loc{loc} {}
▲ Show 20 Lines • Show All 181 Lines • Show Last 20 Lines

flang/test/Lower/HLFIR/binary-ops.f90

Show First 20 Lines • Show All 126 Lines • ▼ Show 20 Lines
x = y / z x = y / z
end subroutine end subroutine
! CHECK-LABEL: func.func @_QPcomplex_div( ! CHECK-LABEL: func.func @_QPcomplex_div(
! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %{{.*}}y"} : (!fir.ref<!fir.complex<4>>) -> (!fir.ref<!fir.complex<4>>, !fir.ref<!fir.complex<4>>) ! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %{{.*}}y"} : (!fir.ref<!fir.complex<4>>) -> (!fir.ref<!fir.complex<4>>, !fir.ref<!fir.complex<4>>)
! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %{{.*}}z"} : (!fir.ref<!fir.complex<4>>) -> (!fir.ref<!fir.complex<4>>, !fir.ref<!fir.complex<4>>) ! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %{{.*}}z"} : (!fir.ref<!fir.complex<4>>) -> (!fir.ref<!fir.complex<4>>, !fir.ref<!fir.complex<4>>)
! CHECK: %[[VAL_6:.*]] = fir.load %[[VAL_4]]#0 : !fir.ref<!fir.complex<4>> ! CHECK: %[[VAL_6:.*]] = fir.load %[[VAL_4]]#0 : !fir.ref<!fir.complex<4>>
! CHECK: %[[VAL_7:.*]] = fir.load %[[VAL_5]]#0 : !fir.ref<!fir.complex<4>> ! CHECK: %[[VAL_7:.*]] = fir.load %[[VAL_5]]#0 : !fir.ref<!fir.complex<4>>
! CHECK: %[[VAL_8:.*]] = fir.divc %[[VAL_6]], %[[VAL_7]] : !fir.complex<4> ! CHECK: %[[VAL_8:.*]] = fir.divc %[[VAL_6]], %[[VAL_7]] : !fir.complex<4>
subroutine int_power(x, y, z)
integer :: x, y, z
x = y**z
end subroutine
! CHECK-LABEL: func.func @_QPint_power(
! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %{{.*}}y"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %{{.*}}z"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: %[[VAL_6:.*]] = fir.load %[[VAL_4]]#0 : !fir.ref<i32>
! CHECK: %[[VAL_7:.*]] = fir.load %[[VAL_5]]#0 : !fir.ref<i32>
! CHECK: %[[VAL_8:.*]] = math.ipowi %[[VAL_6]], %[[VAL_7]] : i32
subroutine real_power(x, y, z)
real :: x, y, z
x = y**z
end subroutine
! CHECK-LABEL: func.func @_QPreal_power(
! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %{{.*}}y"} : (!fir.ref<f32>) -> (!fir.ref<f32>, !fir.ref<f32>)
! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %{{.*}}z"} : (!fir.ref<f32>) -> (!fir.ref<f32>, !fir.ref<f32>)
! CHECK: %[[VAL_6:.*]] = fir.load %[[VAL_4]]#0 : !fir.ref<f32>
! CHECK: %[[VAL_7:.*]] = fir.load %[[VAL_5]]#0 : !fir.ref<f32>
! CHECK: %[[VAL_8:.*]] = math.powf %[[VAL_6]], %[[VAL_7]] fastmath<contract> : f32
subroutine complex_power(x, y, z)
complex :: x, y, z
x = y**z
end subroutine
! CHECK-LABEL: func.func @_QPcomplex_power(
! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %{{.*}}y"} : (!fir.ref<!fir.complex<4>>) -> (!fir.ref<!fir.complex<4>>, !fir.ref<!fir.complex<4>>)
! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %{{.*}}z"} : (!fir.ref<!fir.complex<4>>) -> (!fir.ref<!fir.complex<4>>, !fir.ref<!fir.complex<4>>)
! CHECK: %[[VAL_6:.*]] = fir.load %[[VAL_4]]#0 : !fir.ref<!fir.complex<4>>
! CHECK: %[[VAL_7:.*]] = fir.load %[[VAL_5]]#0 : !fir.ref<!fir.complex<4>>
! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_6]] : (!fir.complex<4>) -> complex<f32>
! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_7]] : (!fir.complex<4>) -> complex<f32>
! CHECK: %[[VAL_10:.*]] = complex.pow %[[VAL_8]], %[[VAL_9]] : complex<f32>
! CHECK: %[[VAL_11:.*]] = fir.convert %[[VAL_10]] : (complex<f32>) -> !fir.complex<4>
subroutine real_to_int_power(x, y, z)
real :: x, y
integer :: z
x = y**z
end subroutine
! CHECK-LABEL: func.func @_QPreal_to_int_power(
! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %{{.*}}y"} : (!fir.ref<f32>) -> (!fir.ref<f32>, !fir.ref<f32>)
! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %{{.*}}z"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: %[[VAL_6:.*]] = fir.load %[[VAL_4]]#0 : !fir.ref<f32>
! CHECK: %[[VAL_7:.*]] = fir.load %[[VAL_5]]#0 : !fir.ref<i32>
! CHECK: %[[VAL_8:.*]] = fir.call @llvm.powi.f32.i32(%[[VAL_6]], %[[VAL_7]]) fastmath<contract> : (f32, i32) -> f32
subroutine complex_to_int_power(x, y, z)
complex :: x, y
integer :: z
x = y**z
end subroutine
! CHECK-LABEL: func.func @_QPcomplex_to_int_power(
! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %{{.*}}y"} : (!fir.ref<!fir.complex<4>>) -> (!fir.ref<!fir.complex<4>>, !fir.ref<!fir.complex<4>>)
! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %{{.*}}z"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: %[[VAL_6:.*]] = fir.load %[[VAL_4]]#0 : !fir.ref<!fir.complex<4>>
! CHECK: %[[VAL_7:.*]] = fir.load %[[VAL_5]]#0 : !fir.ref<i32>
! CHECK: %[[VAL_8:.*]] = fir.call @_FortranAcpowi(%[[VAL_6]], %[[VAL_7]]) fastmath<contract> : (!fir.complex<4>, i32) -> !fir.complex<4>