Skip to content

Revert "[mlir]: Added properties/attributes ignore flags to OperationEquivalence" #142319

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 1 commit into from
Jun 1, 2025
Merged

Revert "[mlir]: Added properties/attributes ignore flags to OperationEquivalence" #142319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions mlir/include/mlir/IR/OperationSupport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,14 +1322,7 @@ struct OperationEquivalence {
// When provided, the location attached to the operation are ignored.
IgnoreLocations = 1,

// When provided, the discardable attributes attached to the operation are
// ignored.
IgnoreDiscardableAttrs = 2,

// When provided, the properties attached to the operation are ignored.
IgnoreProperties = 4,

LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue = */ IgnoreProperties)
LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue = */ IgnoreLocations)
};

/// Compute a hash for the given operation.
Expand Down
24 changes: 7 additions & 17 deletions mlir/lib/IR/OperationSupport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,14 +680,9 @@ llvm::hash_code OperationEquivalence::computeHash(
// - Operation Name
// - Attributes
// - Result Types
DictionaryAttr dictAttrs;
if (!(flags & Flags::IgnoreDiscardableAttrs))
dictAttrs = op->getRawDictionaryAttrs();
llvm::hash_code hashProperties;
if (!(flags & Flags::IgnoreProperties))
hashProperties = op->hashProperties();
llvm::hash_code hash = llvm::hash_combine(
op->getName(), dictAttrs, op->getResultTypes(), hashProperties);
llvm::hash_code hash =
llvm::hash_combine(op->getName(), op->getRawDictionaryAttrs(),
op->getResultTypes(), op->hashProperties());

// - Location if required
if (!(flags & Flags::IgnoreLocations))
Expand Down Expand Up @@ -841,19 +836,14 @@ OperationEquivalence::isRegionEquivalentTo(Region *lhs, Region *rhs,
return true;

// 1. Compare the operation properties.
if (!(flags & IgnoreDiscardableAttrs) &&
lhs->getRawDictionaryAttrs() != rhs->getRawDictionaryAttrs())
return false;

if (lhs->getName() != rhs->getName() ||
lhs->getRawDictionaryAttrs() != rhs->getRawDictionaryAttrs() ||
lhs->getNumRegions() != rhs->getNumRegions() ||
lhs->getNumSuccessors() != rhs->getNumSuccessors() ||
lhs->getNumOperands() != rhs->getNumOperands() ||
lhs->getNumResults() != rhs->getNumResults())
return false;
if (!(flags & IgnoreProperties) &&
!(lhs->getName().compareOpProperties(lhs->getPropertiesStorage(),
rhs->getPropertiesStorage())))
lhs->getNumResults() != rhs->getNumResults() ||
!lhs->getName().compareOpProperties(lhs->getPropertiesStorage(),
rhs->getPropertiesStorage()))
return false;
if (!(flags & IgnoreLocations) && lhs->getLoc() != rhs->getLoc())
return false;
Expand Down
25 changes: 0 additions & 25 deletions mlir/unittests/IR/OperationSupportTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,6 @@ TEST(OperandStorageTest, PopulateDefaultAttrs) {
TEST(OperationEquivalenceTest, HashWorksWithFlags) {
MLIRContext context;
context.getOrLoadDialect<test::TestDialect>();
OpBuilder b(&context);

auto *op1 = createOp(&context);
// `op1` has an unknown loc.
Expand All @@ -326,36 +325,12 @@ TEST(OperationEquivalenceTest, HashWorksWithFlags) {
op, OperationEquivalence::ignoreHashValue,
OperationEquivalence::ignoreHashValue, flags);
};
// Check ignore location.
EXPECT_EQ(getHash(op1, OperationEquivalence::IgnoreLocations),
getHash(op2, OperationEquivalence::IgnoreLocations));
EXPECT_NE(getHash(op1, OperationEquivalence::None),
getHash(op2, OperationEquivalence::None));
op1->setLoc(NameLoc::get(StringAttr::get(&context, "foo")));
// Check ignore discardable dictionary attributes.
SmallVector<NamedAttribute> newAttrs = {
b.getNamedAttr("foo", b.getStringAttr("f"))};
op1->setAttrs(newAttrs);
EXPECT_EQ(getHash(op1, OperationEquivalence::IgnoreDiscardableAttrs),
getHash(op2, OperationEquivalence::IgnoreDiscardableAttrs));
EXPECT_NE(getHash(op1, OperationEquivalence::None),
getHash(op2, OperationEquivalence::None));
op1->destroy();
op2->destroy();

// Check ignore properties.
auto req1 = b.getI32IntegerAttr(10);
Operation *opWithProperty1 = b.create<test::OpAttrMatch1>(
b.getUnknownLoc(), req1, nullptr, nullptr, req1);
auto req2 = b.getI32IntegerAttr(60);
Operation *opWithProperty2 = b.create<test::OpAttrMatch1>(
b.getUnknownLoc(), req2, nullptr, nullptr, req2);
EXPECT_NE(getHash(op1, OperationEquivalence::None),
getHash(op2, OperationEquivalence::None));
EXPECT_EQ(getHash(opWithProperty1, OperationEquivalence::IgnoreProperties),
getHash(opWithProperty2, OperationEquivalence::IgnoreProperties));
opWithProperty1->destroy();
opWithProperty2->destroy();
}

} // namespace
Loading