Rename tracer_mkldnn_ops_on tracer_onednn_ops_on(#63201)

co63oc · web-flow · commit 27a35322306b · 2024-04-08T12:03:25.000+08:00
diff --git a/paddle/common/flags.cc b/paddle/common/flags.cc
@@ -741,13 +741,13 @@ PHI_DEFINE_EXPORTED_bool(set_to_1d, false, "set 0D Tensor to 1D numpy");
 
 /**
  * Debug related FLAG
- * Name: tracer_mkldnn_ops_on
+ * Name: tracer_onednn_ops_on
  * Since Version: 2.0.0
  * Value Range: string, default=empty
  * Example:
  * Note: Holds list of operation types with OneDNN kernels to be enabled.
  */
-PHI_DEFINE_EXPORTED_string(tracer_mkldnn_ops_on,
+PHI_DEFINE_EXPORTED_string(tracer_onednn_ops_on,
                            "",
                            "List of OneDNN operation types to be turned on");
 
@@ -765,13 +765,13 @@ PHI_DEFINE_EXPORTED_string(static_runtime_data_save_path,
 
 /**
  * Debug related FLAG
- * Name: tracer_mkldnn_ops_off
+ * Name: tracer_onednn_ops_off
  * Since Version: 2.0.0
  * Value Range: string, default=empty
  * Example:
  * Note: Holds list of operation types with OneDNN kernels to be disabled.
  */
-PHI_DEFINE_EXPORTED_string(tracer_mkldnn_ops_off,
+PHI_DEFINE_EXPORTED_string(tracer_onednn_ops_off,
                            "",
                            "List of OneDNN operation types to be turned off");
 
diff --git a/paddle/fluid/imperative/tracer.cc b/paddle/fluid/imperative/tracer.cc
@@ -36,8 +36,8 @@
 #include "paddle/utils/string/string_helper.h"
 
 COMMON_DECLARE_bool(use_mkldnn);
-COMMON_DECLARE_string(tracer_mkldnn_ops_on);
-COMMON_DECLARE_string(tracer_mkldnn_ops_off);
+COMMON_DECLARE_string(tracer_onednn_ops_on);
+COMMON_DECLARE_string(tracer_onednn_ops_off);
 COMMON_DECLARE_bool(use_stride_kernel);
 
 namespace paddle {
@@ -245,12 +245,12 @@ void Tracer::TraceOpImpl(const std::string& type,
     // if both lists are empty all ops are enabled (default for
     // FLAGS_use_mkldnn=1)
     // if ops_on list is not empty only ops from that list are enabled
-    if (!FLAGS_tracer_mkldnn_ops_on.empty()) {
-      auto is_on = FLAGS_tracer_mkldnn_ops_on.find(type) != std::string::npos;
+    if (!FLAGS_tracer_onednn_ops_on.empty()) {
+      auto is_on = FLAGS_tracer_onednn_ops_on.find(type) != std::string::npos;
       attrs["use_mkldnn"] = is_on;
     } else {
       // if ops_on list is empty all ops are enabled except types from off_list
-      auto is_off = FLAGS_tracer_mkldnn_ops_off.find(type) != std::string::npos;
+      auto is_off = FLAGS_tracer_onednn_ops_off.find(type) != std::string::npos;
       attrs["use_mkldnn"] = !is_off;
     }
   }
diff --git a/test/mkldnn/check_flags_mkldnn_ops_on_off.py b/test/mkldnn/check_flags_mkldnn_ops_on_off.py
@@ -33,12 +33,12 @@ def check():
     )
     print("check: DNNL_VERBOSE=", os.environ['DNNL_VERBOSE'])
     print(
-        "check: FLAGS_tracer_mkldnn_ops_on=",
-        _global_flags()['FLAGS_tracer_mkldnn_ops_on'],
+        "check: FLAGS_tracer_onednn_ops_on=",
+        _global_flags()['FLAGS_tracer_onednn_ops_on'],
     )
     print(
-        "check: FLAGS_tracer_mkldnn_ops_off=",
-        _global_flags()['FLAGS_tracer_mkldnn_ops_off'],
+        "check: FLAGS_tracer_onednn_ops_off=",
+        _global_flags()['FLAGS_tracer_onednn_ops_off'],
     )
     a_np = np.random.uniform(-2, 2, (10, 20, 30)).astype(np.float32)
     b_np = np.random.uniform(-5, 5, (10, 20, 30)).astype(np.float32)
diff --git a/test/mkldnn/test_flags_mkldnn_ops_on_off.py b/test/mkldnn/test_flags_mkldnn_ops_on_off.py
@@ -73,37 +73,37 @@ def test_flags_use_mkl_dnn_on_empty_off_empty(self):
         assert self.found(self.matmul_regex, out, err)
 
     def test_flags_use_mkl_dnn_on(self):
-        env = {"FLAGS_tracer_mkldnn_ops_on": "relu"}
+        env = {"FLAGS_tracer_onednn_ops_on": "relu"}
         out, err = self.flags_use_mkl_dnn_common(env)
         assert self.found(self.relu_regex, out, err)
         assert self.not_found(self.ew_add_regex, out, err)
         assert self.not_found(self.matmul_regex, out, err)
 
     def test_flags_use_mkl_dnn_on_multiple(self):
-        env = {"FLAGS_tracer_mkldnn_ops_on": "relu,elementwise_add"}
+        env = {"FLAGS_tracer_onednn_ops_on": "relu,elementwise_add"}
         out, err = self.flags_use_mkl_dnn_common(env)
         assert self.found(self.relu_regex, out, err)
         assert self.found(self.ew_add_regex, out, err)
         assert self.not_found(self.matmul_regex, out, err)
 
     def test_flags_use_mkl_dnn_off(self):
-        env = {"FLAGS_tracer_mkldnn_ops_off": "matmul_v2"}
+        env = {"FLAGS_tracer_onednn_ops_off": "matmul_v2"}
         out, err = self.flags_use_mkl_dnn_common(env)
         assert self.found(self.relu_regex, out, err)
         assert self.found(self.ew_add_regex, out, err)
         assert self.not_found(self.matmul_regex, out, err)
 
     def test_flags_use_mkl_dnn_off_multiple(self):
-        env = {"FLAGS_tracer_mkldnn_ops_off": "matmul_v2,relu"}
+        env = {"FLAGS_tracer_onednn_ops_off": "matmul_v2,relu"}
         out, err = self.flags_use_mkl_dnn_common(env)
         assert self.not_found(self.relu_regex, out, err)
         assert self.found(self.ew_add_regex, out, err)
         assert self.not_found(self.matmul_regex, out, err)
 
     def test_flags_use_mkl_dnn_on_off(self):
         env = {
-            "FLAGS_tracer_mkldnn_ops_on": "elementwise_add",
-            "FLAGS_tracer_mkldnn_ops_off": "matmul_v2",
+            "FLAGS_tracer_onednn_ops_on": "elementwise_add",
+            "FLAGS_tracer_onednn_ops_off": "matmul_v2",
         }
         out, err = self.flags_use_mkl_dnn_common(env)
         assert self.not_found(self.relu_regex, out, err)

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ def check():`
`33`	`33`	`)`
`34`	`34`	`print("check: DNNL_VERBOSE=", os.environ['DNNL_VERBOSE'])`
`35`	`35`	`print(`
`36`		`- "check: FLAGS_tracer_mkldnn_ops_on=",`
`37`		`- _global_flags()['FLAGS_tracer_mkldnn_ops_on'],`
	`36`	`+ "check: FLAGS_tracer_onednn_ops_on=",`
	`37`	`+ _global_flags()['FLAGS_tracer_onednn_ops_on'],`
`38`	`38`	`)`
`39`	`39`	`print(`
`40`		`- "check: FLAGS_tracer_mkldnn_ops_off=",`
`41`		`- _global_flags()['FLAGS_tracer_mkldnn_ops_off'],`
	`40`	`+ "check: FLAGS_tracer_onednn_ops_off=",`
	`41`	`+ _global_flags()['FLAGS_tracer_onednn_ops_off'],`
`42`	`42`	`)`
`43`	`43`	`a_np = np.random.uniform(-2, 2, (10, 20, 30)).astype(np.float32)`
`44`	`44`	`b_np = np.random.uniform(-5, 5, (10, 20, 30)).astype(np.float32)`