This is an archive of the discontinued LLVM Phabricator instance.

Differential D121803

[flang][lowering] Add lowering for the `size` intrinsic
ClosedPublic

Authored by awarzynski on Mar 16 2022, 6:59 AM.

Details

Reviewers
clementval
kiranchandramohan
schweitz
PeteSteinfeld
sscalpone
Commits
rG6f0041ea44f5: [flang][lowering] Add lowering for the `size` intrinsic
Summary

This patch adds support for lowering of the size intrinsic from Fortran
to the FIR dialect of MLIR.

This is part of the upstreaming effort from the fir-dev branch in [1].

[1] https://github.com/flang-compiler/f18-llvm-project

Co-authored-by: Jean Perier <jperier@nvidia.com>
Co-authored-by: Eric Schweitz <eschweitz@nvidia.com>
Co-authored-by: Peter Steinfeld <psteinfeld@nvidia.com>

Diff Detail

Event Timeline

awarzynski created this revision.Mar 16 2022, 6:59 AM
Herald added a reviewer: sscalpone. · View Herald TranscriptMar 16 2022, 6:59 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald Transcript
Herald added subscribers: Chia-hungDuan, mehdi_amini, rriddle, mikhail.ramalho. · View Herald Transcript
awarzynski requested review of this revision.Mar 16 2022, 6:59 AM
Herald added subscribers: stephenneuendorffer, jdoerfert. · View Herald TranscriptMar 16 2022, 6:59 AM
clementval accepted this revision.Mar 16 2022, 7:10 AM

LGTM

This revision is now accepted and ready to land.Mar 16 2022, 7:10 AM
PeteSteinfeld retitled this revision from [flang][lowering] Add lowering for the `siz3` intrinsic to [flang][lowering] Add lowering for the `size` intrinsic.Mar 16 2022, 7:14 AM
Harbormaster completed remote builds in B154592: Diff 415815.Mar 16 2022, 7:18 AM
Closed by commit rG6f0041ea44f5: [flang][lowering] Add lowering for the `size` intrinsic (authored by awarzynski). · Explain WhyMar 16 2022, 9:31 AM
This revision was automatically updated to reflect the committed changes.
awarzynski added a commit: rG6f0041ea44f5: [flang][lowering] Add lowering for the `size` intrinsic.

Revision Contents

PathSize
flang/
lib/
Lower/
6 lines
test/
Lower/
Intrinsics/
99 lines

Diff 415815

flang/lib/Lower/IntrinsicCall.cpp

Show First 20 Lines • Show All 657 Lines • ▼ Show 20 Linesstatic constexpr IntrinsicHandler handlers[]{
{"random_number", {"random_number",
&I::genRandomNumber, &I::genRandomNumber,
{{{"harvest", asBox}}}, {{{"harvest", asBox}}},
/*isElemental=*/false}, /*isElemental=*/false},
{"random_seed", {"random_seed",
&I::genRandomSeed, &I::genRandomSeed,
{{{"size", asBox}, {"put", asBox}, {"get", asBox}}}, {{{"size", asBox}, {"put", asBox}, {"get", asBox}}},
/*isElemental=*/false}, /*isElemental=*/false},
{"size",
&I::genSize,
{{{"array", asBox},
{"dim", asAddr, handleDynamicOptional},
{"kind", asValue}}},
/*isElemental=*/false},
{"sum", {"sum",
&I::genSum, &I::genSum,
{{{"array", asBox}, {{{"array", asBox},
{"dim", asValue}, {"dim", asValue},
{"mask", asBox, handleDynamicOptional}}}, {"mask", asBox, handleDynamicOptional}}},
/*isElemental=*/false}, /*isElemental=*/false},
{"system_clock", {"system_clock",
&I::genSystemClock, &I::genSystemClock,
▲ Show 20 Lines • Show All 1,504 Lines • Show Last 20 Lines

flang/test/Lower/Intrinsics/size.f90

  • This file was added.
! RUN: bbc -emit-fir %s -o - | FileCheck %s
! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
! CHECK-LABEL: func @_QPsize_test() {
subroutine size_test()
real, dimension(1:10, -10:10) :: a
integer :: dim = 1
integer :: iSize
! CHECK: %[[VAL_c1:.*]] = arith.constant 1 : index
! CHECK: %[[VAL_c10:.*]] = arith.constant 10 : index
! CHECK: %[[VAL_cneg10:.*]] = arith.constant -10 : index
! CHECK: %[[VAL_c21:.*]] = arith.constant 21 : index
! CHECK: %[[VAL_0:.*]] = fir.alloca !fir.array<10x21xf32> {bindc_name = "a", uniq_name = "_QFsize_testEa"}
! CHECK: %[[VAL_1:.*]] = fir.address_of(@_QFsize_testEdim) : !fir.ref<i32>
! CHECK: %[[VAL_2:.*]] = fir.alloca i32 {bindc_name = "isize", uniq_name = "_QFsize_testEisize"}
! CHECK: %[[VAL_c2_i64:.*]] = arith.constant 2 : i64
! CHECK: %[[VAL_3:.*]] = fir.convert %[[VAL_c2_i64]] : (i64) -> index
! CHECK: %[[VAL_c1_i64:.*]] = arith.constant 1 : i64
! CHECK: %[[VAL_4:.*]] = fir.convert %[[VAL_c1_i64]] : (i64) -> index
! CHECK: %[[VAL_c5_i64:.*]] = arith.constant 5 : i64
! CHECK: %[[VAL_5:.*]] = fir.convert %[[VAL_c5_i64]] : (i64) -> index
! CHECK: %[[VAL_neg1_i64:.*]] = arith.constant -1 : i64
! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_neg1_i64]] : (i64) -> index
! CHECK: %[[VAL_c1_i64_0:.*]] = arith.constant 1 : i64
! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_c1_i64_0]] : (i64) -> index
! CHECK: %[[VAL_c1_i64_1:.*]] = arith.constant 1 : i64
! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_c1_i64_1]] : (i64) -> index
! CHECK: %[[VAL_9:.*]] = fir.shape_shift %[[VAL_c1]], %[[VAL_c10]], %[[VAL_cneg10]], %[[VAL_c21]] : (index, index, index, index) -> !fir.shapeshift<2>
! CHECK: %[[VAL_10:.*]] = fir.slice %[[VAL_3]], %[[VAL_5]], %[[VAL_4]], %[[VAL_6]], %[[VAL_8]], %[[VAL_7]] : (index, index, index, index, index, index) -> !fir.slice<2>
! CHECK: %[[VAL_11:.*]] = fir.embox %[[VAL_0]](%[[VAL_9]]) [%[[VAL_10]]] : (!fir.ref<!fir.array<10x21xf32>>, !fir.shapeshift<2>, !fir.slice<2>) -> !fir.box<!fir.array<?x?xf32>>
! CHECK: %[[VAL_12:.*]] = fir.convert %[[VAL_1]] : (!fir.ref<i32>) -> i64
! CHECK: %[[c0_i64:.*]] = arith.constant 0 : i64
! CHECK: %[[VAL_13:.*]] = arith.cmpi eq, %[[VAL_12]], %[[c0_i64]] : i64
! CHECK: %[[VAL_14:.*]] = fir.if %[[VAL_13]] -> (i64) {
! CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_11]] : (!fir.box<!fir.array<?x?xf32>>) -> !fir.box<none>
! CHECK: %[[VAL_19:.*]] = fir.call @_FortranASize(%[[VAL_17]], %{{.*}}, %{{.*}}) : (!fir.box<none>, !fir.ref<i8>, i32) -> i64
! CHECK: fir.result %[[VAL_19]] : i64
! CHECK: } else {
! CHECK: %[[VAL_16:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
! CHECK: %[[VAL_18:.*]] = fir.convert %[[VAL_11]] : (!fir.box<!fir.array<?x?xf32>>) -> !fir.box<none>
! CHECK: %[[VAL_20:.*]] = fir.call @_FortranASizeDim(%[[VAL_18]], %[[VAL_16]], %{{.*}}, %{{.*}}) : (!fir.box<none>, i32, !fir.ref<i8>, i32) -> i64
! CHECK: fir.result %[[VAL_20]] : i64
! CHECK: }
! CHECK: %[[VAL_21:.*]] = fir.convert %[[VAL_14]] : (i64) -> i32
! CHECK: fir.store %[[VAL_21]] to %[[VAL_2]] : !fir.ref<i32>
iSize = size(a(2:5, -1:1), dim, 8)
end subroutine size_test
! CHECK-LABEL: func @_QPsize_optional_dim_1(
! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?x?xf32>> {fir.bindc_name = "array"},
! CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<i32> {fir.bindc_name = "dim", fir.optional},
! CHECK-SAME: %[[VAL_2:.*]]: !fir.ref<i64> {fir.bindc_name = "isize"}) {
subroutine size_optional_dim_1(array, dim, iSize)
real, dimension(:,:) :: array
integer, optional :: dim
integer(8) :: iSize
iSize = size(array, dim, 8)
! CHECK: %[[VAL_3:.*]] = fir.convert %[[VAL_1]] : (!fir.ref<i32>) -> i64
! CHECK: %[[VAL_4:.*]] = arith.constant 0 : i64
! CHECK: %[[VAL_5:.*]] = arith.cmpi eq, %[[VAL_3]], %[[VAL_4]] : i64
! CHECK: %[[VAL_6:.*]] = fir.if %[[VAL_5]] -> (i64) {
! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_0]] : (!fir.box<!fir.array<?x?xf32>>) -> !fir.box<none>
! CHECK: %[[VAL_11:.*]] = fir.call @_FortranASize(%[[VAL_9]], %{{.*}}, %{{.*}}) : (!fir.box<none>, !fir.ref<i8>, i32) -> i64
! CHECK: fir.result %[[VAL_11]] : i64
! CHECK: } else {
! CHECK: %[[VAL_12:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
! CHECK: %[[VAL_15:.*]] = fir.convert %[[VAL_0]] : (!fir.box<!fir.array<?x?xf32>>) -> !fir.box<none>
! CHECK: %[[VAL_17:.*]] = fir.call @_FortranASizeDim(%[[VAL_15]], %[[VAL_12]], %{{.*}}, %{{.*}}) : (!fir.box<none>, i32, !fir.ref<i8>, i32) -> i64
! CHECK: fir.result %[[VAL_17]] : i64
! CHECK: }
! CHECK: fir.store %[[VAL_6]] to %[[VAL_2]] : !fir.ref<i64>
end subroutine
! CHECK-LABEL: func @_QPsize_optional_dim_2(
! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?x?xf32>> {fir.bindc_name = "array"},
! CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.box<!fir.ptr<i32>>> {fir.bindc_name = "dim"},
! CHECK-SAME: %[[VAL_2:.*]]: !fir.ref<i64> {fir.bindc_name = "isize"}) {
subroutine size_optional_dim_2(array, dim, iSize)
real, dimension(:,:) :: array
integer, pointer :: dim
integer(8) :: iSize
iSize = size(array, dim, 8)
! CHECK: %[[VAL_3:.*]] = fir.load %[[VAL_1]] : !fir.ref<!fir.box<!fir.ptr<i32>>>
! CHECK: %[[VAL_4:.*]] = fir.box_addr %[[VAL_3]] : (!fir.box<!fir.ptr<i32>>) -> !fir.ptr<i32>
! CHECK: %[[VAL_5:.*]] = fir.convert %[[VAL_4]] : (!fir.ptr<i32>) -> i64
! CHECK: %[[VAL_6:.*]] = arith.constant 0 : i64
! CHECK: %[[VAL_7:.*]] = arith.cmpi eq, %[[VAL_5]], %[[VAL_6]] : i64
! CHECK: %[[VAL_8:.*]] = fir.if %[[VAL_7]] -> (i64) {
! CHECK: %[[VAL_11:.*]] = fir.convert %[[VAL_0]] : (!fir.box<!fir.array<?x?xf32>>) -> !fir.box<none>
! CHECK: %[[VAL_13:.*]] = fir.call @_FortranASize(%[[VAL_11]], %{{.*}}, %{{.*}}) : (!fir.box<none>, !fir.ref<i8>, i32) -> i64
! CHECK: fir.result %[[VAL_13]] : i64
! CHECK: } else {
! CHECK: %[[VAL_14:.*]] = fir.load %[[VAL_4]] : !fir.ptr<i32>
! CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_0]] : (!fir.box<!fir.array<?x?xf32>>) -> !fir.box<none>
! CHECK: %[[VAL_19:.*]] = fir.call @_FortranASizeDim(%[[VAL_17]], %[[VAL_14]], %{{.*}}, %{{.*}}) : (!fir.box<none>, i32, !fir.ref<i8>, i32) -> i64
! CHECK: fir.result %[[VAL_19]] : i64
! CHECK: }
! CHECK: fir.store %[[VAL_8]] to %[[VAL_2]] : !fir.ref<i64>
end subroutine