[Mlir-commits] [mlir] [mlir]: Added properties/attributes ignore flags to OperationEquivalence (PR #141664)
Aviad Cohen
llvmlistbot at llvm.org
Thu May 29 01:44:16 PDT 2025
https://github.com/AviadCo updated https://github.com/llvm/llvm-project/pull/141664
>From dd990cbbc3303712f0daada9d7830eaebd7aa2e9 Mon Sep 17 00:00:00 2001
From: Aviad Cohen <aviad.cohen2 at mobileye.com>
Date: Tue, 27 May 2025 22:41:55 +0300
Subject: [PATCH] [mlir]: Added properties/attributes ignore flags to
OperationEquivalence
Those flags are useful for cases and operation which we may consider
equivalent even when their attributes/properties are not the same.
---
mlir/include/mlir/IR/OperationSupport.h | 9 +++++++-
mlir/lib/IR/OperationSupport.cpp | 24 +++++++++++++++-------
mlir/unittests/IR/OperationSupportTest.cpp | 16 +++++++++++++++
3 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/mlir/include/mlir/IR/OperationSupport.h b/mlir/include/mlir/IR/OperationSupport.h
index 0046d977c68f4..67d171a6da2f7 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 discardable attributes attached to the operation are
+ // ignored.
+ IgnoreDiscardableDictionaryAttrs = 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..eaefb17073e9e 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::IgnoreDiscardableDictionaryAttrs))
+ 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 & IgnoreDiscardableDictionaryAttrs) &&
+ 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..0ae30b28e1c9f 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,25 @@ 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::IgnoreDiscardableDictionaryAttrs),
+ getHash(op2, OperationEquivalence::IgnoreDiscardableDictionaryAttrs));
+ 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();
}
More information about the Mlir-commits
mailing list