This is an archive of the discontinued LLVM Phabricator instance.

Differential D112208

[mlir] Fix a crash when creating a 1d zero element LLVM constant
ClosedPublic

Authored by bkramer on Oct 21 2021, 2:58 AM.

Details

Reviewers
ftynse
Commits
rG898e80964c95: [mlir] Fix a crash when creating a 1d zero element LLVM constant
Summary

Fixes a regression introduced in f9be7a7afda3c90b99c9f50e5eff1624da5a6511

Diff Detail

Event Timeline

bkramer created this revision.Oct 21 2021, 2:58 AM
Herald added subscribers: wenzhicui, wrengr, Chia-hungDuan and 19 others. · View Herald TranscriptOct 21 2021, 2:58 AM
bkramer requested review of this revision.Oct 21 2021, 2:58 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 21 2021, 2:58 AM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
Harbormaster completed remote builds in B129893: Diff 381186.Oct 21 2021, 3:10 AM
ftynse accepted this revision.Oct 21 2021, 3:44 AM
This revision is now accepted and ready to land.Oct 21 2021, 3:44 AM
Closed by commit rG898e80964c95: [mlir] Fix a crash when creating a 1d zero element LLVM constant (authored by bkramer). · Explain WhyOct 21 2021, 3:56 AM
This revision was automatically updated to reflect the committed changes.
bkramer added a commit: rG898e80964c95: [mlir] Fix a crash when creating a 1d zero element LLVM constant.

Revision Contents

PathSize
mlir/
lib/
Target/
LLVMIR/
5 lines
test/
Target/
LLVMIR/
3 lines

Diff 381206

mlir/lib/Target/LLVMIR/ModuleTranslation.cpp

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 LinesconvertDenseElementsAttr(Location loc, DenseElementsAttr denseElementsAttr,
const ModuleTranslation &moduleTranslation) { const ModuleTranslation &moduleTranslation) {
if (!denseElementsAttr) if (!denseElementsAttr)
return nullptr; return nullptr;
llvm::Type *innermostLLVMType = getInnermostElementType(llvmType); llvm::Type *innermostLLVMType = getInnermostElementType(llvmType);
if (!llvm::ConstantDataSequential::isElementTypeCompatible(innermostLLVMType)) if (!llvm::ConstantDataSequential::isElementTypeCompatible(innermostLLVMType))
return nullptr; return nullptr;
ShapedType type = denseElementsAttr.getType();
if (type.getNumElements() == 0)
return nullptr;
// Compute the shape of all dimensions but the innermost. Note that the // Compute the shape of all dimensions but the innermost. Note that the
// innermost dimension may be that of the vector element type. // innermost dimension may be that of the vector element type.
ShapedType type = denseElementsAttr.getType();
bool hasVectorElementType = type.getElementType().isa<VectorType>(); bool hasVectorElementType = type.getElementType().isa<VectorType>();
unsigned numAggregates = unsigned numAggregates =
denseElementsAttr.getNumElements() / denseElementsAttr.getNumElements() /
(hasVectorElementType ? 1 (hasVectorElementType ? 1
: denseElementsAttr.getType().getShape().back()); : denseElementsAttr.getType().getShape().back());
ArrayRef<int64_t> outerShape = type.getShape(); ArrayRef<int64_t> outerShape = type.getShape();
if (!hasVectorElementType) if (!hasVectorElementType)
outerShape = outerShape.drop_back(); outerShape = outerShape.drop_back();
▲ Show 20 Lines • Show All 907 Lines • Show Last 20 Lines

mlir/test/Target/LLVMIR/llvmir.mlir

Show All 15 Lines
llvm.mlir.global internal constant @i32_const(52: i53) : i53 llvm.mlir.global internal constant @i32_const(52: i53) : i53
// CHECK: @int_global_array = internal global [3 x i32] [i32 62, i32 62, i32 62] // CHECK: @int_global_array = internal global [3 x i32] [i32 62, i32 62, i32 62]
llvm.mlir.global internal @int_global_array(dense<62> : vector<3xi32>) : !llvm.array<3 x i32> llvm.mlir.global internal @int_global_array(dense<62> : vector<3xi32>) : !llvm.array<3 x i32>
// CHECK: @int_global_array_zero_elements = internal constant [3 x [0 x [4 x float]]] zeroinitializer // CHECK: @int_global_array_zero_elements = internal constant [3 x [0 x [4 x float]]] zeroinitializer
llvm.mlir.global internal constant @int_global_array_zero_elements(dense<> : tensor<3x0x4xf32>) : !llvm.array<3 x array<0 x array<4 x f32>>> llvm.mlir.global internal constant @int_global_array_zero_elements(dense<> : tensor<3x0x4xf32>) : !llvm.array<3 x array<0 x array<4 x f32>>>
// CHECK: @int_global_array_zero_elements_1d = internal constant [0 x float] zeroinitializer
llvm.mlir.global internal constant @int_global_array_zero_elements_1d(dense<> : tensor<0xf32>) : !llvm.array<0 x f32>
// CHECK: @i32_global_addr_space = internal addrspace(7) global i32 62 // CHECK: @i32_global_addr_space = internal addrspace(7) global i32 62
llvm.mlir.global internal @i32_global_addr_space(62: i32) {addr_space = 7 : i32} : i32 llvm.mlir.global internal @i32_global_addr_space(62: i32) {addr_space = 7 : i32} : i32
// CHECK: @float_global = internal global float 0.000000e+00 // CHECK: @float_global = internal global float 0.000000e+00
llvm.mlir.global internal @float_global(0.0: f32) : f32 llvm.mlir.global internal @float_global(0.0: f32) : f32
// CHECK: @float_global_array = internal global [1 x float] [float -5.000000e+00] // CHECK: @float_global_array = internal global [1 x float] [float -5.000000e+00]
llvm.mlir.global internal @float_global_array(dense<[-5.0]> : vector<1xf32>) : !llvm.array<1 x f32> llvm.mlir.global internal @float_global_array(dense<[-5.0]> : vector<1xf32>) : !llvm.array<1 x f32>
▲ Show 20 Lines • Show All 1,634 Lines • Show Last 20 Lines