This is an archive of the discontinued LLVM Phabricator instance.

Differential D85300

[mlir] Fix rank bitwidth in UnrankedMemRefType conversion.
ClosedPublic

Authored by pifon2a on Aug 5 2020, 6:30 AM.

Details

Reviewers
ftynse
herhut
Commits
rGbc7456fd8a11: [mlir] Fix rank bitwidth in UnrankedMemRefType conversion.

Diff Detail

Event Timeline

pifon2a created this revision.Aug 5 2020, 6:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 5 2020, 6:30 AM
Herald added subscribers: msifontes, jurahul, Kayjukh and 12 others. · View Herald Transcript
pifon2a requested review of this revision.Aug 5 2020, 6:30 AM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald TranscriptAug 5 2020, 6:30 AM
pifon2a mentioned this in D85273: [mlir] Lower RankOp to LLVM for unranked memrefs..Aug 5 2020, 6:31 AM
ftynse accepted this revision.Aug 5 2020, 6:41 AM

Thanks for fixing this!

This revision is now accepted and ready to land.Aug 5 2020, 6:41 AM
Harbormaster completed remote builds in B67086: Diff 283215.Aug 5 2020, 6:45 AM
Closed by commit rGbc7456fd8a11: [mlir] Fix rank bitwidth in UnrankedMemRefType conversion. (authored by pifon2a). · Explain WhyAug 5 2020, 9:35 AM
This revision was automatically updated to reflect the committed changes.
pifon2a added a commit: rGbc7456fd8a11: [mlir] Fix rank bitwidth in UnrankedMemRefType conversion..

Revision Contents

PathSize
mlir/
lib/
Conversion/
StandardToLLVM/
2 lines
test/
Conversion/
StandardToLLVM/
2 lines

Diff 283215

mlir/lib/Conversion/StandardToLLVM/StandardToLLVM.cpp

Show First 20 Lines • Show All 394 Lines • ▼ Show 20 Lines
// 2. void* ptr, pointer to the static ranked MemRef descriptor. This will be // 2. void* ptr, pointer to the static ranked MemRef descriptor. This will be
// stack allocated (alloca) copy of a MemRef descriptor that got casted to // stack allocated (alloca) copy of a MemRef descriptor that got casted to
// be unranked. // be unranked.
static constexpr unsigned kRankInUnrankedMemRefDescriptor = 0; static constexpr unsigned kRankInUnrankedMemRefDescriptor = 0;
static constexpr unsigned kPtrInUnrankedMemRefDescriptor = 1; static constexpr unsigned kPtrInUnrankedMemRefDescriptor = 1;
Type LLVMTypeConverter::convertUnrankedMemRefType(UnrankedMemRefType type) { Type LLVMTypeConverter::convertUnrankedMemRefType(UnrankedMemRefType type) {
auto rankTy = LLVM::LLVMType::getInt64Ty(llvmDialect); auto rankTy = getIndexType();
auto ptrTy = LLVM::LLVMType::getInt8PtrTy(llvmDialect); auto ptrTy = LLVM::LLVMType::getInt8PtrTy(llvmDialect);
return LLVM::LLVMType::getStructTy(rankTy, ptrTy); return LLVM::LLVMType::getStructTy(rankTy, ptrTy);
} }
// Convert an n-D vector type to an LLVM vector type via (n-1)-D array type when // Convert an n-D vector type to an LLVM vector type via (n-1)-D array type when
// n > 1. // n > 1.
// For example, `vector<4 x f32>` converts to `!llvm.type<"<4 x float>">` and // For example, `vector<4 x f32>` converts to `!llvm.type<"<4 x float>">` and
// `vector<4 x 8 x 16 f32>` converts to `!llvm<"[4 x [8 x <16 x float>]]">`. // `vector<4 x 8 x 16 f32>` converts to `!llvm<"[4 x [8 x <16 x float>]]">`.
▲ Show 20 Lines • Show All 3,025 Lines • Show Last 20 Lines

mlir/test/Conversion/StandardToLLVM/convert-to-llvmir.mlir

Show First 20 Lines • Show All 1,320 Lines • ▼ Show 20 Lines
func @rank_of_unranked(%unranked: memref<*xi32>) { func @rank_of_unranked(%unranked: memref<*xi32>) {
%rank = rank %unranked : memref<*xi32> %rank = rank %unranked : memref<*xi32>
return return
} }
// CHECK-NEXT: llvm.mlir.undef // CHECK-NEXT: llvm.mlir.undef
// CHECK-NEXT: llvm.insertvalue // CHECK-NEXT: llvm.insertvalue
// CHECK-NEXT: llvm.insertvalue // CHECK-NEXT: llvm.insertvalue
// CHECK-NEXT: llvm.extractvalue %{{.*}}[0] : !llvm.struct<(i64, ptr<i8>)> // CHECK-NEXT: llvm.extractvalue %{{.*}}[0] : !llvm.struct<(i64, ptr<i8>)>
// CHECK32: llvm.extractvalue %{{.*}}[0] : !llvm.struct<(i64, ptr<i8>)> // CHECK32: llvm.extractvalue %{{.*}}[0] : !llvm.struct<(i32, ptr<i8>)>
// CHECK-LABEL: func @rank_of_ranked // CHECK-LABEL: func @rank_of_ranked
// CHECK32-LABEL: func @rank_of_ranked // CHECK32-LABEL: func @rank_of_ranked
func @rank_of_ranked(%ranked: memref<?xi32>) { func @rank_of_ranked(%ranked: memref<?xi32>) {
%rank = rank %ranked : memref<?xi32> %rank = rank %ranked : memref<?xi32>
return return
} }
// CHECK: llvm.mlir.constant(1 : index) : !llvm.i64 // CHECK: llvm.mlir.constant(1 : index) : !llvm.i64
// CHECK32: llvm.mlir.constant(1 : index) : !llvm.i32 // CHECK32: llvm.mlir.constant(1 : index) : !llvm.i32