This is an archive of the discontinued LLVM Phabricator instance.

Differential D105379

[mlir] Allow conversion to LLVM for ElementsAttr's with size 0
ClosedPublic

Authored by silvas on Jul 2 2021, 3:55 PM.

Details

Reviewers
ftynse
bondhugula
Commits
rGda289a174fc6: [mlir] Allow conversion to LLVM for ElementsAttr's with size 0
Summary

The code seems to correctly handle the case that this assertion was
guarding.

Diff Detail

Event Timeline

silvas created this revision.Jul 2 2021, 3:55 PM
Herald added subscribers: dcaballe, cota, teijeong and 16 others. · View Herald TranscriptJul 2 2021, 3:55 PM
silvas requested review of this revision.Jul 2 2021, 3:55 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 2 2021, 3:55 PM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
silvas updated this revision to Diff 356289.Jul 2 2021, 3:57 PM

reword

silvas retitled this revision from [mlir] Allow convertion to LLVM for ElementsAttr's with size 0 to [mlir] Allow conversion to LLVM for ElementsAttr's with size 0.Jul 2 2021, 3:57 PM
Harbormaster completed remote builds in B112279: Diff 356289.Jul 2 2021, 4:26 PM
bondhugula accepted this revision.Jul 3 2021, 11:39 AM
This revision is now accepted and ready to land.Jul 3 2021, 11:39 AM
ftynse accepted this revision.Jul 5 2021, 12:36 AM
Closed by commit rGda289a174fc6: [mlir] Allow conversion to LLVM for ElementsAttr's with size 0 (authored by silvas). · Explain WhyJul 7 2021, 11:16 AM
This revision was automatically updated to reflect the committed changes.
silvas added a commit: rGda289a174fc6: [mlir] Allow conversion to LLVM for ElementsAttr's with size 0.

Revision Contents

PathSize
mlir/
lib/
Target/
LLVMIR/
2 lines
test/
Target/
LLVMIR/
4 lines

Diff 357009

mlir/lib/Target/LLVMIR/ModuleTranslation.cpp

Show First 20 Lines • Show All 174 Lines • ▼ Show 20 Lines if (llvmType->isArrayTy()) {
auto *arrayType = llvm::ArrayType::get(elementType, numElements); auto *arrayType = llvm::ArrayType::get(elementType, numElements);
SmallVector<llvm::Constant *, 8> constants(numElements, child); SmallVector<llvm::Constant *, 8> constants(numElements, child);
return llvm::ConstantArray::get(arrayType, constants); return llvm::ConstantArray::get(arrayType, constants);
} }
} }
if (auto elementsAttr = attr.dyn_cast<ElementsAttr>()) { if (auto elementsAttr = attr.dyn_cast<ElementsAttr>()) {
assert(elementsAttr.getType().hasStaticShape()); assert(elementsAttr.getType().hasStaticShape());
assert(elementsAttr.getNumElements() != 0 &&
"unexpected empty elements attribute");
assert(!elementsAttr.getType().getShape().empty() && assert(!elementsAttr.getType().getShape().empty() &&
"unexpected empty elements attribute shape"); "unexpected empty elements attribute shape");
SmallVector<llvm::Constant *, 8> constants; SmallVector<llvm::Constant *, 8> constants;
constants.reserve(elementsAttr.getNumElements()); constants.reserve(elementsAttr.getNumElements());
llvm::Type *innermostType = getInnermostElementType(llvmType); llvm::Type *innermostType = getInnermostElementType(llvmType);
for (auto n : elementsAttr.getValues<Attribute>()) { for (auto n : elementsAttr.getValues<Attribute>()) {
constants.push_back( constants.push_back(
▲ Show 20 Lines • Show All 651 Lines • Show Last 20 Lines

mlir/test/Target/LLVMIR/llvmir.mlir

Show All 12 Lines
llvm.mlir.global internal @i32_global(42: i32) : i32 llvm.mlir.global internal @i32_global(42: i32) : i32
// CHECK: @i32_const = internal constant i53 52 // CHECK: @i32_const = internal constant i53 52
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
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: @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,551 Lines • ▼ Show 20 Lines
// CHECK: ![[GROUP_NODE1]] = distinct !{} // CHECK: ![[GROUP_NODE1]] = distinct !{}
// CHECK: ![[GROUP_NODE2]] = distinct !{} // CHECK: ![[GROUP_NODE2]] = distinct !{}
// CHECK: ![[UNROLL_DISABLE_NODE]] = !{!"llvm.loop.unroll.disable", i1 true} // CHECK: ![[UNROLL_DISABLE_NODE]] = !{!"llvm.loop.unroll.disable", i1 true}
// CHECK: ![[LICM_DISABLE_NODE]] = !{!"llvm.licm.disable", i1 true} // CHECK: ![[LICM_DISABLE_NODE]] = !{!"llvm.licm.disable", i1 true}
// CHECK: ![[INTERLEAVE_NODE]] = !{!"llvm.loop.interleave.count", i32 1} // CHECK: ![[INTERLEAVE_NODE]] = !{!"llvm.loop.interleave.count", i32 1}
// CHECK: ![[PIPELINE_DISABLE_NODE]] = !{!"llvm.loop.pipeline.disable", i1 true} // CHECK: ![[PIPELINE_DISABLE_NODE]] = !{!"llvm.loop.pipeline.disable", i1 true}
// CHECK: ![[II_NODE]] = !{!"llvm.loop.pipeline.initiationinterval", i32 2} // CHECK: ![[II_NODE]] = !{!"llvm.loop.pipeline.initiationinterval", i32 2}
// CHECK: ![[ACCESS_GROUPS_NODE]] = !{![[GROUP_NODE1]], ![[GROUP_NODE2]]} // CHECK: ![[ACCESS_GROUPS_NODE]] = !{![[GROUP_NODE1]], ![[GROUP_NODE2]]}