This is an archive of the discontinued LLVM Phabricator instance.

Differential D105554

[mlir] Fix RankedTensorType::walkImmediateSubElements method
ClosedPublic

Authored by vinograd47 on Jul 7 2021, 8:08 AM.

Details

Reviewers
mehdi_amini
rriddle
ftynse
Commits
rGeb6c63cb0b6e: [mlir] Fix RankedTensorType::walkImmediateSubElements method
Summary

Add 'enconding' attribute visitor.
Without it ASM printer doesn't use attribute aliases for 'enconding'.

Diff Detail

Event Timeline

vinograd47 created this revision.Jul 7 2021, 8:08 AM
Herald added subscribers: dcaballe, cota, teijeong and 14 others. · View Herald TranscriptJul 7 2021, 8:08 AM
vinograd47 requested review of this revision.Jul 7 2021, 8:08 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 7 2021, 8:08 AM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
Harbormaster completed remote builds in B112789: Diff 356965.Jul 7 2021, 8:43 AM
rriddle accepted this revision.Jul 12 2021, 10:42 AM
rriddle added inline comments.
mlir/lib/IR/BuiltinTypes.cpp
518–519

Please avoid recalculating the same thing.

This revision is now accepted and ready to land.Jul 12 2021, 10:42 AM
rriddle added a comment.Jul 12 2021, 10:43 AM

LGTM. May be good to add a test for this, e.g. testing assembly format alias generation for the encoding field.

vinograd47 updated this revision to Diff 359557.Jul 17 2021, 5:18 AM

Fixed review remarks.

vinograd47 marked an inline comment as done.Jul 17 2021, 5:19 AM

@rriddle I've fixed your remarks.

Harbormaster completed remote builds in B114681: Diff 359557.Jul 17 2021, 5:53 AM
Closed by commit rGeb6c63cb0b6e: [mlir] Fix RankedTensorType::walkImmediateSubElements method (authored by vinograd47). · Explain WhyJul 26 2021, 1:49 AM
This revision was automatically updated to reflect the committed changes.
vinograd47 added a commit: rGeb6c63cb0b6e: [mlir] Fix RankedTensorType::walkImmediateSubElements method.

Revision Contents

PathSize
mlir/
lib/
IR/
2 lines
test/
IR/
4 lines
lib/
Dialect/
Test/
1 line

Diff 361594

mlir/lib/IR/BuiltinTypes.cpp

Show First 20 Lines • Show All 509 Lines • ▼ Show 20 Lines if (failed(v.verifyEncoding(shape, elementType, emitError)))
return failure(); return failure();
return checkTensorElementType(emitError, elementType); return checkTensorElementType(emitError, elementType);
} }
void RankedTensorType::walkImmediateSubElements( void RankedTensorType::walkImmediateSubElements(
function_ref<void(Attribute)> walkAttrsFn, function_ref<void(Attribute)> walkAttrsFn,
function_ref<void(Type)> walkTypesFn) const { function_ref<void(Type)> walkTypesFn) const {
walkTypesFn(getElementType()); walkTypesFn(getElementType());
if (Attribute encoding = getEncoding())
walkAttrsFn(encoding);
rriddleUnsubmitted
Done
ReplyInline Actions
walkTypesFn(getElementType());
- if (getEncoding())
- walkAttrsFn(getEncoding());
+ if (Attribute encoding = getEncoding())
+ walkAttrsFn(encoding);
}
//===----------------------------------------------------------------------===//

Please avoid recalculating the same thing.

rriddle: Please avoid recalculating the same thing.
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UnrankedTensorType // UnrankedTensorType
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
LogicalResult LogicalResult
UnrankedTensorType::verify(function_ref<InFlightDiagnostic()> emitError, UnrankedTensorType::verify(function_ref<InFlightDiagnostic()> emitError,
▲ Show 20 Lines • Show All 520 Lines • Show Last 20 Lines

mlir/test/IR/print-attr-type-aliases.mlir

Show All 11 Lines
"test.op"() {alias_test = "alias_test:prefixed_digit"} : () -> () "test.op"() {alias_test = "alias_test:prefixed_digit"} : () -> ()
// CHECK-DAG: #test_alias_conflict0_0 = "alias_test:sanitize_conflict_a" // CHECK-DAG: #test_alias_conflict0_0 = "alias_test:sanitize_conflict_a"
// CHECK-DAG: #test_alias_conflict0_1 = "alias_test:sanitize_conflict_b" // CHECK-DAG: #test_alias_conflict0_1 = "alias_test:sanitize_conflict_b"
"test.op"() {alias_test = ["alias_test:sanitize_conflict_a", "alias_test:sanitize_conflict_b"]} : () -> () "test.op"() {alias_test = ["alias_test:sanitize_conflict_a", "alias_test:sanitize_conflict_b"]} : () -> ()
// CHECK-DAG: !tuple = type tuple<i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32> // CHECK-DAG: !tuple = type tuple<i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32>
"test.op"() {alias_test = "alias_test:large_tuple"} : () -> (tuple<i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32>) "test.op"() {alias_test = "alias_test:large_tuple"} : () -> (tuple<i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32>)
// CHECK-DAG: #test_encoding = "alias_test:tensor_encoding"
// CHECK-DAG: tensor<32xf32, #test_encoding>
"test.op"() : () -> tensor<32xf32, "alias_test:tensor_encoding">

mlir/test/lib/Dialect/Test/TestDialect.cpp

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Lines Optional<StringRef> aliasName =
StringSwitch<Optional<StringRef>>(strAttr.getValue()) StringSwitch<Optional<StringRef>>(strAttr.getValue())
.Case("alias_test:dot_in_name", StringRef("test.alias")) .Case("alias_test:dot_in_name", StringRef("test.alias"))
.Case("alias_test:trailing_digit", StringRef("test_alias0")) .Case("alias_test:trailing_digit", StringRef("test_alias0"))
.Case("alias_test:prefixed_digit", StringRef("0_test_alias")) .Case("alias_test:prefixed_digit", StringRef("0_test_alias"))
.Case("alias_test:sanitize_conflict_a", .Case("alias_test:sanitize_conflict_a",
StringRef("test_alias_conflict0")) StringRef("test_alias_conflict0"))
.Case("alias_test:sanitize_conflict_b", .Case("alias_test:sanitize_conflict_b",
StringRef("test_alias_conflict0_")) StringRef("test_alias_conflict0_"))
.Case("alias_test:tensor_encoding", StringRef("test_encoding"))
.Default(llvm::None); .Default(llvm::None);
if (!aliasName) if (!aliasName)
return failure(); return failure();
os << *aliasName; os << *aliasName;
return success(); return success();
} }
▲ Show 20 Lines • Show All 1,006 Lines • Show Last 20 Lines