Skip to content

[mlir] Avoid common folder assuming all types are supported #68054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2023
Merged

[mlir] Avoid common folder assuming all types are supported #68054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b7cd8b
[mlir] Avoid common folder assuming all types are supported
jpienaar Oct 2, 2023
da90e7b
Update mlir/test/Dialect/Arith/canonicalize.mlir
jpienaar Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions mlir/include/mlir/Dialect/CommonFolders.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,12 @@ Attribute constFoldBinaryOpConditional(ArrayRef<Attribute> operands,
if (lhs.getType() != rhs.getType())
return {};

auto lhsIt = lhs.value_begin<ElementValueT>();
auto rhsIt = rhs.value_begin<ElementValueT>();
auto maybeLhsIt = lhs.try_value_begin<ElementValueT>();
auto maybeRhsIt = rhs.try_value_begin<ElementValueT>();
if (!maybeLhsIt || !maybeRhsIt)
return {};
auto lhsIt = *maybeLhsIt;
auto rhsIt = *maybeRhsIt;
SmallVector<ElementValueT, 4> elementResults;
elementResults.reserve(lhs.getNumElements());
for (size_t i = 0, e = lhs.getNumElements(); i < e; ++i, ++lhsIt, ++rhsIt) {
Expand Down Expand Up @@ -227,7 +231,10 @@ Attribute constFoldUnaryOpConditional(ArrayRef<Attribute> operands,
// expanding the values.
auto op = cast<ElementsAttr>(operands[0]);

auto opIt = op.value_begin<ElementValueT>();
auto maybeOpIt = op.try_value_begin<ElementValueT>();
if (!maybeOpIt)
return {};
auto opIt = *maybeOpIt;
SmallVector<ElementValueT> elementResults;
elementResults.reserve(op.getNumElements());
for (size_t i = 0, e = op.getNumElements(); i < e; ++i, ++opIt) {
Expand Down Expand Up @@ -293,12 +300,14 @@ Attribute constFoldCastOp(ArrayRef<Attribute> operands, Type resType,
return {};
return DenseElementsAttr::get(cast<ShapedType>(resType), elementResult);
}
if (isa<ElementsAttr>(operands[0])) {
if (auto op = dyn_cast<ElementsAttr>(operands[0])) {
// Operand is ElementsAttr-derived; perform an element-wise fold by
// expanding the value.
auto op = cast<ElementsAttr>(operands[0]);
bool castStatus = true;
auto opIt = op.value_begin<ElementValueT>();
auto maybeOpIt = op.try_value_begin<ElementValueT>();
if (!maybeOpIt)
return {};
auto opIt = *maybeOpIt;
SmallVector<TargetElementValueT> elementResults;
elementResults.reserve(op.getNumElements());
for (size_t i = 0, e = op.getNumElements(); i < e; ++i, ++opIt) {
Expand Down
17 changes: 17 additions & 0 deletions mlir/test/Dialect/Arith/canonicalize.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2669,3 +2669,20 @@ func.func @extsi_poison() -> i64 {
%1 = arith.extsi %0 : i32 to i64
return %1 : i64
}

// Just checks that this doesn't crash.
// CHECK-LABEL: @unsignedExtendConstantResource
func.func @unsignedExtendConstantResource() -> tensor<i16> {
%c2 = arith.constant dense_resource<blob1> : tensor<i8>
%ext = arith.extui %c2 : tensor<i8> to tensor<i16>
return %ext : tensor<i16>
}

{-#
dialect_resources: {
builtin: {
// Note: This is just copied blob, the actual value isn't used or checked.
blob1: "0x08000000010000000000000002000000000000000300000000000000"
}
}
#-}