This is an archive of the discontinued LLVM Phabricator instance.

Differential D155302

[Flang][HLFIR] Relax size check for dot_product intrinsic
ClosedPublic

Authored by kiranchandramohan on Jul 14 2023, 8:33 AM.

Details

Reviewers
tblah
vzakhari
Commits
rG41f478f04197: [Flang][HLFIR] Relax size check for dot_product intrinsic
Summary

If the size of one of the operand arrays is not known at compile
time, do not issue a size mismatch error sinc they could match at
runtime.

Fixes the compilation error in polyhedron/induct2.

Diff Detail

Event Timeline

kiranchandramohan created this revision.Jul 14 2023, 8:33 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJul 14 2023, 8:33 AM
Herald added subscribers: sunshaoce, mehdi_amini. · View Herald Transcript
kiranchandramohan requested review of this revision.Jul 14 2023, 8:33 AM
Herald added a subscriber: jdoerfert. · View Herald TranscriptJul 14 2023, 8:33 AM
tblah accepted this revision.Jul 14 2023, 8:42 AM

LGTM thanks!

This revision is now accepted and ready to land.Jul 14 2023, 8:42 AM
Harbormaster completed remote builds in B245400: Diff 540432.Jul 14 2023, 9:24 AM
vzakhari accepted this revision.Jul 17 2023, 8:18 AM

Thank you, Kiran!

Closed by commit rG41f478f04197: [Flang][HLFIR] Relax size check for dot_product intrinsic (authored by kiranchandramohan). · Explain WhyJul 18 2023, 2:27 AM
This revision was automatically updated to reflect the committed changes.
kiranchandramohan added a commit: rG41f478f04197: [Flang][HLFIR] Relax size check for dot_product intrinsic.

Revision Contents

PathSize
flang/
lib/
Optimizer/
HLFIR/
IR/
4 lines
test/
Lower/
HLFIR/
12 lines

Diff 541409

flang/lib/Optimizer/HLFIR/IR/HLFIROps.cpp

Show First 20 Lines • Show All 727 Lines • ▼ Show 20 Linesmlir::LogicalResult hlfir::DotProductOp::verify() {
mlir::Type resultTy = getResult().getType(); mlir::Type resultTy = getResult().getType();
if ((lhsRank != 1) || (rhsRank != 1)) if ((lhsRank != 1) || (rhsRank != 1))
return emitOpError("both arrays must have rank 1"); return emitOpError("both arrays must have rank 1");
int64_t lhsSize = lhsShape[0]; int64_t lhsSize = lhsShape[0];
int64_t rhsSize = rhsShape[0]; int64_t rhsSize = rhsShape[0];
if (lhsSize != rhsSize) constexpr int64_t unknownExtent = fir::SequenceType::getUnknownExtent();
if ((lhsSize != unknownExtent) && (rhsSize != unknownExtent) &&
(lhsSize != rhsSize))
return emitOpError("both arrays must have the same size"); return emitOpError("both arrays must have the same size");
if (mlir::isa<fir::LogicalType>(lhsEleTy) != if (mlir::isa<fir::LogicalType>(lhsEleTy) !=
mlir::isa<fir::LogicalType>(rhsEleTy)) mlir::isa<fir::LogicalType>(rhsEleTy))
return emitOpError("if one array is logical, so should the other be"); return emitOpError("if one array is logical, so should the other be");
if (mlir::isa<fir::LogicalType>(lhsEleTy) != if (mlir::isa<fir::LogicalType>(lhsEleTy) !=
mlir::isa<fir::LogicalType>(resultTy)) mlir::isa<fir::LogicalType>(resultTy))
▲ Show 20 Lines • Show All 780 Lines • Show Last 20 Lines

flang/test/Lower/HLFIR/dot_product.f90

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines
! CHECK-DAG: %[[RHS_VAR:.*]]:2 = hlfir.declare %[[RHS]] ! CHECK-DAG: %[[RHS_VAR:.*]]:2 = hlfir.declare %[[RHS]]
! CHECK-DAG: %[[RES_VAR:.*]]:2 = hlfir.declare %[[RES]] ! CHECK-DAG: %[[RES_VAR:.*]]:2 = hlfir.declare %[[RES]]
! CHECK-NEXT: %[[LHS_LD:.*]] = fir.load %[[LHS_VAR]]#0 ! CHECK-NEXT: %[[LHS_LD:.*]] = fir.load %[[LHS_VAR]]#0
! CHECK-NEXT: %[[RHS_LD:.*]] = fir.load %[[RHS_VAR]]#0 ! CHECK-NEXT: %[[RHS_LD:.*]] = fir.load %[[RHS_VAR]]#0
! CHECK-NEXT: %[[PROD:.*]] = hlfir.dot_product %[[LHS_LD]] %[[RHS_LD]] {fastmath = #arith.fastmath<contract>} : (!fir.box<!fir.heap<!fir.array<?xi32>>>, !fir.box<!fir.heap<!fir.array<?xi32>>>) -> i32 ! CHECK-NEXT: %[[PROD:.*]] = hlfir.dot_product %[[LHS_LD]] %[[RHS_LD]] {fastmath = #arith.fastmath<contract>} : (!fir.box<!fir.heap<!fir.array<?xi32>>>, !fir.box<!fir.heap<!fir.array<?xi32>>>) -> i32
! CHECK-NEXT: hlfir.assign %[[PROD]] to %[[RES_VAR]]#0 : i32, !fir.ref<i32> ! CHECK-NEXT: hlfir.assign %[[PROD]] to %[[RES_VAR]]#0 : i32, !fir.ref<i32>
! CHECK-NEXT: return ! CHECK-NEXT: return
! CHECK-NEXT: } ! CHECK-NEXT: }
! CHECK-LABEL: func.func @_QPdot_product5
! CHECK: %[[LHS:.*]]:2 = hlfir.declare %{{.*}} {uniq_name = "_QFdot_product5Elhs"} : (!fir.box<!fir.array<?xi32>>) -> (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>)
! CHECK: %[[C3:.*]] = arith.constant 3 : index
! CHECK: %[[RHS_SHAPE:.*]] = fir.shape %[[C3]] : (index) -> !fir.shape<1>
! CHECK: %[[RHS:.*]]:2 = hlfir.declare %{{.*}}(%[[RHS_SHAPE]]) {uniq_name = "_QFdot_product5Erhs"} : (!fir.ref<!fir.array<3xi32>>, !fir.shape<1>) -> (!fir.ref<!fir.array<3xi32>>, !fir.ref<!fir.array<3xi32>>)
! CHECK: {{.*}} = hlfir.dot_product %[[LHS]]#0 %[[RHS]]#0 {fastmath = #arith.fastmath<contract>} : (!fir.box<!fir.array<?xi32>>, !fir.ref<!fir.array<3xi32>>) -> i32
subroutine dot_product5(lhs, rhs, res)
integer :: lhs(:), rhs(3)
integer :: res
res = dot_product(lhs, rhs)
endsubroutine