[CINN]Fix compilation cache re-use same fn_ptr wrongly (#64718)

Aurelius84 · web-flow · commit a93f26e98718 · 2024-05-30T14:26:42.000+08:00
* [CINN]Fix compilation cache re-use same fn_ptr wrongly

* fix typo
diff --git a/paddle/cinn/hlir/framework/pir/fusion_info.cc b/paddle/cinn/hlir/framework/pir/fusion_info.cc
@@ -93,6 +93,19 @@ std::ostream& operator<<(std::ostream& os, const OperationInfo& op_info) {
   return os;
 }
 
+std::ostream& operator<<(std::ostream& os, const OpDepInfo& info) {
+  os << "dep_op_index: " << info.upstream_index_
+     << ", dep_op_hash: " << info.upstream_hash_;
+  return os;
+}
+
+std::size_t OpDepInfo::hash() const {
+  std::size_t seed = 1789;
+  hash_combine(seed, upstream_index_);
+  hash_combine(seed, upstream_hash_);
+  return seed;
+}
+
 std::size_t FusionOpInfo::hash() const {
   std::size_t seed = op_info_.hash();
   for (const auto& [value_index, op_info_hash] : inner_deps_) {
@@ -107,7 +120,7 @@ std::ostream& operator<<(std::ostream& os, const FusionOpInfo& info) {
   for (const auto& [value_index, op_info_hash] : info.inner_deps_) {
     os << " (" << value_index << ", " << op_info_hash << ")";
   }
-  os << "}";
+  os << "\n hash: " << info.hash() << "}";
   return os;
 }
 
@@ -122,22 +135,23 @@ void FusionInfo::ParseOpInfos(const OpLoweringGroup& group) {
 
   const auto GetInnerUpstreamOps =
       [&](const ::pir::Operation* op) -> decltype(auto) {
-    std::unordered_map<size_t, size_t> upstream_ops_index_hash;
+    std::map<size_t, OpDepInfo> upstream_dep_infos;
     for (size_t i = 0; i < op->num_operands(); ++i) {
       const auto value = op->operand_source(i);
       if (!value || !value.defining_op()) continue;
       const auto* defining_op = value.defining_op();
       if (op_mapper.count(defining_op) == 0) continue;
-      PADDLE_ENFORCE_LT(op_mapper[defining_op],
+      const size_t dep_index = op_mapper[defining_op];
+      PADDLE_ENFORCE_LT(dep_index,
                         this->op_infos_.size(),
                         ::common::errors::OutOfRange(
                             "Required op_mapper[defining_op] < "
                             "op_infos_.size(), but received index %d",
-                            op_mapper[defining_op]));
-      upstream_ops_index_hash.emplace(
-          i, this->op_infos_[op_mapper[defining_op]].hash());
+                            dep_index));
+      upstream_dep_infos.emplace(
+          i, OpDepInfo(dep_index, this->op_infos_[dep_index].hash()));
     }
-    return upstream_ops_index_hash;
+    return upstream_dep_infos;
   };
 
   const auto sorted_ops = TopologySort(group);
diff --git a/paddle/cinn/hlir/framework/pir/fusion_info.h b/paddle/cinn/hlir/framework/pir/fusion_info.h
@@ -58,10 +58,27 @@ class OperationInfo {
   std::vector<AttributeInfo> attr_infos_;
 };
 
+class OpDepInfo {
+ public:
+  OpDepInfo(size_t upstream_index, size_t upstream_hash)
+      : upstream_index_(upstream_index), upstream_hash_(upstream_hash) {}
+  bool operator==(const OpDepInfo &other) {
+    return this->upstream_index_ == other.upstream_index_ &&
+           this->upstream_hash_ == other.upstream_hash_;
+  }
+
+  std::size_t hash() const;
+  friend std::ostream &operator<<(std::ostream &os, const OpDepInfo &info);
+
+ private:
+  size_t upstream_index_;
+  size_t upstream_hash_;
+};
+
 class FusionOpInfo {
  public:
   FusionOpInfo(const ::pir::Operation &op,
-               const std::unordered_map<size_t, size_t> &deps)
+               const std::map<size_t, OpDepInfo> &deps)
       : op_info_(op), inner_deps_(deps) {}
 
   std::size_t hash() const;
@@ -70,7 +87,7 @@ class FusionOpInfo {
  private:
   OperationInfo op_info_;
   // oprand_source id : OperationInfo hash
-  std::unordered_map<size_t, size_t> inner_deps_;
+  std::map<size_t, OpDepInfo> inner_deps_;
 };
 
 class FusionInfo {
@@ -105,6 +122,7 @@ class FusionInfo {
 std::ostream &operator<<(std::ostream &os, const AttributeInfo &info);
 std::ostream &operator<<(std::ostream &os, const ValueInfo &info);
 std::ostream &operator<<(std::ostream &os, const OperationInfo &info);
+std::ostream &operator<<(std::ostream &os, const OpDepInfo &info);
 std::ostream &operator<<(std::ostream &os, const FusionOpInfo &info);
 std::ostream &operator<<(std::ostream &os, const FusionInfo &info);
 
@@ -134,6 +152,7 @@ namespace std {
 REGISTER_STD_HASH(AttributeInfo);
 REGISTER_STD_HASH(ValueInfo);
 REGISTER_STD_HASH(OperationInfo);
+REGISTER_STD_HASH(OpDepInfo)
 REGISTER_STD_HASH(FusionOpInfo);
 REGISTER_STD_HASH(FusionInfo)
 }  // namespace std
diff --git a/paddle/phi/kernels/cpu/accuracy_check_kernel.cc b/paddle/phi/kernels/cpu/accuracy_check_kernel.cc
@@ -20,7 +20,7 @@
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_utils.h"
 
-static constexpr float kAtolValue = 1e-5;
+static constexpr float kAtolValue = 1e-8;
 static constexpr float kRtolValue = 1e-5;
 
 bool allclose(float a, float b) {
@@ -58,7 +58,8 @@ void AccuracyCheckKernel(const Context& ctx,
     if (!allclose(x_cpu.data<T>()[i], y_cpu.data<T>()[i])) {
       check_result = false;
       VLOG(2) << "Accuracy check failed between" << x_cpu.data<T>()[i]
-              << " and " << y_cpu.data<T>()[i];
+              << " and " << y_cpu.data<T>()[i] << " at index= " << i;
+      res_index = i;
       break;
     }
   }
