From f335d9e14ecd4dc0dad0e8f296a8099882bee25a Mon Sep 17 00:00:00 2001
From: liutiexing <74819124+liutiexing@users.noreply.github.com>
Date: Mon, 28 Feb 2022 15:23:28 +0800
Subject: [PATCH] Trace level env (#39926)

* add align for WorkQueue

* add spinlock

* merge develop

* merge

* Add EventsWaiter

* Revert "Add EventsWaiter"

This reverts commit e206173aa9be7401b83a53581627bfaf557c8fb2.

* Add host_trace_level env variable

* Revert "Optimize perf of softmax_with_cross_entropy (#39553)"

This reverts commit bbe5228ca812b27b4c1514d928d894b61fd5a543.

Co-authored-by: liutiexing <liutiexing@google.com>
Co-authored-by: ZzSean <18818272991@163.com>
---
 paddle/fluid/framework/new_executor/interpretercore.cc | 7 ++++---
 paddle/fluid/imperative/tracer.cc                      | 2 +-
 paddle/fluid/platform/profiler/host_tracer.cc          | 7 +++++++
 paddle/fluid/platform/profiler/profiler.h              | 4 +++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/paddle/fluid/framework/new_executor/interpretercore.cc b/paddle/fluid/framework/new_executor/interpretercore.cc
index 9b597a9efde..878b845211c 100644
--- a/paddle/fluid/framework/new_executor/interpretercore.cc
+++ b/paddle/fluid/framework/new_executor/interpretercore.cc
@@ -389,7 +389,7 @@ void InterpreterCore::RunInstruction(const Instruction& instr_node) {
   auto op_with_kernel = dynamic_cast<const framework::OperatorWithKernel*>(op);
   {
     platform::RecordEvent infershape_event(
-        "InferShape", platform::TracerEventType::OperatorInner, 1,
+        "infer_shape", platform::TracerEventType::OperatorInner, 1,
         platform::EventRole::kInnerOp);
     // If it is OperatorBase, InferShape do nothing.
     if (op_with_kernel != nullptr)
@@ -411,7 +411,7 @@ void InterpreterCore::RunInstruction(const Instruction& instr_node) {
   }
   {
     platform::RecordEvent compute_event(
-        "Compute", platform::TracerEventType::OperatorInner, 1,
+        "compute", platform::TracerEventType::OperatorInner, 1,
         platform::EventRole::kInnerOp);
     if (op_with_kernel == nullptr) {
       instr_node.OpBase()->Run(*local_scope, place_);
@@ -561,7 +561,8 @@ void InterpreterCore::RunInstructionAsync(size_t instr_id) {
             << " runs on " << platform::GetCurrentThreadName();
 
     auto* op = instr_node.OpBase();
-    platform::RecordEvent instruction_event(op->Type().c_str());
+    platform::RecordEvent instruction_event(
+        op->Type(), platform::TracerEventType::Operator, 1);
     interpreter::WaitEvent(instr_node, place_);
 
     try {
diff --git a/paddle/fluid/imperative/tracer.cc b/paddle/fluid/imperative/tracer.cc
index c832787d989..85bcbd1458f 100644
--- a/paddle/fluid/imperative/tracer.cc
+++ b/paddle/fluid/imperative/tracer.cc
@@ -175,7 +175,7 @@ void Tracer::TraceOp(const std::string& type, const NameVarMap<VarType>& ins,
                      paddle::framework::AttributeMap* passed_default_attrs_,
                      bool use_default_attr_map) {
   platform::RecordEvent op_type_record_event(
-      type, platform::TracerEventType::Operator, 2);
+      type, platform::TracerEventType::Operator, 1);
   platform::ScopedFlushDenormal flush;
   VLOG(1) << "Trace Op: " << type;
   if (FLAGS_use_mkldnn) {
diff --git a/paddle/fluid/platform/profiler/host_tracer.cc b/paddle/fluid/platform/profiler/host_tracer.cc
index 3f97113aecb..afd1c2b3012 100644
--- a/paddle/fluid/platform/profiler/host_tracer.cc
+++ b/paddle/fluid/platform/profiler/host_tracer.cc
@@ -14,9 +14,16 @@
 
 #include "paddle/fluid/platform/profiler/host_tracer.h"
 #include "glog/logging.h"
+#include "paddle/fluid/platform/flags.h"
 #include "paddle/fluid/platform/profiler/common_event.h"
 #include "paddle/fluid/platform/profiler/host_event_recorder.h"
 
+// Used to filter events, works like glog VLOG(level).
+// RecordEvent will works if host_trace_level >= level.
+PADDLE_DEFINE_EXPORTED_int64(host_trace_level, 2,
+                             "RecordEvent will works "
+                             "if host_trace_level >= level.");
+
 namespace paddle {
 namespace platform {
 
diff --git a/paddle/fluid/platform/profiler/profiler.h b/paddle/fluid/platform/profiler/profiler.h
index de5a0cc9be4..4fc1c6daf96 100644
--- a/paddle/fluid/platform/profiler/profiler.h
+++ b/paddle/fluid/platform/profiler/profiler.h
@@ -23,11 +23,13 @@
 #include "paddle/fluid/platform/profiler/event_node.h"
 #include "paddle/fluid/platform/profiler/tracer_base.h"
 
+DECLARE_int64(host_trace_level);
+
 namespace paddle {
 namespace platform {
 
 struct ProfilerOptions {
-  uint32_t trace_level = 0;
+  uint32_t trace_level = FLAGS_host_trace_level;
 };
 
 class Profiler {
-- 
GitLab