[clang-tidy] enable performance-inefficient-string-concatenation check (#56647)

gouzil · web-flow · commit 0236771ed157 · 2023-08-29T10:35:49.000+08:00
diff --git a/.clang-tidy b/.clang-tidy
@@ -192,7 +192,7 @@ performance-faster-string-find,
 -performance-for-range-copy,
 -performance-implicit-conversion-in-loop,
 -performance-inefficient-algorithm,
--performance-inefficient-string-concatenation,
+performance-inefficient-string-concatenation,
 -performance-inefficient-vector-operation,
 -performance-move-const-arg,
 -performance-move-constructor-init,
diff --git a/paddle/fluid/framework/ir/fuse_optimizer_ops_pass/fuse_optimizer_op_pass.cc b/paddle/fluid/framework/ir/fuse_optimizer_ops_pass/fuse_optimizer_op_pass.cc
@@ -95,8 +95,14 @@ void FuseOptimizerOpPass::ApplyImpl(ir::Graph *graph) const {
   const std::string prefix(details::kFusedVarNamePrefix);
   for (auto &var_name : aux_var_names) {
     // NOTE: the fused_var_name should be unique.
-    auto fused_var_name = prefix + "_" + fuse_op_type + "_" + var_name + "_" +
-                          aux_var_map[var_name][0];
+    std::string fused_var_name;
+    fused_var_name.append(prefix)
+        .append("_")
+        .append(fuse_op_type)
+        .append("_")
+        .append(var_name)
+        .append("_")
+        .append(aux_var_map[var_name][0]);
     VLOG(6) << var_name << ": " << fused_var_name;
     PADDLE_ENFORCE_EQ(
         fused_var_set.count(fused_var_name),
diff --git a/paddle/fluid/operators/string/faster_tokenizer_op.cc b/paddle/fluid/operators/string/faster_tokenizer_op.cc
@@ -157,7 +157,7 @@ void WordPieceTokenizer::Tokenize(const wstring& text,
     while (start < end) {
       std::wstring sub = text.substr(start, end - start);
       if (start > 0) {
-        sub = L"##" + sub;
+        sub.insert(0, L"##");
       }
       auto it = vocab_->find(sub);
       if (it != vocab_->end()) {
diff --git a/paddle/fluid/platform/profiler.cc b/paddle/fluid/platform/profiler.cc
@@ -815,7 +815,7 @@ std::string OpName(const framework::VariableNameMap &name_map,
   for (const auto &map_item : name_map) {
     auto name_outputs = map_item.second;
     if (!name_outputs.empty()) {
-      ret = ret + name_outputs[0];
+      ret.append(name_outputs[0]);
       break;
     }
   }
@@ -906,7 +906,8 @@ static void EmulateEventPushAndPop(
           evt_stk.push(iter->second);
           std::string prefix = thr_evts[iter->second].name;
           if (!prefix_stk.empty()) {
-            prefix = prefix_stk.top() + "/" + prefix;
+            // prefix = prefix_stk.top() + "/" + prefix;
+            prefix.insert(0, "/").insert(0, prefix_stk.top());
           }
           prefix_stk.push(prefix);
         }
diff --git a/paddle/fluid/pybind/kernel_signature_generator.cc b/paddle/fluid/pybind/kernel_signature_generator.cc
@@ -56,30 +56,28 @@ int main(int argc, char **argv) {  // NOLINT
       }
     }
     if (kernel_signature_map.Has(op_name)) {
-      kernel_signature_map_str =
-          kernel_signature_map_str + "\"" + op_kernel_pair.first + "\":{";
+      kernel_signature_map_str.append("\"")
+          .append(op_kernel_pair.first)
+          .append("\":{");
       const auto &args = kernel_signature_map.Get(op_name);
 
       kernel_signature_map_str += "\"inputs\":[";
       auto inputs_ = args.input_names;
       for (size_t i = 0; i < inputs_.size(); i++) {
-        kernel_signature_map_str =
-            kernel_signature_map_str + "\"" + inputs_[i] + "\",";
+        kernel_signature_map_str.append("\"").append(inputs_[i]).append("\",");
       }
       if (!inputs_.empty()) kernel_signature_map_str.pop_back();
 
       kernel_signature_map_str += "],\"attrs\":[";
       auto attrs_ = args.attr_names;
       for (size_t i = 0; i < attrs_.size(); i++) {
-        kernel_signature_map_str =
-            kernel_signature_map_str + "\"" + attrs_[i] + "\",";
+        kernel_signature_map_str.append("\"").append(attrs_[i]).append("\",");
       }
       if (!attrs_.empty()) kernel_signature_map_str.pop_back();
       kernel_signature_map_str += "],\"outputs\":[";
       auto outputs_ = args.output_names;
       for (size_t i = 0; i < outputs_.size(); i++) {
-        kernel_signature_map_str =
-            kernel_signature_map_str + "\"" + outputs_[i] + "\",";
+        kernel_signature_map_str.append("\"").append(outputs_[i]).append("\",");
       }
 
       if (!outputs_.empty()) kernel_signature_map_str.pop_back();
diff --git a/paddle/phi/backends/device_manager.cc b/paddle/phi/backends/device_manager.cc
@@ -717,7 +717,8 @@ std::vector<std::string> ListAllLibraries(const std::string& library_dir) {
       std::string filename(ptr->d_name);
       if (std::regex_match(
               filename.begin(), filename.end(), results, express)) {
-        libraries.push_back(library_dir + '/' + filename);
+        libraries.push_back(
+            std::string(library_dir).append("/").append(filename));
         VLOG(4) << "Found lib: " << libraries.back();
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void WordPieceTokenizer::Tokenize(const wstring& text,`
`157`	`157`	`while (start < end) {`
`158`	`158`	`std::wstring sub = text.substr(start, end - start);`
`159`	`159`	`if (start > 0) {`
`160`		`- sub = L"##" + sub;`
	`160`	`+ sub.insert(0, L"##");`
`161`	`161`	`}`
`162`	`162`	`auto it = vocab_->find(sub);`
`163`	`163`	`if (it != vocab_->end()) {`
Original file line number	Diff line number	Diff line change
`@@ -815,7 +815,7 @@ std::string OpName(const framework::VariableNameMap &name_map,`
`815`	`815`	`for (const auto &map_item : name_map) {`
`816`	`816`	`auto name_outputs = map_item.second;`
`817`	`817`	`if (!name_outputs.empty()) {`
`818`		`- ret = ret + name_outputs[0];`
	`818`	`+ ret.append(name_outputs[0]);`
`819`	`819`	`break;`
`820`	`820`	`}`
`821`	`821`	`}`
`@@ -906,7 +906,8 @@ static void EmulateEventPushAndPop(`
`906`	`906`	`evt_stk.push(iter->second);`
`907`	`907`	`std::string prefix = thr_evts[iter->second].name;`
`908`	`908`	`if (!prefix_stk.empty()) {`
`909`		`- prefix = prefix_stk.top() + "/" + prefix;`
	`909`	`+ // prefix = prefix_stk.top() + "/" + prefix;`
	`910`	`+ prefix.insert(0, "/").insert(0, prefix_stk.top());`
`910`	`911`	`}`
`911`	`912`	`prefix_stk.push(prefix);`
`912`	`913`	`}`
Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,8 @@ std::vector<std::string> ListAllLibraries(const std::string& library_dir) {`
`717`	`717`	`std::string filename(ptr->d_name);`
`718`	`718`	`if (std::regex_match(`
`719`	`719`	`filename.begin(), filename.end(), results, express)) {`
`720`		`- libraries.push_back(library_dir + '/' + filename);`
	`720`	`+ libraries.push_back(`
	`721`	`+ std::string(library_dir).append("/").append(filename));`
`721`	`722`	`VLOG(4) << "Found lib: " << libraries.back();`
`722`	`723`	`}`
`723`	`724`	`}`