From bb429a855a31ce55ca061835a1fe226fe39c8d17 Mon Sep 17 00:00:00 2001 From: "Li, Tingqian" Date: Thu, 26 May 2022 22:31:41 +0800 Subject: [PATCH] change VERBOSE_LOG to DEBUG_LOG --- src/plugins/intel_cpu/src/docs/README.md | 3 +++ src/plugins/intel_cpu/src/graph.cpp | 3 ++- src/plugins/intel_cpu/src/node.cpp | 2 +- src/plugins/intel_cpu/src/utils/debug_capabilities.h | 9 +++++++++ src/plugins/intel_cpu/src/utils/verbose.h | 7 ------- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/plugins/intel_cpu/src/docs/README.md b/src/plugins/intel_cpu/src/docs/README.md index 465c6fdffa3..f43afabc138 100644 --- a/src/plugins/intel_cpu/src/docs/README.md +++ b/src/plugins/intel_cpu/src/docs/README.md @@ -3,6 +3,9 @@ Use the following cmake option to enable debug capabilities: `-DENABLE_DEBUG_CAPS=ON` +Debug logs starting with `[ DEBUG ]` will be shown after this option is set to ON. + * [Verbose mode](verbose.md) * [Blob dumping](blob_dumping.md) * [Graph serialization](graph_serialization.md) +* Performance summary: set `OV_CPU_SUMMARY_PERF` environment variable to display performance summary at the model destruction time. diff --git a/src/plugins/intel_cpu/src/graph.cpp b/src/plugins/intel_cpu/src/graph.cpp index f1ee4237ff2..d38ec83a7e6 100644 --- a/src/plugins/intel_cpu/src/graph.cpp +++ b/src/plugins/intel_cpu/src/graph.cpp @@ -792,7 +792,8 @@ void Graph::CreatePrimitives() { OV_ITT_SCOPED_TASK(itt::domains::intel_cpu, "Graph::CreatePrimitives"); for (auto& node : graphNodes) { OV_ITT_SCOPE(FIRST_INFERENCE, itt::domains::intel_cpu_LT, node->profiling.createPrimitive); - VERBOSE_LOG("#", node->getExecIndex(), " ", node->getName(), " ", node->getOriginalLayers()); + DEBUG_LOG("#", node->getExecIndex(), " ", node->getTypeStr(), " ", algToString(node->getAlgorithm()), + " ", node->getName(), " ", node->getOriginalLayers()); node->createPrimitive(); } } diff --git a/src/plugins/intel_cpu/src/node.cpp b/src/plugins/intel_cpu/src/node.cpp index 5aeb2a357d0..089fc14c0f5 100644 --- a/src/plugins/intel_cpu/src/node.cpp +++ b/src/plugins/intel_cpu/src/node.cpp @@ -515,7 +515,7 @@ void Node::execute(dnnl::stream strm) { } void Node::executeDynamic(dnnl::stream strm) { - VERBOSE_LOG("#", getExecIndex(), " ", getName()); + DEBUG_LOG("#", getExecIndex(), " ", getName()); if (needShapeInfer()) { redefineOutputMemory(shapeInfer()); } diff --git a/src/plugins/intel_cpu/src/utils/debug_capabilities.h b/src/plugins/intel_cpu/src/utils/debug_capabilities.h index 2ba5bbc7235..09dd1d0169f 100644 --- a/src/plugins/intel_cpu/src/utils/debug_capabilities.h +++ b/src/plugins/intel_cpu/src/utils/debug_capabilities.h @@ -8,9 +8,18 @@ #define CPU_DEBUG_CAP_ENABLE(_x) _x; #define CPU_DEBUG_CAPS_ALWAYS_TRUE(x) true +#define DEBUG_LOG(...) \ + do { \ + ::std::stringstream ss___; \ + ::ov::write_all_to_stream(ss___, "[ DEBUG ] ", __func__, ":", __LINE__, " ", __VA_ARGS__); \ + std::cout << ss___.str() << std::endl; \ + } while (0) + #else // !CPU_DEBUG_CAPS #define CPU_DEBUG_CAP_ENABLE(_x) #define CPU_DEBUG_CAPS_ALWAYS_TRUE(x) x +#define DEBUG_LOG(...) + #endif // CPU_DEBUG_CAPS diff --git a/src/plugins/intel_cpu/src/utils/verbose.h b/src/plugins/intel_cpu/src/utils/verbose.h index d638ec589f0..a3a159ec20d 100644 --- a/src/plugins/intel_cpu/src/utils/verbose.h +++ b/src/plugins/intel_cpu/src/utils/verbose.h @@ -44,15 +44,8 @@ private: // use heap allocation instead of stack to align with PERF macro (to have proper destruction order) #define VERBOSE(...) const auto verbose = std::unique_ptr(new Verbose(__VA_ARGS__)); -#define VERBOSE_LOG(...) \ - do { \ - ::std::stringstream ss___; \ - ::ov::write_all_to_stream(ss___, __VA_ARGS__); \ - std::cout << "[ VERBOSE ] " << __func__ << ":" << __LINE__ << " " << ss___.str() << std::endl; \ - } while (0) } // namespace intel_cpu } // namespace ov #else #define VERBOSE(...) -#define VERBOSE_LOG(...) #endif // CPU_DEBUG_CAPS