Optimize and simplify OpenCL support (#363)

* Reduce OCL overhead * Reduce OCL overhead * Reduce OCL overhead * Optimize OpenCL support * OpenCL optimization * Optimize OpencL * Optimize and simplify OpenCL support * Optimize and simplify OpenCL support * Optimize and simplify OpenCL support * Optimize and simplify OpenCL support * Optimize/simplify OpenCL support * Simplify and optimize OpenCL
intel · Nov 21, 2024 · bfca98d · bfca98d
1 parent cda4eab
commit bfca98d
Show file tree

Hide file tree

Showing 11 changed files with 1,497 additions and 1,244 deletions.
diff --git a/tools/unitrace/CMakeLists.txt b/tools/unitrace/CMakeLists.txt
@@ -94,8 +94,6 @@ if (BUILD_WITH_MPI)
 endif()
 
 add_library(unitrace_tool SHARED
-  "${PROJECT_SOURCE_DIR}/src/opencl/cl_ext_collector.cc"
-  "${PROJECT_SOURCE_DIR}/../../utils/trace_guard.cc"
   "${PROJECT_SOURCE_DIR}/src/tracer.cc")
 link_directories(${ONEAPI_COMPILER_HOME}/lib)
 find_package(Xptifw REQUIRED)

diff --git a/tools/unitrace/src/chromelogger.h b/tools/unitrace/src/chromelogger.h
@@ -23,8 +23,6 @@
 #include "unievent.h"
 #include "unimemory.h"
 
-#include "opencl/cl_ext_collector.h"
-
 #include "common_header.gen"
 
 static inline std::string GetHostName(void) {
@@ -114,8 +112,8 @@ typedef struct TraceDataPacket_ {
       name = utils::Demangle(name.data());
     }
     else {
-      if ((cl_ext_api_id)api_id > clExtApiIdStartTraceId && (cl_ext_api_id)api_id < clExtApiIdEndTraceId) {
-        name = cl_ext_api_id_name[api_id - clExtApiIdStartTraceId - 1];
+      if ((cl_ext_api_id)api_id >= ClExtApiStart && (cl_ext_api_id)api_id < ClExtApiEnd) {
+        name = cl_ext_api[api_id - ClExtApiStart];
       } else if ((api_id != OpenClTracingId) && (api_id != XptiTracingId) && (api_id != IttTracingId) && (api_id != ZeKernelTracingId)) {
         // L0 kernel names are already demanged/
         name = get_symbol(api_id);
@@ -1525,11 +1523,6 @@ class ChromeLogger {
         }
       }
     }
-
-    static void ClExtChromeCallLoggingCallback(std::vector<uint64_t> *kids, FLOW_DIR flow_dir, const cl_ext_api_id api_id,
-      uint64_t started, uint64_t ended) {
-      ClChromeCallLoggingCallback(kids, flow_dir, (API_TRACING_ID)api_id, started, ended);
-    }
 };
 
 #endif // PTI_TOOLS_COMMON_CHROME_LOGGER_H_
diff --git a/tools/unitrace/src/opencl/cl_api_callbacks.h b/tools/unitrace/src/opencl/cl_api_callbacks.h
@@ -4,8 +4,8 @@
 // SPDX-License-Identifier: MIT
 // =============================================================
 
-#ifndef PTI_TOOLS_CL_TRACER_CL_API_CALLBACKS_H_
-#define PTI_TOOLS_CL_TRACER_CL_API_CALLBACKS_H_
+#ifndef PTI_TOOLS_UNITRACE_CL_API_CALLBACKS_H_
+#define PTI_TOOLS_UNITRACE_CL_API_CALLBACKS_H_
 
 #include <sstream>
 
@@ -7394,4 +7394,4 @@ void OnExitFunction(
   }
 }
 
-#endif // PTI_TOOLS_CL_TRACER_CL_API_CALLBACKS_H_
+#endif /* PTI_TOOLS_UNITRACE_CL_API_CALLBACKS_H_ */