singleton

PaddlePaddle · Nov 24, 2023 · c7faa30 · c7faa30
1 parent dd7b281
commit c7faa30
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/paddle/pir/core/operation.cc b/paddle/pir/core/operation.cc
@@ -31,6 +31,8 @@ using detail::OpOperandImpl;
 using detail::OpOutlineResultImpl;
 using detail::OpResultImpl;
 
+uint64_t Operation::uid_ = 0;
+
 Operation *Operation::Create(OperationArgument &&argument) {
   Operation *op = Create(argument.inputs,
                          argument.attributes,
@@ -130,6 +132,7 @@ Operation *Operation::Create(const std::vector<Value> &inputs,
       throw e;
     }
   }
+  uid_++;
   return op;
 }
 

diff --git a/paddle/pir/core/operation.h b/paddle/pir/core/operation.h
@@ -175,6 +175,8 @@ class IR_API alignas(8) Operation final {
 
   void Verify();
 
+  static uint64_t id() { return uid_; }
+
  private:
   DISABLE_COPY_AND_ASSIGN(Operation);
   Operation(const AttributeMap &attribute,
@@ -216,6 +218,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;
+  static uint64_t uid_;
 
   detail::BlockOperandImpl *block_operands_{nullptr};
   Region *regions_{nullptr};

diff --git a/paddle/pir/dialect/shape/utils/shape_utils.cc b/paddle/pir/dialect/shape/utils/shape_utils.cc
@@ -139,13 +139,13 @@ ShapeAnalysisManager& ShapeAnalysisManager::Instance() {
   return instance;
 }
 
-ShapeConstraintIRAnalysis& ShapeAnalysisManager::GetShapeConstraintIRAnalysis(
-    pir::Program* program) {
-  auto it = tables_.find(program);
+ShapeConstraintIRAnalysis& ShapeAnalysisManager::Get(pir::Program* program) {
+  auto it = tables_.find(program->module_op().operation()->id());
 
   if (it == tables_.end()) {
     it = tables_
-             .emplace(program, ShapeConstraintIRAnalysis(program->module_op()))
+             .emplace(program->module_op().operation()->id(),
+                      ShapeConstraintIRAnalysis(program->module_op()))
              .first;
   }
 

diff --git a/paddle/pir/dialect/shape/utils/shape_utils.h b/paddle/pir/dialect/shape/utils/shape_utils.h
@@ -82,12 +82,11 @@ class IR_API ShapeConstraintIRAnalysis : public ShapeAnalysis {
 class IR_API ShapeAnalysisManager {
  public:
   static ShapeAnalysisManager& Instance();
-  ShapeConstraintIRAnalysis& GetShapeConstraintIRAnalysis(
-      pir::Program* program);
+  ShapeConstraintIRAnalysis& Get(pir::Program* program);
 
  private:
   ShapeAnalysisManager() {}
-  std::unordered_map<pir::Program*, ShapeConstraintIRAnalysis> tables_;
+  std::unordered_map<uint64_t, ShapeConstraintIRAnalysis> tables_;
 };
 
 }  // namespace pir