[CPU][core] Remove OV_CPU_NODE_SCOPED_TASK* macros, reuse existing handles in Node::execute tracing

Author: aobolensk

src/common/itt/include/openvino/itt.hpp

@@ -41,7 +41,6 @@ typedef struct handle_ {
  * @cond
  */
 namespace internal {
-bool is_initialized();
 domain_t domain(const char* name);
 handle_t handle(const char* name);
 void taskBegin(domain_t d, handle_t t);

src/common/itt/src/itt.cpp

@@ -21,7 +21,7 @@ namespace internal {
 
 static __itt_collection_state state = __itt_get_collection_state();
 
-bool is_initialized() {
+static inline bool is_initialized() {
     return state == __itt_collection_init_successful;
 }
 
@@ -110,10 +110,6 @@ void regionEnd(domain_t d) {
 
 #else
 
-bool is_initialized() {
-    return false;
-}
-
 domain_t domain(const char*) {
     return nullptr;
 }

src/plugins/intel_cpu/src/itt.h

@@ -25,45 +25,6 @@ OV_ITT_DOMAIN(ov_intel_cpu, "ov::intel_cpu");
 OV_ITT_DOMAIN(ov_intel_cpu_LT, "ov::intel_cpu::lt");
 }  // namespace ov::intel_cpu::itt::domains
 
-namespace ov::intel_cpu::itt {
-
-class ScopedOpExecTask {
-public:
-    explicit ScopedOpExecTask(const char* name) noexcept {
-        if (openvino::itt::internal::is_initialized()) {
-            m_handle = openvino::itt::handle(name);
-            openvino::itt::internal::taskBegin(::ov::itt::domains::ov_op_exec(), m_handle);
-        }
-    }
-    explicit ScopedOpExecTask(const std::string& name) noexcept : ScopedOpExecTask(name.c_str()) {}
-    ~ScopedOpExecTask() noexcept {
-        if (openvino::itt::internal::is_initialized()) {
-            openvino::itt::internal::taskEnd(::ov::itt::domains::ov_op_exec());
-        }
-    }
-
-    ScopedOpExecTask(const ScopedOpExecTask&) = delete;
-    ScopedOpExecTask& operator=(const ScopedOpExecTask&) = delete;
-
-private:
-    openvino::itt::handle_t m_handle{};
-};
-
-}  // namespace ov::intel_cpu::itt
-
-#if defined(SELECTIVE_BUILD_ANALYZER) || defined(SELECTIVE_BUILD)
-#    define OV_CPU_NODE_SCOPED_TASK(taskName)      OV_ITT_SCOPED_TASK(::ov::itt::domains::ov_op_exec, taskName)
-#    define OV_CPU_NODE_SCOPED_TASK_BASE(taskName) OV_ITT_SCOPED_TASK_BASE(::ov::itt::domains::ov_op_exec, taskName)
-#else
-#    define OV_CPU_NODE_SCOPE_CONCAT_IMPL(x, y)                 x##y
-#    define OV_CPU_NODE_SCOPE_CONCAT(x, y)                      OV_CPU_NODE_SCOPE_CONCAT_IMPL(x, y)
-#    define OV_CPU_NODE_SCOPED_TASK_INTERNAL(varName, taskName) ::ov::intel_cpu::itt::ScopedOpExecTask varName(taskName)
-#    define OV_CPU_NODE_SCOPED_TASK(taskName) \
-        OV_CPU_NODE_SCOPED_TASK_INTERNAL(OV_CPU_NODE_SCOPE_CONCAT(cpuNodeScopedTaskGuard, __LINE__), taskName)
-#    define OV_CPU_NODE_SCOPED_TASK_BASE(taskName) \
-        OV_CPU_NODE_SCOPED_TASK_INTERNAL(OV_CPU_NODE_SCOPE_CONCAT(cpuNodeScopedTaskGuardBase, __LINE__), taskName)
-#endif
-
 #if defined(SELECTIVE_BUILD_ANALYZER)
 #    define CPU_LPT_SCOPE(region)             OV_SCOPE(intel_cpu, region)
 #    define CPU_GRAPH_OPTIMIZER_SCOPE(region) OV_SCOPE(intel_cpu, region)

src/plugins/intel_cpu/src/node.cpp

@@ -823,7 +823,7 @@ void Node::updateDynamicParams() {
 }
 
 void Node::execute(const dnnl::stream& strm, int numaId) {
-    OV_CPU_NODE_SCOPED_TASK_BASE(getTypeStr());
+    OV_ITT_SCOPED_TASK_BASE(itt::domains::ov_intel_cpu, profiling.execute);
     if (isDynamicNode()) {
         executeDynamic(strm, numaId);
     } else {