Skip to content

[flang] Simple folding for hlfir.shape_of. #119649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2024
Merged

[flang] Simple folding for hlfir.shape_of. #119649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flang/include/flang/Optimizer/HLFIR/HLFIROps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,7 @@ def hlfir_ShapeOfOp : hlfir_Op<"shape_of", [Pure]> {
}];

let builders = [OpBuilder<(ins "mlir::Value":$expr)>];
let hasFolder = 1;
}

def hlfir_GetExtentOp : hlfir_Op<"get_extent", [Pure]> {
Expand Down
9 changes: 9 additions & 0 deletions flang/lib/Optimizer/HLFIR/IR/HLFIROps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1704,6 +1704,15 @@ hlfir::ShapeOfOp::canonicalize(ShapeOfOp shapeOf,
return llvm::LogicalResult::success();
}

mlir::OpFoldResult hlfir::ShapeOfOp::fold(FoldAdaptor adaptor) {
if (matchPattern(getExpr(), mlir::m_Op<hlfir::ElementalOp>())) {
auto elementalOp =
mlir::cast<hlfir::ElementalOp>(getExpr().getDefiningOp());
return elementalOp.getShape();
}
return {};
}

//===----------------------------------------------------------------------===//
// GetExtent
//===----------------------------------------------------------------------===//
Expand Down
18 changes: 18 additions & 0 deletions flang/test/HLFIR/shapeof.fir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,21 @@ func.func @shapeof2(%arg0: !hlfir.expr<?x2xi32>) -> !fir.shape<2> {
// CHECK-ALL: %[[EXPR:.*]]: !hlfir.expr<?x2xi32>
// CHECK-ALL-NEXT: %[[SHAPE:.*]] = hlfir.shape_of %[[EXPR]] : (!hlfir.expr<?x2xi32>) -> !fir.shape<2>
// CHECK-ALL-NEXT: return %[[SHAPE]]

// Checks hlfir.elemental -> hlfir.shape_of folding
func.func @shapeof_fold1(%extent: index) -> !fir.shape<1> {
%shape1 = fir.shape %extent : (index) -> !fir.shape<1>
%elem = hlfir.elemental %shape1 : (!fir.shape<1>) -> !hlfir.expr<?xindex> {
hlfir.yield_element %extent : index
}
%shape2 = hlfir.shape_of %elem : (!hlfir.expr<?xindex>) -> !fir.shape<1>
return %shape2 : !fir.shape<1>
}
// CHECK-ALL-LABEL: func.func @shapeof_fold1(
// CHECK-ALL-SAME: %[[VAL_0:.*]]: index) -> !fir.shape<1> {
// CHECK-CANON-NEXT: %[[VAL_1:.*]] = fir.shape %[[VAL_0]] : (index) -> !fir.shape<1>
// CHECK-CANON-NEXT: %[[VAL_2:.*]] = hlfir.elemental %[[VAL_1]] : (!fir.shape<1>) -> !hlfir.expr<?xindex> {
// CHECK-CANON-NEXT: hlfir.yield_element %[[VAL_0]] : index
// CHECK-CANON-NEXT: }
// CHECK-CANON-NEXT: return %[[VAL_1]] : !fir.shape<1>
// CHECK-CANON-NEXT: }
Loading