caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[flang] Support non-index shape in hlfir.get_extent codegen. (#124622)

Browse Source 
hlfir.reshape inlining uncovered an existing bug that non-index shapes
result in failures during hlfir.get_extent conversion to FIR.
I could have "fixed" the shape during hlfir.reshape inlining,
but this seems like a better fix.
This commit is contained in:
Slava Zakharin
2025-01-28 09:25:36 -08:00
committed by GitHub
parent 947d8ebbf3
commit 2f077dfbdf
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp
View File

@@ -735,6 +735,9 @@ public:
llvm::APInt dim = getExtentOp.getDim();
uint64_t dimVal = dim.getLimitedValue(shapeTy.getRank());
mlir::Value extent = s.getExtents()[dimVal];
fir::FirOpBuilder builder(rewriter, getExtentOp.getOperation());
extent = builder.createConvert(getExtentOp.getLoc(),
builder.getIndexType(), extent);
rewriter.replaceOp(getExtentOp, extent);
return mlir::success();
}

22
flang/test/HLFIR/getextent-codegen.fir Normal file
View File

@@ -0,0 +1,22 @@
// Test hlfir.get_extent code generation to FIR
// RUN: fir-opt %s -convert-hlfir-to-fir | FileCheck %s
func.func @test1(%arg0: i1, %arg1: i32, %arg2: i64, %arg3: index) -> (index, index, index, index) {
%0 = fir.shape %arg0, %arg1, %arg2, %arg3 : (i1, i32, i64, index) -> !fir.shape<4>
%1 = hlfir.get_extent %0 {dim = 0 : index} : (!fir.shape<4>) -> index
%2 = hlfir.get_extent %0 {dim = 1 : index} : (!fir.shape<4>) -> index
%3 = hlfir.get_extent %0 {dim = 2 : index} : (!fir.shape<4>) -> index
%4 = hlfir.get_extent %0 {dim = 3 : index} : (!fir.shape<4>) -> index
return %1, %2, %3, %4 : index, index, index, index
}
// CHECK-LABEL: func.func @test1(
// CHECK-SAME: %[[VAL_0:.*]]: i1,
// CHECK-SAME: %[[VAL_1:.*]]: i32,
// CHECK-SAME: %[[VAL_2:.*]]: i64,
// CHECK-SAME: %[[VAL_3:.*]]: index) -> (index, index, index, index) {
// CHECK: %[[VAL_4:.*]] = fir.shape %[[VAL_0]], %[[VAL_1]], %[[VAL_2]], %[[VAL_3]] : (i1, i32, i64, index) -> !fir.shape<4>
// CHECK: %[[VAL_5:.*]] = fir.convert %[[VAL_0]] : (i1) -> index
// CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_1]] : (i32) -> index
// CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_2]] : (i64) -> index
// CHECK: return %[[VAL_5]], %[[VAL_6]], %[[VAL_7]], %[[VAL_3]] : index, index, index, index
// CHECK: }