Fix paddle/cinn/hlir/framework/program.cc var name (#62463)

co63oc · web-flow · commit d8d3d985107e · 2024-03-12T10:16:10.000+08:00
diff --git a/paddle/cinn/hlir/framework/op.h b/paddle/cinn/hlir/framework/op.h
@@ -239,7 +239,7 @@ bool OpValueType<ValueType>::Find(const Operator* op) const {
   static ::cinn::hlir::framework::Operator& __make_##HlirOp##_##OpName
 
 /**
- * @def CINNR_REGISTER_OP
+ * @def CINN_REGISTER_OP
  * \brief Register a new operator, or set attribute of the corresponding op.
  *
  * @param OpName The name of registry
diff --git a/paddle/cinn/hlir/framework/program.cc b/paddle/cinn/hlir/framework/program.cc
@@ -44,22 +44,22 @@ void Program::PreRun(
 
 void Program::Export(const std::vector<std::string>& persistent_vars,
                      const std::string& filename) {
-  auto writeplaceholder = [=](int s, int n, FILE* f) -> int {
+  auto write_placeholder = [=](int s, int n, FILE* f) -> int {
     int pos = ftell(f);
     for (int i = 0; i < s * n; i++) {
       fwrite("\0", 1, 1, f);
     }
     return pos;
   };
-  auto setplaceholder = [=](int p, void* b, int s, int n, FILE* f) {
+  auto set_placeholder = [=](int p, void* b, int s, int n, FILE* f) {
     int cur = ftell(f);
     fseek(f, p, SEEK_SET);
     fwrite(b, s, n, f);
     fseek(f, cur, SEEK_SET);
   };
-  auto tellplaceholder = [=](int p, FILE* f) {
+  auto tell_placeholder = [=](int p, FILE* f) {
     int cur = ftell(f);
-    setplaceholder(p, &cur, 4, 1, f);
+    set_placeholder(p, &cur, 4, 1, f);
   };
   auto padding = [=](int alignment, uint8_t value, FILE* f) {
     int cur = ftell(f);
@@ -69,9 +69,9 @@ void Program::Export(const std::vector<std::string>& persistent_vars,
     }
   };
   auto varnames = scope_->var_names();
-  std::unordered_map<std::string, int> varindex;
+  std::unordered_map<std::string, int> var_index;
   for (int i = 0; i < varnames.size(); i++) {
-    varindex[(std::string)varnames[i]] = i;
+    var_index[(std::string)varnames[i]] = i;
   }
 
   FILE* f = fopen(filename.c_str(), "w+");
@@ -85,87 +85,87 @@ void Program::Export(const std::vector<std::string>& persistent_vars,
   fwrite(&unused_v, 4, 1, f);
 
   // varname list
-  int varnamesec = writeplaceholder(4, 1, f);
-  int namesnum = varnames.size();
-  fwrite(&namesnum, 4, 1, f);
-  int nameoffset = writeplaceholder(4, namesnum, f);
-  for (int i = 0; i < namesnum; i++) {
+  int varname_sec = write_placeholder(4, 1, f);
+  int names_num = varnames.size();
+  fwrite(&names_num, 4, 1, f);
+  int name_offset = write_placeholder(4, names_num, f);
+  for (int i = 0; i < names_num; i++) {
     int namelen = varnames[i].size();
     fwrite(&namelen, 4, 1, f);
-    tellplaceholder(nameoffset + i * 4, f);
+    tell_placeholder(name_offset + i * 4, f);
     fwrite(varnames[i].data(), namelen, 1, f);
     fwrite("\0", 1, 1, f);
   }
   padding(16, 0, f);
-  tellplaceholder(varnamesec, f);
+  tell_placeholder(varname_sec, f);
   // pod_values
-  int buffersec = writeplaceholder(4, 1, f);
-  int bufoffset = writeplaceholder(4, 1, f);
+  int buffer_sec = write_placeholder(4, 1, f);
+  int buf_offset = write_placeholder(4, 1, f);
   padding(alignof(cinn_buffer_t), 0, f);
-  tellplaceholder(bufoffset, f);
-  std::vector<std::pair<cinn_buffer_t*, int>> pvars;
+  tell_placeholder(buf_offset, f);
+  std::vector<std::pair<cinn_buffer_t*, int>> p_vars;
   for (auto& varname : varnames) {
     std::string name = (std::string)varname;
     auto t = scope_->GetTensor(name);
     cinn_buffer_t buffer = *t->buffer();
     buffer.memory = reinterpret_cast<uint8_t*>(0);
     if (std::find(persistent_vars.begin(), persistent_vars.end(), name) !=
         persistent_vars.end()) {
-      pvars.emplace_back(t->buffer(),
-                         ftell(f) + offsetof(cinn_buffer_t, memory));
+      p_vars.emplace_back(t->buffer(),
+                          ftell(f) + offsetof(cinn_buffer_t, memory));
     }
     fwrite(&buffer, sizeof(cinn_buffer_t), 1, f);
   }
   padding(16, 0, f);
-  tellplaceholder(buffersec, f);
+  tell_placeholder(buffer_sec, f);
   // persistent_buffers
-  int pbuffer = writeplaceholder(4, 1, f);
-  for (auto& p : pvars) {
+  int p_buffer = write_placeholder(4, 1, f);
+  for (auto& p : p_vars) {
     if (p.first->align) {
       padding(p.first->align, 0, f);
     }
-    tellplaceholder(p.second, f);
+    tell_placeholder(p.second, f);
     fwrite(p.first->memory, p.first->memory_size, 1, f);
   }
   padding(16, 0, f);
-  tellplaceholder(pbuffer, f);
+  tell_placeholder(p_buffer, f);
   // instructions
-  int instsec = writeplaceholder(4, 1, f);
-  int insnum = 0;
+  int inst_sec = write_placeholder(4, 1, f);
+  int ins_num = 0;
   for (auto& ins : instrs_) {
     ins->Run(nullptr, true);
-    insnum += ins->GetFnNames().size();
+    ins_num += ins->GetFnNames().size();
   }
-  fwrite(&insnum, 4, 1, f);
-  int instplaceholder = writeplaceholder(4 * 3, insnum, f);
-  int findex = 0;
+  fwrite(&ins_num, 4, 1, f);
+  int inst_placeholder = write_placeholder(4 * 3, ins_num, f);
+  int f_index = 0;
   for (auto& ins : instrs_) {
     auto& in_args = ins->GetInArgs();
     auto& out_args = ins->GetOutArgs();
     auto& fn_names = ins->GetFnNames();
-    for (int i = 0; i < fn_names.size(); i++, findex++) {
+    for (int i = 0; i < fn_names.size(); i++, f_index++) {
       std::vector<std::string> all_args(in_args[i].begin(), in_args[i].end());
       all_args.insert(
           std::end(all_args), out_args[i].begin(), out_args[i].end());
-      auto fname = fn_names[i];
-      int fnamesize = fname.size();
-      fwrite(&fnamesize, 4, 1, f);
-      tellplaceholder(instplaceholder + findex * 12, f);
-      fwrite(fname.c_str(), fname.size(), 1, f);
+      auto f_name = fn_names[i];
+      int f_name_size = f_name.size();
+      fwrite(&f_name_size, 4, 1, f);
+      tell_placeholder(inst_placeholder + f_index * 12, f);
+      fwrite(f_name.c_str(), f_name.size(), 1, f);
       fwrite("\0", 1, 1, f);
       int argsize = all_args.size();
-      setplaceholder(instplaceholder + findex * 12 + 4, &argsize, 4, 1, f);
+      set_placeholder(inst_placeholder + f_index * 12 + 4, &argsize, 4, 1, f);
       padding(alignof(cinn_pod_value_t), 0, f);
-      tellplaceholder(instplaceholder + findex * 12 + 8, f);
+      tell_placeholder(inst_placeholder + f_index * 12 + 8, f);
       for (auto& arg : all_args) {
-        uintptr_t bufindex = varindex[arg];
-        cinn_pod_value_t v(reinterpret_cast<cinn_buffer_t*>(bufindex));
+        uintptr_t buf_index = var_index[arg];
+        cinn_pod_value_t v(reinterpret_cast<cinn_buffer_t*>(buf_index));
         fwrite(&v, sizeof(cinn_pod_value_t), 1, f);
       }
     }
   }
   padding(16, 0, f);
-  tellplaceholder(instsec, f);
+  tell_placeholder(inst_sec, f);
   fclose(f);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ bool OpValueType<ValueType>::Find(const Operator* op) const {`
`239`	`239`	`static ::cinn::hlir::framework::Operator& __make_##HlirOp##_##OpName`
`240`	`240`
`241`	`241`	`/**`
`242`		`- * @def CINNR_REGISTER_OP`
	`242`	`+ * @def CINN_REGISTER_OP`
`243`	`243`	`* \brief Register a new operator, or set attribute of the corresponding op.`
`244`	`244`	`*`
`245`	`245`	`* @param OpName The name of registry`