This is an archive of the discontinued LLVM Phabricator instance.

Differential D116842

[FIR] Correct and reenable a test removed by MLIR.
ClosedPublic

Authored by schweitz on Jan 7 2022, 3:56 PM.

Details

Reviewers
svedanayagam
sscalpone
jeanPerier
kiranchandramohan
clementval
rovka
awarzynski
Commits
rG7ecce1f6959f: [fir] Correct and reenable test that was removed by MLIR.
Summary

See https://github.com/llvm/llvm-project/issues/53064

Diff Detail

Event Timeline

schweitz created this revision.Jan 7 2022, 3:56 PM
Herald added subscribers: Chia-hungDuan, rriddle. · View Herald TranscriptJan 7 2022, 3:56 PM
schweitz requested review of this revision.Jan 7 2022, 3:56 PM
Herald added a subscriber: stephenneuendorffer. · View Herald TranscriptJan 7 2022, 3:56 PM
Harbormaster completed remote builds in B142169: Diff 398264.Jan 7 2022, 4:09 PM
clementval accepted this revision.Jan 8 2022, 7:15 AM

Thanks Eric

This revision is now accepted and ready to land.Jan 8 2022, 7:15 AM
Closed by commit rG7ecce1f6959f: [fir] Correct and reenable test that was removed by MLIR. (authored by schweitz). · Explain WhyJan 8 2022, 1:58 PM
This revision was automatically updated to reflect the committed changes.
schweitz added a commit: rG7ecce1f6959f: [fir] Correct and reenable test that was removed by MLIR..
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJan 8 2022, 1:58 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
flang/
test/
Fir/
48 lines

Diff 398374

flang/test/Fir/convert-to-llvm.fir

Show First 20 Lines • Show All 880 Lines • ▼ Show 20 Lines
// CHECK: %[[GEP:.*]] = llvm.getelementptr %[[ARG0]][%[[C0]], 0] : (!llvm.ptr<struct<(ptr<f64>, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}})>>, i32) -> !llvm.ptr<ptr<f64>> // CHECK: %[[GEP:.*]] = llvm.getelementptr %[[ARG0]][%[[C0]], 0] : (!llvm.ptr<struct<(ptr<f64>, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}})>>, i32) -> !llvm.ptr<ptr<f64>>
// CHECK: %[[ADDR:.*]] = llvm.load %[[GEP]] : !llvm.ptr<ptr<f64>> // CHECK: %[[ADDR:.*]] = llvm.load %[[GEP]] : !llvm.ptr<ptr<f64>>
// CHECK: llvm.return %[[ADDR]] : !llvm.ptr<f64> // CHECK: llvm.return %[[ADDR]] : !llvm.ptr<f64>
// ----- // -----
// Test `fir.box_dims` conversion. // Test `fir.box_dims` conversion.
// func @extract_dims(%arg0: !fir.box<!fir.array<*:f64>>) -> index {
// DISABLED TEST: %c1 = arith.constant 0 : i32
// %cast = fir.convert %arg0 : (!fir.box<!fir.array<*:f64>>) -> !fir.box<!fir.array<?xf64>>
// The produced IR is invalid: accessing a struct with 7 elements at index 7 is out-of-bounds. %0:3 = fir.box_dims %cast, %c1 : (!fir.box<!fir.array<?xf64>>, i32) -> (index, index, index)
// This would trigger an assertion in either MLIR or LLVM. return %0 : index
// }
//func @extract_dims(%arg0: !fir.box<!fir.array<*:f64>>) -> index { // CHECK-LABEL: llvm.func @extract_dims(
// %c1 = arith.constant 0 : i32 // CHECK-SAME: %[[ARG0:.*]]: !llvm.ptr<struct<(ptr<f64>, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}})>>) -> i64
// %0:3 = fir.box_dims %arg0, %c1 : (!fir.box<!fir.array<*:f64>>, i32) -> (index, index, index) // CHECK: %[[C0_1:.*]] = llvm.mlir.constant(0 : i32) : i32
// return %0 : index // CHECK: %[[CAST:.*]] = llvm.bitcast %[[ARG0]] : !llvm.ptr<struct<(ptr<f64>, i64, i32, i8, i8, i8, i8)>> to !llvm.ptr<struct<(ptr<f64>, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>>
//} // CHECK: %[[C0:.*]] = llvm.mlir.constant(0 : i32) : i32
// CHECK: %[[C0_2:.*]] = llvm.mlir.constant(0 : i32) : i32
// _HECK-LABEL: llvm.func @extract_dims( // CHECK: %[[GEP0:.*]] = llvm.getelementptr %[[CAST]][%[[C0]], 7, %[[C0_1]], %[[C0_2]]] : (!llvm.ptr<struct<(ptr<f64>, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>>, i32, i32, i32) -> !llvm.ptr<i64>
// _HECK-SAME: %[[ARG0:.*]]: !llvm.ptr<struct<(ptr<f64>, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}})>>) -> i64 // CHECK: %[[LOAD0:.*]] = llvm.load %[[GEP0]] : !llvm.ptr<i64>
// _HECK: %[[C0_1:.*]] = llvm.mlir.constant(0 : i32) : i32 // CHECK: %[[C1:.*]] = llvm.mlir.constant(1 : i32) : i32
// _HECK: %[[C0:.*]] = llvm.mlir.constant(0 : i32) : i32 // CHECK: %[[GEP1:.*]] = llvm.getelementptr %[[CAST]][%[[C0]], 7, %[[C0_1]], %[[C1]]] : (!llvm.ptr<struct<(ptr<f64>, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>>, i32, i32, i32) -> !llvm.ptr<i64>
// _HECK: %[[CDIMS:.*]] = llvm.mlir.constant(7 : i32) : i32 // CHECK: %[[LOAD1:.*]] = llvm.load %[[GEP1]] : !llvm.ptr<i64>
// _HECK: %[[C0_2:.*]] = llvm.mlir.constant(0 : i32) : i32 // CHECK: %[[C2:.*]] = llvm.mlir.constant(2 : i32) : i32
// _HECK: %[[GEP0:.*]] = llvm.getelementptr %[[ARG0]][%[[C0]], %[[CDIMS]], %[[C0_1]], %[[C0_2]]] : (!llvm.ptr<struct<(ptr<f64>, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}})>>, i32, i32, i32, i32) -> !llvm.ptr<i64> // CHECK: %[[GEP2:.*]] = llvm.getelementptr %[[CAST]][%[[C0]], 7, %[[C0_1]], %[[C2]]] : (!llvm.ptr<struct<(ptr<f64>, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}})>>, i32, i32, i32) -> !llvm.ptr<i64>
// _HECK: %[[LOAD0:.*]] = llvm.load %[[GEP0]] : !llvm.ptr<i64> // CHECK: %[[LOAD2:.*]] = llvm.load %[[GEP2]] : !llvm.ptr<i64>
// _HECK: %[[C1:.*]] = llvm.mlir.constant(1 : i32) : i32 // CHECK: llvm.return %[[LOAD0]] : i64
// _HECK: %[[GEP1:.*]] = llvm.getelementptr %[[ARG0]][%[[C0]], %[[CDIMS]], %[[C0_1]], %[[C1]]] : (!llvm.ptr<struct<(ptr<f64>, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}})>>, i32, i32, i32, i32) -> !llvm.ptr<i64>
// _HECK: %[[LOAD1:.*]] = llvm.load %[[GEP1]] : !llvm.ptr<i64>
// _HECK: %[[C2:.*]] = llvm.mlir.constant(2 : i32) : i32
// _HECK: %[[GEP2:.*]] = llvm.getelementptr %[[ARG0]][%[[C0]], %[[CDIMS]], %[[C0_1]], %[[C2]]] : (!llvm.ptr<struct<(ptr<f64>, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}}, i{{.*}})>>, i32, i32, i32, i32) -> !llvm.ptr<i64>
// _HECK: %[[LOAD2:.*]] = llvm.load %[[GEP2]] : !llvm.ptr<i64>
// _HECK: llvm.return %[[LOAD0]] : i64
// ----- // -----
// Test `fir.box_elesize` conversion. // Test `fir.box_elesize` conversion.
func @extract_elesize(%arg0: !fir.box<f32>) -> i32 { func @extract_elesize(%arg0: !fir.box<f32>) -> i32 {
%0 = fir.box_elesize %arg0 : (!fir.box<f32>) -> i32 %0 = fir.box_elesize %arg0 : (!fir.box<f32>) -> i32
return %0 : i32 return %0 : i32
▲ Show 20 Lines • Show All 1,615 Lines • Show Last 20 Lines