Skip to content

Commit f335d9e

Browse files
liutiexingliutiexingZzSean
authored
Trace level env (#39926)
* add align for WorkQueue * add spinlock * merge develop * merge * Add EventsWaiter * Revert "Add EventsWaiter" This reverts commit e206173. * Add host_trace_level env variable * Revert "Optimize perf of softmax_with_cross_entropy (#39553)" This reverts commit bbe5228. Co-authored-by: liutiexing <liutiexing@google.com> Co-authored-by: ZzSean <18818272991@163.com>
1 parent 7ecefec commit f335d9e

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

paddle/fluid/framework/new_executor/interpretercore.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ void InterpreterCore::RunInstruction(const Instruction& instr_node) {
389389
auto op_with_kernel = dynamic_cast<const framework::OperatorWithKernel*>(op);
390390
{
391391
platform::RecordEvent infershape_event(
392-
"InferShape", platform::TracerEventType::OperatorInner, 1,
392+
"infer_shape", platform::TracerEventType::OperatorInner, 1,
393393
platform::EventRole::kInnerOp);
394394
// If it is OperatorBase, InferShape do nothing.
395395
if (op_with_kernel != nullptr)
@@ -411,7 +411,7 @@ void InterpreterCore::RunInstruction(const Instruction& instr_node) {
411411
}
412412
{
413413
platform::RecordEvent compute_event(
414-
"Compute", platform::TracerEventType::OperatorInner, 1,
414+
"compute", platform::TracerEventType::OperatorInner, 1,
415415
platform::EventRole::kInnerOp);
416416
if (op_with_kernel == nullptr) {
417417
instr_node.OpBase()->Run(*local_scope, place_);
@@ -561,7 +561,8 @@ void InterpreterCore::RunInstructionAsync(size_t instr_id) {
561561
<< " runs on " << platform::GetCurrentThreadName();
562562

563563
auto* op = instr_node.OpBase();
564-
platform::RecordEvent instruction_event(op->Type().c_str());
564+
platform::RecordEvent instruction_event(
565+
op->Type(), platform::TracerEventType::Operator, 1);
565566
interpreter::WaitEvent(instr_node, place_);
566567

567568
try {

paddle/fluid/imperative/tracer.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void Tracer::TraceOp(const std::string& type, const NameVarMap<VarType>& ins,
175175
paddle::framework::AttributeMap* passed_default_attrs_,
176176
bool use_default_attr_map) {
177177
platform::RecordEvent op_type_record_event(
178-
type, platform::TracerEventType::Operator, 2);
178+
type, platform::TracerEventType::Operator, 1);
179179
platform::ScopedFlushDenormal flush;
180180
VLOG(1) << "Trace Op: " << type;
181181
if (FLAGS_use_mkldnn) {

paddle/fluid/platform/profiler/host_tracer.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,16 @@
1414

1515
#include "paddle/fluid/platform/profiler/host_tracer.h"
1616
#include "glog/logging.h"
17+
#include "paddle/fluid/platform/flags.h"
1718
#include "paddle/fluid/platform/profiler/common_event.h"
1819
#include "paddle/fluid/platform/profiler/host_event_recorder.h"
1920

21+
// Used to filter events, works like glog VLOG(level).
22+
// RecordEvent will works if host_trace_level >= level.
23+
PADDLE_DEFINE_EXPORTED_int64(host_trace_level, 2,
24+
"RecordEvent will works "
25+
"if host_trace_level >= level.");
26+
2027
namespace paddle {
2128
namespace platform {
2229

paddle/fluid/platform/profiler/profiler.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@
2323
#include "paddle/fluid/platform/profiler/event_node.h"
2424
#include "paddle/fluid/platform/profiler/tracer_base.h"
2525

26+
DECLARE_int64(host_trace_level);
27+
2628
namespace paddle {
2729
namespace platform {
2830

2931
struct ProfilerOptions {
30-
uint32_t trace_level = 0;
32+
uint32_t trace_level = FLAGS_host_trace_level;
3133
};
3234

3335
class Profiler {

0 commit comments

Comments
 (0)