forked from llvm/llvm-project
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[flang] Fix fir.embox codegen with constant interior shape
Fix flang-compiler#1416. The `constRows` variable was being decremented too soon, causing the last constant interior dimension extent being used to multiply the GEP offset. This lead to wrong address computation and caused segfaults.
- Loading branch information
1 parent
60c6e96
commit e6016cc
Showing
2 changed files
with
84 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
// RUN: fir-opt %s | tco | FileCheck %s | ||
|
||
|
||
// CHECK-LABEL: define void @_QPtest_callee({ i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }* %0) | ||
func @_QPtest_callee(%arg0: !fir.box<!fir.array<?xi32>>) { | ||
return | ||
} | ||
|
||
// CHECK-LABEL: define void @_QPtest_slice() | ||
func @_QPtest_slice() { | ||
// CHECK: %[[a1:.*]] = alloca { i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }, align 8, | ||
// CHECK: %[[a2:.*]] = alloca [20 x i32], i64 1, align 4, | ||
// CHECK: %[[a3:.*]] = getelementptr [20 x i32], [20 x i32]* %[[a2]], i64 0, i64 0, | ||
// CHECK: %[[a4:.*]] = insertvalue { i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } | ||
// CHECK: { i32* undef, i64 4, i32 20180515, i8 1, i8 9, i8 0, i8 0, [1 x [3 x i64]] | ||
// CHECK: [i64 1, i64 5, i64 8]] }, i32* %[[a3]], 0, | ||
// CHECK: store { i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[a4]], { i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }* %[[a1]], align 8 | ||
// CHECK: call void @_QPtest_callee({ i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }* %[[a1]]), | ||
%c20 = arith.constant 20 : index | ||
%c1_i64 = arith.constant 1 : i64 | ||
%c10_i64 = arith.constant 10 : i64 | ||
%c2_i64 = arith.constant 2 : i64 | ||
%0 = fir.alloca !fir.array<20xi32> {bindc_name = "x", uniq_name = "_QFtest_sliceEx"} | ||
%1 = fir.shape %c20 : (index) -> !fir.shape<1> | ||
%2 = fir.slice %c1_i64, %c10_i64, %c2_i64 : (i64, i64, i64) -> !fir.slice<1> | ||
%3 = fir.embox %0(%1) [%2] : (!fir.ref<!fir.array<20xi32>>, !fir.shape<1>, !fir.slice<1>) -> !fir.box<!fir.array<?xi32>> | ||
fir.call @_QPtest_callee(%3) : (!fir.box<!fir.array<?xi32>>) -> () | ||
return | ||
} | ||
|
||
// CHECK-LABEL: define void @_QPtest_dt_callee({ i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }* %0) | ||
func @_QPtest_dt_callee(%arg0: !fir.box<!fir.array<?xi32>>) { | ||
return | ||
} | ||
|
||
// CHECK-LABEL: define void @_QPtest_dt_slice() | ||
func @_QPtest_dt_slice() { | ||
// CHECK: %[[a1:.*]] = alloca { i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }, align 8, | ||
// CHECK: %[[a3:.*]] = alloca [20 x %_QFtest_dt_sliceTt], i64 1, align 8, | ||
// CHECK: %[[a4:.*]] = getelementptr [20 x %_QFtest_dt_sliceTt], [20 x %_QFtest_dt_sliceTt]* %[[a3]], i64 0, i64 0, i32 0, | ||
// CHECK: %[[a5:.*]] = insertvalue { i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } | ||
// CHECK-SAME: { i32* undef, i64 4, i32 20180515, i8 1, i8 9, i8 0, i8 0, [1 x [3 x i64]] | ||
// CHECK-SAME: [i64 1, i64 5, i64 mul | ||
// CHECK-SAME: (i64 ptrtoint (%_QFtest_dt_sliceTt* getelementptr (%_QFtest_dt_sliceTt, %_QFtest_dt_sliceTt* null, i64 1) to i64), i64 2)]] } | ||
// CHECK-SAME: , i32* %[[a4]], 0 | ||
|
||
// CHECK: store { i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[a5]], { i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }* %[[a1]], align 8, | ||
// CHECK: call void @_QPtest_dt_callee({ i32*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }* %[[a1]]), | ||
%c20 = arith.constant 20 : index | ||
%c1_i64 = arith.constant 1 : i64 | ||
%c10_i64 = arith.constant 10 : i64 | ||
%c2_i64 = arith.constant 2 : i64 | ||
%0 = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFtest_dt_sliceEv"} | ||
%1 = fir.alloca !fir.array<20x!fir.type<_QFtest_dt_sliceTt{i:i32,j:i32}>> {bindc_name = "x", uniq_name = "_QFtest_dt_sliceEx"} | ||
%2 = fir.field_index i, !fir.type<_QFtest_dt_sliceTt{i:i32,j:i32}> | ||
%3 = fir.shape %c20 : (index) -> !fir.shape<1> | ||
%4 = fir.slice %c1_i64, %c10_i64, %c2_i64 path %2 : (i64, i64, i64, !fir.field) -> !fir.slice<1> | ||
%5 = fir.embox %1(%3) [%4] : (!fir.ref<!fir.array<20x!fir.type<_QFtest_dt_sliceTt{i:i32,j:i32}>>>, !fir.shape<1>, !fir.slice<1>) -> !fir.box<!fir.array<?xi32>> | ||
fir.call @_QPtest_dt_callee(%5) : (!fir.box<!fir.array<?xi32>>) -> () | ||
return | ||
} | ||
|
||
func private @do_something(!fir.box<!fir.array<?xf32>>) -> () | ||
// CHECK: define void @fir_dev_issue_1416 | ||
// CHECK-SAME: [40 x float]* %[[base_addr:.*]], i64 %[[low:.*]], i64 %[[up:.*]], i64 %[[at:.*]]) | ||
func @fir_dev_issue_1416(%arg0: !fir.ref<!fir.array<40x?xf32>>, %low: index, %up: index, %at : index) { | ||
// Test fir.embox with a constant interior array shape. | ||
%c1 = arith.constant 1 : index | ||
%c40 = arith.constant 40 : index | ||
%0 = fir.undefined index | ||
%1 = fir.shape_shift %c1, %c40, %low, %up : (index, index, index, index) -> !fir.shapeshift<2> | ||
%2 = fir.slice %c1, %c40, %c1, %at, %0, %0 : (index, index, index, index, index, index) -> !fir.slice<2> | ||
// CHECK: %[[diff:.*]] = sub i64 %[[at]], %[[low]] | ||
// CHECK: %[[mul:.*]] = mul i64 %[[diff]], 1 | ||
// CHECK: %[[offset:.*]] = add i64 %[[mul]], 0 | ||
// CHECK: %[[addr:.*]] = getelementptr [40 x float], [40 x float]* %0, i64 %[[offset]], i64 0 | ||
// CHECK: %[[box:.*]] = insertvalue { float*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } | ||
// CHECK-SAME: { float* undef, i64 4, i32 20180515, i8 1, i8 27, i8 0, i8 0, [1 x [3 x i64]] [{{.*}} [i64 1, i64 40, i64 4]] }, float* %[[addr]], 0 | ||
%3 = fir.embox %arg0(%1) [%2] : (!fir.ref<!fir.array<40x?xf32>>, !fir.shapeshift<2>, !fir.slice<2>) -> !fir.box<!fir.array<?xf32>> | ||
fir.call @do_something(%3) : (!fir.box<!fir.array<?xf32>>) -> () | ||
return | ||
} |