[PIR] adjust the value == function. (#61346)

winter-wang · web-flow · commit f0451cfe618f · 2024-01-31T10:41:13.000+08:00
diff --git a/paddle/pir/core/operation.h b/paddle/pir/core/operation.h
@@ -277,7 +277,7 @@ class IR_API alignas(8) Operation final
   const uint32_t num_operands_ = 0;
   const uint32_t num_regions_ = 0;
   const uint32_t num_successors_ = 0;
-  const uint64_t id_ = 0;
+  const uint64_t id_;
 
   detail::BlockOperandImpl *block_operands_{nullptr};
   Region *regions_{nullptr};
diff --git a/paddle/pir/core/value.cc b/paddle/pir/core/value.cc
@@ -31,11 +31,12 @@
 
 namespace pir {
 bool Value::operator==(const Value &other) const {
-  return impl_ == other.impl_;
+  return impl_ == other.impl_ &&
+         (impl_ == nullptr || impl_->id() == other.impl_->id());
 }
 
 bool Value::operator!=(const Value &other) const {
-  return impl_ != other.impl_;
+  return !(operator==(other));
 }
 
 bool Value::operator!() const { return impl_ == nullptr; }
diff --git a/paddle/pir/core/value_impl.cc b/paddle/pir/core/value_impl.cc
@@ -13,6 +13,12 @@
 // limitations under the License.
 #include "paddle/pir/core/value_impl.h"
 
+namespace {
+uint64_t GenerateId() {
+  static std::atomic<std::uint64_t> uid{0};
+  return ++uid;
+}
+}  // namespace
 namespace pir {
 
 namespace detail {
@@ -40,7 +46,7 @@ std::string ValueImpl::PrintUdChain() {
   result << "nullptr";
   return result.str();
 }
-ValueImpl::ValueImpl(Type type, uint32_t kind) {
+ValueImpl::ValueImpl(Type type, uint32_t kind) : id_(GenerateId()) {
   if (kind > BLOCK_ARG_IDX) {
     LOG(FATAL) << "The kind of value_impl(" << kind
                << "), is bigger than BLOCK_ARG_IDX(7)";
diff --git a/paddle/pir/core/value_impl.h b/paddle/pir/core/value_impl.h
@@ -71,6 +71,8 @@ class alignas(8) ValueImpl {
     return T::classof(*this);
   }
 
+  uint64_t id() const { return id_; }
+
  protected:
   ///
   /// \brief Only can be constructed by derived classes such as OpResultImpl.
@@ -92,6 +94,8 @@ class alignas(8) ValueImpl {
   /// outline output(OpOutlineResultImpl); (3) index = 7 is reserved.
   ///
   OpOperandImpl *first_use_offseted_by_kind_ = nullptr;
+
+  const uint64_t id_ = 0;
 };
 
 }  // namespace detail

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,12 @@`
`31`	`31`
`32`	`32`	`namespace pir {`
`33`	`33`	`bool Value::operator==(const Value &other) const {`
`34`		`- return impl_ == other.impl_;`
	`34`	`+ return impl_ == other.impl_ &&`
	`35`	`+ (impl_ == nullptr \|\| impl_->id() == other.impl_->id());`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`bool Value::operator!=(const Value &other) const {`
`38`		`- return impl_ != other.impl_;`
	`39`	`+ return !(operator==(other));`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`bool Value::operator!() const { return impl_ == nullptr; }`