[mlir]: Added properties/attributes ignore flags to OperationEquivalence #141664
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
@llvm/pr-subscribers-mlir Author: Aviad Cohen (AviadCo) ChangesThose flags are useful for cases and operation which we may consider equivalent even when their attributes/properties are not the same. Full diff: https://github.com/llvm/llvm-project/pull/141664.diff 3 Files Affected:
diff --git a/mlir/include/mlir/IR/OperationSupport.h b/mlir/include/mlir/IR/OperationSupport.h
index 0046d977c68f4..c9d902514a66b 100644
--- a/mlir/include/mlir/IR/OperationSupport.h
+++ b/mlir/include/mlir/IR/OperationSupport.h
@@ -1322,7 +1322,14 @@ struct OperationEquivalence {
// When provided, the location attached to the operation are ignored.
IgnoreLocations = 1,
- LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue = */ IgnoreLocations)
+ // When provided, the dictionary attributes attached to the operation are
+ // ignored.
+ IgnoreDictionaryAttrs = 2,
+
+ // When provided, the properties attached to the operation are ignored.
+ IgnoreProperties = 4,
+
+ LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue = */ IgnoreProperties)
};
/// Compute a hash for the given operation.
diff --git a/mlir/lib/IR/OperationSupport.cpp b/mlir/lib/IR/OperationSupport.cpp
index 7c9e6c89d4d8e..cd0611e741eb3 100644
--- a/mlir/lib/IR/OperationSupport.cpp
+++ b/mlir/lib/IR/OperationSupport.cpp
@@ -680,9 +680,14 @@ llvm::hash_code OperationEquivalence::computeHash(
// - Operation Name
// - Attributes
// - Result Types
- llvm::hash_code hash =
- llvm::hash_combine(op->getName(), op->getRawDictionaryAttrs(),
- op->getResultTypes(), op->hashProperties());
+ DictionaryAttr dictAttrs;
+ if (!(flags & Flags::IgnoreDictionaryAttrs))
+ 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);
// - Location if required
if (!(flags & Flags::IgnoreLocations))
@@ -836,14 +841,19 @@ OperationEquivalence::isRegionEquivalentTo(Region *lhs, Region *rhs,
return true;
// 1. Compare the operation properties.
+ if (!(flags & IgnoreDictionaryAttrs) &&
+ 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() ||
- !lhs->getName().compareOpProperties(lhs->getPropertiesStorage(),
- rhs->getPropertiesStorage()))
+ lhs->getNumResults() != rhs->getNumResults())
+ return false;
+ if (!(flags & IgnoreProperties) &&
+ !(lhs->getName().compareOpProperties(lhs->getPropertiesStorage(),
+ rhs->getPropertiesStorage())))
return false;
if (!(flags & IgnoreLocations) && lhs->getLoc() != rhs->getLoc())
return false;
diff --git a/mlir/unittests/IR/OperationSupportTest.cpp b/mlir/unittests/IR/OperationSupportTest.cpp
index bac2b72b68deb..30fe44d49f5cb 100644
--- a/mlir/unittests/IR/OperationSupportTest.cpp
+++ b/mlir/unittests/IR/OperationSupportTest.cpp
@@ -314,6 +314,7 @@ TEST(OperandStorageTest, PopulateDefaultAttrs) {
TEST(OperationEquivalenceTest, HashWorksWithFlags) {
MLIRContext context;
+ Builder b(&context);
context.getOrLoadDialect<test::TestDialect>();
auto *op1 = createOp(&context);
@@ -325,10 +326,24 @@ 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));
+ // Check ignore dictionary attributes.
+ op1->setLoc(NameLoc::get(StringAttr::get(&context, "foo")));
+ EXPECT_EQ(getHash(op1, OperationEquivalence::IgnoreDictionaryAttrs),
+ getHash(op2, OperationEquivalence::IgnoreDictionaryAttrs));
+ SmallVector<NamedAttribute> newAttrs = {
+ b.getNamedAttr("foo", b.getStringAttr("f"))};
+ op1->setAttrs(newAttrs);
+ EXPECT_NE(getHash(op1, OperationEquivalence::None),
+ getHash(op2, OperationEquivalence::None));
+ op2->setAttrs(newAttrs);
+ // Check ignore properties.
+ EXPECT_EQ(getHash(op1, OperationEquivalence::IgnoreProperties),
+ getHash(op2, OperationEquivalence::IgnoreProperties));
op1->destroy();
op2->destroy();
}
|
Member
|
@llvm/pr-subscribers-mlir-core Author: Aviad Cohen (AviadCo) ChangesThose flags are useful for cases and operation which we may consider equivalent even when their attributes/properties are not the same. Full diff: https://github.com/llvm/llvm-project/pull/141664.diff 3 Files Affected:
diff --git a/mlir/include/mlir/IR/OperationSupport.h b/mlir/include/mlir/IR/OperationSupport.h
index 0046d977c68f4..c9d902514a66b 100644
--- a/mlir/include/mlir/IR/OperationSupport.h
+++ b/mlir/include/mlir/IR/OperationSupport.h
@@ -1322,7 +1322,14 @@ struct OperationEquivalence {
// When provided, the location attached to the operation are ignored.
IgnoreLocations = 1,
- LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue = */ IgnoreLocations)
+ // When provided, the dictionary attributes attached to the operation are
+ // ignored.
+ IgnoreDictionaryAttrs = 2,
+
+ // When provided, the properties attached to the operation are ignored.
+ IgnoreProperties = 4,
+
+ LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue = */ IgnoreProperties)
};
/// Compute a hash for the given operation.
diff --git a/mlir/lib/IR/OperationSupport.cpp b/mlir/lib/IR/OperationSupport.cpp
index 7c9e6c89d4d8e..cd0611e741eb3 100644
--- a/mlir/lib/IR/OperationSupport.cpp
+++ b/mlir/lib/IR/OperationSupport.cpp
@@ -680,9 +680,14 @@ llvm::hash_code OperationEquivalence::computeHash(
// - Operation Name
// - Attributes
// - Result Types
- llvm::hash_code hash =
- llvm::hash_combine(op->getName(), op->getRawDictionaryAttrs(),
- op->getResultTypes(), op->hashProperties());
+ DictionaryAttr dictAttrs;
+ if (!(flags & Flags::IgnoreDictionaryAttrs))
+ 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);
// - Location if required
if (!(flags & Flags::IgnoreLocations))
@@ -836,14 +841,19 @@ OperationEquivalence::isRegionEquivalentTo(Region *lhs, Region *rhs,
return true;
// 1. Compare the operation properties.
+ if (!(flags & IgnoreDictionaryAttrs) &&
+ 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() ||
- !lhs->getName().compareOpProperties(lhs->getPropertiesStorage(),
- rhs->getPropertiesStorage()))
+ lhs->getNumResults() != rhs->getNumResults())
+ return false;
+ if (!(flags & IgnoreProperties) &&
+ !(lhs->getName().compareOpProperties(lhs->getPropertiesStorage(),
+ rhs->getPropertiesStorage())))
return false;
if (!(flags & IgnoreLocations) && lhs->getLoc() != rhs->getLoc())
return false;
diff --git a/mlir/unittests/IR/OperationSupportTest.cpp b/mlir/unittests/IR/OperationSupportTest.cpp
index bac2b72b68deb..30fe44d49f5cb 100644
--- a/mlir/unittests/IR/OperationSupportTest.cpp
+++ b/mlir/unittests/IR/OperationSupportTest.cpp
@@ -314,6 +314,7 @@ TEST(OperandStorageTest, PopulateDefaultAttrs) {
TEST(OperationEquivalenceTest, HashWorksWithFlags) {
MLIRContext context;
+ Builder b(&context);
context.getOrLoadDialect<test::TestDialect>();
auto *op1 = createOp(&context);
@@ -325,10 +326,24 @@ 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));
+ // Check ignore dictionary attributes.
+ op1->setLoc(NameLoc::get(StringAttr::get(&context, "foo")));
+ EXPECT_EQ(getHash(op1, OperationEquivalence::IgnoreDictionaryAttrs),
+ getHash(op2, OperationEquivalence::IgnoreDictionaryAttrs));
+ SmallVector<NamedAttribute> newAttrs = {
+ b.getNamedAttr("foo", b.getStringAttr("f"))};
+ op1->setAttrs(newAttrs);
+ EXPECT_NE(getHash(op1, OperationEquivalence::None),
+ getHash(op2, OperationEquivalence::None));
+ op2->setAttrs(newAttrs);
+ // Check ignore properties.
+ EXPECT_EQ(getHash(op1, OperationEquivalence::IgnoreProperties),
+ getHash(op2, OperationEquivalence::IgnoreProperties));
op1->destroy();
op2->destroy();
}
|
joker-eph
reviewed
May 27, 2025
krzysz00
reviewed
May 28, 2025
krzysz00
reviewed
May 29, 2025
Contributor
krzysz00
left a comment
krzysz00
left a comment
There was a problem hiding this comment.
Main comment is test coverage
Those flags are useful for cases and operation which we may consider equivalent even when their attributes/properties are not the same.
krzysz00
approved these changes
May 30, 2025
Contributor
krzysz00
left a comment
krzysz00
left a comment
There was a problem hiding this comment.
Approved, thank you. Do you need a merge?
Contributor
Author
Thanks for the review! I will land it. |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/24/builds/9000 Here is the relevant piece of the build log for the reference |
Collaborator
|
There are multiple bots broken on this patch like this Even with #142210 |
vitalybuka
added a commit
that referenced
this pull request
Jun 1, 2025
…Equivalence" (#142319) Reverts #141664 See #141664 (comment)
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Jun 1, 2025
…o OperationEquivalence" (#142319) Reverts llvm/llvm-project#141664 See llvm/llvm-project#141664 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Those flags are useful for cases and operation which we may consider equivalent even when their attributes/properties are not the same.