[PIR+CINN]Improve Value Name readablity (#58749)

Aurelius84 · web-flow · commit 1fdb432faa40 · 2023-11-07T14:34:24.000+08:00
diff --git a/paddle/cinn/common/context.h b/paddle/cinn/common/context.h
@@ -52,6 +52,22 @@ struct NameGenerator {
   mutable std::mutex mutex_;
 };
 
+struct PrettyNamer {
+  const std::string& GetOrNew(const size_t hash_key,
+                              const std::string& name_hint) {
+    if (pretty_names_.find(hash_key) == pretty_names_.end()) {
+      pretty_names_[hash_key] = name_generator_.New(name_hint);
+    }
+    return pretty_names_.at(hash_key);
+  }
+
+  NameGenerator& GetNameGenerator() { return name_generator_; }
+
+ private:
+  absl::flat_hash_map<size_t, std::string> pretty_names_;
+  NameGenerator name_generator_;
+};
+
 class Context {
  public:
   static Context& Global();
@@ -61,10 +77,15 @@ class Context {
    * @param name_hint The prefix.
    */
   std::string NewName(const std::string& name_hint) {
-    return name_generator_.New(name_hint);
+    return pretty_namer_.GetNameGenerator().New(name_hint);
   }
 
-  void ResetNameId() { name_generator_.ResetID(); }
+  std::string PrettyUniqName(const size_t hash_key,
+                             const std::string& name_hint) {
+    return pretty_namer_.GetOrNew(hash_key, name_hint);
+  }
+
+  void ResetNameId() { pretty_namer_.GetNameGenerator().ResetID(); }
 
   const std::vector<std::string>& runtime_include_dir();
 
@@ -82,7 +103,7 @@ class Context {
  private:
   Context() = default;
 
-  NameGenerator name_generator_;
+  PrettyNamer pretty_namer_;
   std::vector<std::string> runtime_include_dir_;
   mutable std::mutex mutex_;
 
diff --git a/paddle/cinn/hlir/framework/pir/utils.cc b/paddle/cinn/hlir/framework/pir/utils.cc
@@ -59,8 +59,9 @@ std::string CompatibleInfo::OpName(const ::pir::Operation& op) {
 }
 
 std::string CompatibleInfo::ValueName(const ::pir::Value& value) {
-  return CompatibleInfo::kNamePrefix +
-         std::to_string(std::hash<::pir::Value>()(value));
+  size_t hash_key = std::hash<::pir::Value>()(value);
+  return cinn::common::Context::Global().PrettyUniqName(
+      hash_key, CompatibleInfo::kNamePrefix);
 }
 
 std::string CompatibleInfo::OpFuncName(const ::pir::Operation& op) {
diff --git a/paddle/cinn/hlir/framework/pir/utils.h b/paddle/cinn/hlir/framework/pir/utils.h
@@ -36,7 +36,7 @@ struct CUDAJITInfo {
 };
 
 struct CompatibleInfo {
-  static constexpr char* kNamePrefix = "var_";
+  static constexpr char* kNamePrefix = "var";
   // TODO(Aurelius): Need add name mapping logic in REGISTER_CINN_OP
   // macros or attempt to unify Op name with Paddle and CINN.
   static const std::unordered_map<std::string, std::string> OP_NAMES;

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,9 @@ std::string CompatibleInfo::OpName(const ::pir::Operation& op) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`std::string CompatibleInfo::ValueName(const ::pir::Value& value) {`
`62`		`- return CompatibleInfo::kNamePrefix +`
`63`		`- std::to_string(std::hash<::pir::Value>()(value));`
	`62`	`+ size_t hash_key = std::hash<::pir::Value>()(value);`
	`63`	`+ return cinn::common::Context::Global().PrettyUniqName(`
	`64`	`+ hash_key, CompatibleInfo::kNamePrefix);`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`std::string CompatibleInfo::OpFuncName(const ::pir::Operation& op) {`