[unitrace] Fixed warnings (#444)

* Fixed warnings

* Fixed UNitrace warnings

* Addressed review comments

* Addressed review comments

* Update chromelogger.h

* Update itt_collector.h

* Update ze_collector.h

* Update ze_metrics.h

* Update tracer.h

* Update unitrace.cc

* Update itt_collector.h

---------

Co-authored-by: Zhiqiang Ma <[email protected]>

Author: Tarakarevu1

tools/unitrace/CMakeLists.txt

@@ -21,7 +21,7 @@ else()
 endif()
 
 if(WIN32)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 ")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /bigobj ")
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fvisibility=default")
 endif()

tools/unitrace/scripts/gen_tracing_callbacks.py

@@ -439,7 +439,7 @@ def gen_enter_callback(f, func, command_list_func_list, command_queue_func_list,
               f.write("      auto phWaitEvents = *(params->p"+ name + ");\n")
               f.write("      auto numWaitEvents = *(params->p" + prev_name + ");\n")
               f.write("      while(numWaitEvents > 0) {\n")
-              f.write("        str += std::to_string((long int)*phWaitEvents);\n")
+              f.write("        str += std::to_string(reinterpret_cast<uintptr_t>(*phWaitEvents));\n")
               f.write("        numWaitEvents--;\n")
               f.write("        if (numWaitEvents > 0)\n")
               f.write("          str +=\", \";\n")

tools/unitrace/src/chromelogger.h

@@ -30,13 +30,19 @@ static inline std::string GetHostName(void) {
 #ifdef _WIN32
   DWORD size = sizeof(hname);
   GetComputerNameA(hname, &size);
-#else
+#else  /* _WIN32 */
   gethostname(hname, sizeof(hname));
-#endif
+#endif /* _WIN32 */
   hname[255] = 0;
   return hname;
 }
 
+#ifdef _WIN32
+#define strdup _strdup
+#else /* _WIN32 */
+#define strdup strdup
+#endif /* _WIN32 */
+
 static std::string EncodeURI(const std::string &input) {
   std::ostringstream encoded;
   encoded.fill('0');

tools/unitrace/src/itt/itt_collector.h

@@ -320,6 +320,20 @@ ITT_EXTERN_C void ITTAPI __itt_task_begin(const __itt_domain *domain, __itt_id t
   }
 
   ThreadTaskDescriptor desc;
+#ifdef _WIN32
+  if (domain && domain->nameA) {
+    strncpy_s(desc.domain, sizeof(desc.domain), domain->nameA, sizeof(desc.domain) - 2);
+  }
+  else {
+    desc.domain[0] = 0;
+  }
+  if (name && name->strA) {
+    strncpy_s(desc.domain, sizeof(desc.domain), domain->nameA, sizeof(desc.domain) - 2);
+  }
+  else {
+    desc.name[0] = 0;
+  }
+#else /* _WIN32 */
   if (domain && domain->nameA) {
     strncpy(desc.domain, domain->nameA, sizeof(desc.domain) - 2);
   }
@@ -332,6 +346,7 @@ ITT_EXTERN_C void ITTAPI __itt_task_begin(const __itt_domain *domain, __itt_id t
   else {
     desc.name[0] = 0;
   }
+#endif /* _WIN32 */
 
   desc.start_time = UniTimer::GetHostTimestamp();
   desc.buff_size = 0;

tools/unitrace/src/levelzero/ze_collector.h

@@ -1080,7 +1080,8 @@ inline std::string GetZeKernelCommandName(uint64_t id, const ze_group_count_t& g
   kernel_command_properties_mutex_.lock_shared();
   auto it = kernel_command_properties_->find(id);
   if (it != kernel_command_properties_->end()) {
-    str = "\"" + std::move(utils::Demangle(it->second.name_.c_str()));	// quote kernel name which may contain ","
+    str = "\"";
+    str += std::move(utils::Demangle(it->second.name_.c_str()));  // quote kernel name which may contain ","
     if (detailed) {
       if (it->second.type_ == KERNEL_COMMAND_TYPE_COMPUTE) {
         if (it->second.simd_width_ > 0) {
@@ -1504,7 +1505,6 @@ class ZeCollector {
     if (local_device_submissions_.IsFinalized()) {
       return;
     }
-    ze_result_t status = ZE_RESULT_SUCCESS;
 
     global_device_submissions_mutex_.lock_shared();
     auto it = local_device_submissions_.commands_submitted_.begin();
@@ -1549,7 +1549,6 @@ class ZeCollector {
     if (local_device_submissions_.IsFinalized()) {
       return;
     }
-    ze_result_t status = ZE_RESULT_SUCCESS;
 
     global_device_submissions_mutex_.lock();
     if (global_device_submissions_) {
@@ -1596,7 +1595,6 @@ class ZeCollector {
   }
 
   void FinalizeDeviceSubmissions(std::vector<uint64_t> *kids) {
-    ze_result_t status = ZE_RESULT_SUCCESS;
 
     // Do not acquire any locks!
     auto it = local_device_submissions_.commands_submitted_.begin();
@@ -1649,7 +1647,6 @@ class ZeCollector {
         options_(options),
         kcallback_(kcallback),
         fcallback_(fcallback),
-        callback_data_(callback_data),
         event_cache_(ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP) {
     data_dir_name_ = data_dir_name;
     EnumerateAndSetupDevices();
@@ -1907,6 +1904,7 @@ class ZeCollector {
         PTI_ASSERT(0);
         break;
     }
+    return "";   //in case of error returns empty string.
   }
 
   inline static std::string GetMetricUnits(const char* units) {
@@ -2408,7 +2406,7 @@ class ZeCollector {
 
   void PrintCommandCompleted(const ZeCommand *command, uint64_t kernel_start, uint64_t kernel_end) {
     std::string str("Thread ");
-    str += std::to_string(command->tid_)  + " Device " + std::to_string((unsigned long)(command->device_)) +
+    str += std::to_string(command->tid_) + " Device " + std::to_string(reinterpret_cast<uintptr_t>(command->device_)) +
       " : " + GetZeKernelCommandName(command->kernel_command_id_, command->group_count_, command->mem_size_) + " [ns] " +
       std::to_string(command->append_time_) + " (append) " +
       std::to_string(command->submit_time_) + " (submit) " +
@@ -3768,7 +3766,6 @@ class ZeCollector {
       desc->metric_timer_frequency_ = cl->metric_timer_frequency_;
       desc->metric_timer_mask_ = cl->metric_timer_mask_;
       desc->device_ = cl->device_;
-      ze_context_handle_t context = cl->context_;
 
       desc->group_count_ = {0, 0, 0};
       desc->mem_size_ = 0;
@@ -4135,7 +4132,6 @@ class ZeCollector {
       const ze_copy_region_t* region = *(params->psrcRegion);
 
       if (region != nullptr) {
-        size_t bytes_transferred = region->width * region->height * (*(params->psrcPitch));
         if (region->depth != 0) {
           bytes_transferred *= region->depth;
         }
@@ -4171,7 +4167,6 @@ class ZeCollector {
     ZeCollector* collector = reinterpret_cast<ZeCollector*>(global_data);
     if ((result == ZE_RESULT_SUCCESS) && (UniController::IsCollectionEnabled())) {
       ze_context_handle_t src_context = *(params->phContextSrc);
-      ze_context_handle_t dst_context = nullptr;
       collector->AppendMemoryCommandContext(MemoryCopyFromContext, *(params->psize),
         src_context, *(params->psrcptr), nullptr, *(params->pdstptr), *(params->phSignalEvent), query,
         *(params->phCommandList), kids);
@@ -4611,7 +4606,6 @@ class ZeCollector {
 
   static void OnExitModuleCreate(ze_module_create_params_t* params, ze_result_t result, void* global_data, void** instance_user_data) {
     if (result == ZE_RESULT_SUCCESS) {
-      ZeCollector* collector = reinterpret_cast<ZeCollector*>(global_data);
       ze_module_handle_t mod = **(params->pphModule);
       ze_device_handle_t device = *(params->phDevice);
       size_t binary_size;
@@ -4632,7 +4626,6 @@ class ZeCollector {
   }
 
   static void OnEnterModuleDestroy(ze_module_destroy_params_t* params, void* global_data, void** instance_user_data) {
-    ZeCollector* collector = reinterpret_cast<ZeCollector*>(global_data);
     ze_module_handle_t mod = *(params->phModule);
     modules_on_devices_mutex_.lock();
     modules_on_devices_.erase(mod);
@@ -4780,7 +4773,6 @@ typedef struct _zex_kernel_register_file_size_exp_t {
     void* global_data, void** instance_data) {
     if (result == ZE_RESULT_SUCCESS) {
       if (UniController::IsCollectionEnabled()) {
-        ZeCollector* collector = reinterpret_cast<ZeCollector*>(global_data);
         ZeKernelGroupSize group_size{*(params->pgroupSizeX), *(params->pgroupSizeY), *(params->pgroupSizeZ)};
         kernel_command_properties_mutex_.lock();
 
@@ -4816,7 +4808,6 @@ typedef struct _zex_kernel_register_file_size_exp_t {
 
   static void OnExitKernelDestroy(ze_kernel_destroy_params_t* params, ze_result_t result, void* global_data, void** instance_data) {
     if (result == ZE_RESULT_SUCCESS) {
-      ZeCollector* collector = reinterpret_cast<ZeCollector*>(global_data);
       kernel_command_properties_mutex_.lock();
       active_kernel_properties_->erase(*(params->phKernel));
       kernel_command_properties_mutex_.unlock();
@@ -4886,7 +4877,6 @@ typedef struct _zex_kernel_register_file_size_exp_t {
   Logger *logger_ = nullptr;
   OnZeKernelFinishCallback kcallback_ = nullptr;
   OnZeFunctionFinishCallback fcallback_ = nullptr;
-  void* callback_data_ = nullptr;
 
   mutable std::shared_mutex images_mutex_;
   std::map<ze_image_handle_t, size_t> images_;

tools/unitrace/src/levelzero/ze_metrics.h

@@ -31,6 +31,7 @@
 #include "utils.h"
 #include "ze_utils.h"
 #include "pti_assert.h"
+#include <inttypes.h>
 
 
 constexpr static uint64_t min_dummy_instance_id = 1024 * 1024;	// min dummy instance id if idle sampling is enabled
@@ -709,7 +710,7 @@ class ZeMetricProfiler {
               std::string line;
 
               char offset[128];
-              snprintf(offset, sizeof(offset), "0x%08lx", (it->first - rit->first));
+              snprintf(offset, sizeof(offset), "%" PRIx64, (it->first - rit->first));
               line = std::string(std::max(int(field_sizes[0] - rit->second.first.length()), 0), ' ') +
                      rit->second.first + ", ";
               logger_->Log(line);
@@ -971,6 +972,7 @@ class ZeMetricProfiler {
         PTI_ASSERT(0);
         break;
     }
+    return "";  // in case of error returns empty string.
   }
 
   inline static std::string GetMetricUnits(const char* units) {

tools/unitrace/src/opencl/cl_api_callbacks.h

@@ -149,7 +149,7 @@ static void clCompileProgramOnEnter(
   stream << " numInputHeaders = " << *(params->numInputHeaders);
   stream << " inputHeaders = " << *(params->inputHeaders);
   stream << " headerIncludeNames = " << *(params->headerIncludeNames);
-  stream << " funcNotify = " << *(params->funcNotify);
+  stream << " funcNotify = " << *reinterpret_cast<decltype(params->funcNotify)*>(params->funcNotify);
   stream << " userData = " << *(params->userData);
   stream << std::endl;
 
@@ -202,7 +202,7 @@ static void clSetEventCallbackOnEnter(
   stream << " event = " << *(params->event);
   stream << " commandExecCallbackType = " <<
     *(params->commandExecCallbackType);
-  stream << " funcNotify = " << *(params->funcNotify);
+  stream << " funcNotify = " << *reinterpret_cast<decltype(params->funcNotify)*>(params->funcNotify);
   stream << " userData = " << *(params->userData);
   stream << std::endl;
 
@@ -649,7 +649,7 @@ static void clEnqueueSVMFreeOnEnter(
   stream << " commandQueue = " << *(params->commandQueue);
   stream << " numSvmPointers = " << *(params->numSvmPointers);
   stream << " svmPointers = " << *(params->svmPointers);
-  stream << " pfnFreeFunc = " << *(params->pfnFreeFunc);
+  stream << " pfnFreeFunc = " << *reinterpret_cast<decltype(params->pfnFreeFunc)*>(params->pfnFreeFunc);
   stream << " userData = " << *(params->userData);
   stream << " numEventsInWaitList = " << *(params->numEventsInWaitList);
   stream << " eventWaitList = " << *(params->eventWaitList);
@@ -1642,7 +1642,7 @@ static void clCreateContextOnEnter(
   stream << " properties = " << *(params->properties);
   stream << " numDevices = " << *(params->numDevices);
   stream << " devices = " << *(params->devices);
-  stream << " funcNotify = " << *(params->funcNotify);
+  stream << " funcNotify = " << *reinterpret_cast<decltype(params->funcNotify)*>(params->funcNotify);
   stream << " userData = " << *(params->userData);
   stream << " errcodeRet = " << *(params->errcodeRet);
   stream << std::endl;
@@ -1986,7 +1986,7 @@ static void clCreateContextFromTypeOnEnter(
 
   stream << " properties = " << *(params->properties);
   stream << " deviceType = " << *(params->deviceType);
-  stream << " funcNotify = " << *(params->funcNotify);
+  stream << " funcNotify = " << *reinterpret_cast<decltype(params->funcNotify)*>(params->funcNotify);
   stream << " userData = " << *(params->userData);
   stream << " errcodeRet = " << *(params->errcodeRet);
   stream << std::endl;
@@ -2228,7 +2228,7 @@ static void clLinkProgramOnEnter(
   }
   stream << " numInputPrograms = " << *(params->numInputPrograms);
   stream << " inputPrograms = " << *(params->inputPrograms);
-  stream << " funcNotify = " << *(params->funcNotify);
+  stream << " funcNotify = " << *reinterpret_cast<decltype(params->funcNotify)*>(params->funcNotify);
   stream << " userData = " << *(params->userData);
   stream << " errcodeRet = " << *(params->errcodeRet);
   stream << std::endl;
@@ -3363,7 +3363,7 @@ static void clEnqueueNativeKernelOnEnter(
   stream << data->functionName << ":";
 
   stream << " commandQueue = " << *(params->commandQueue);
-  stream << " userFunc = " << *(params->userFunc);
+  stream << " userFunc = " << *reinterpret_cast<decltype(params->userFunc)*>(params->userFunc);
   stream << " args = " << *(params->args);
   stream << " cbArgs = " << *(params->cbArgs);
   stream << " numMemObjects = " << *(params->numMemObjects);
@@ -4058,7 +4058,7 @@ static void clSetMemObjectDestructorCallbackOnEnter(
   stream << data->functionName << ":";
 
   stream << " memobj = " << *(params->memobj);
-  stream << " funcNotify = " << *(params->funcNotify);
+  stream << " funcNotify = " << *reinterpret_cast<decltype(params->funcNotify)*>(params->funcNotify);
   stream << " userData = " << *(params->userData);
   stream << std::endl;
 
@@ -5435,7 +5435,7 @@ static void clBuildProgramOnEnter(
   } else {
     stream << " options = \"" << *(params->options) << "\"";
   }
-  stream << " funcNotify = " << *(params->funcNotify);
+  stream << " funcNotify = " << *reinterpret_cast<decltype(params->funcNotify)*>(params->funcNotify);
   stream << " userData = " << *(params->userData);
   stream << std::endl;
 

tools/unitrace/src/opencl/cl_collector.h

@@ -685,7 +685,6 @@ class ClCollector {
         options_(options),
         kcallback_(kcallback),
         fcallback_(fcallback),
-        callback_data_(callback_data),
         data_dir_name_(data_dir_name) {
     PTI_ASSERT(device_ != nullptr);
     PTI_ASSERT(logger_ != nullptr);
@@ -857,7 +856,6 @@ class ClCollector {
     const std::lock_guard<std::mutex> lock(lock_);
 
     cl_event event = instance->event;
-    cl_int event_status = utils::cl::GetEventStatus(event);
     cl_command_queue queue = utils::cl::GetCommandQueue(event);
     PTI_ASSERT(queue != nullptr);
     cl_device_id device = utils::cl::GetDevice(queue);
@@ -945,7 +943,6 @@ class ClCollector {
 
   inline cl_device_pci_bus_info_khr GetDevicePciInfo(cl_device_id device) {
     cl_device_pci_bus_info_khr pciInfo;
-    cl_uint vendorId =  0 ;
     cl_int status = clGetDeviceInfo(device, CL_DEVICE_PCI_BUS_INFO_KHR, sizeof(cl_device_pci_bus_info_khr), &pciInfo, nullptr);
     PTI_ASSERT(status == CL_SUCCESS);
     return pciInfo;
@@ -1314,7 +1311,6 @@ class ClCollector {
       collector->CalculateKernelLocalSize(params, &instance->props);
 
       uint64_t base_addr = 0;
-      uint32_t addrbits = 0;
       uint64_t size = 0;
 
       status = clGetKernelInfo(kernel, CL_KERNEL_BINARY_GPU_ADDRESS_INTEL, 0, nullptr, &size);
@@ -1924,7 +1920,6 @@ class ClCollector {
 
   OnClKernelFinishCallback kcallback_ = nullptr;
   OnClFunctionFinishCallback fcallback_ = nullptr;
-  void* callback_data_ = nullptr;
 
   std::mutex lock_;
   ClKernelInfoMap kernel_info_map_;
@@ -1944,7 +1939,6 @@ class ClCollector {
 
   cl_device_type device_type_ = CL_DEVICE_TYPE_ALL;
 
-  OnClFunctionFinishCallback callback_ = nullptr;
 
   ClFunctionInfoMap function_info_map_;
 
@@ -2274,7 +2268,7 @@ cl_int clGetMemAllocInfoINTEL(cl_context context, const void *ptr, cl_mem_info_i
 
         str += " context = " + std::to_string(uint64_t(context));
         str += " ptr = " + std::to_string(uint64_t(ptr));
-        str += " param_name = " + param_name;
+        str += " param_name = " + std::to_string(param_name);
         str += " param_value_size = " + std::to_string(param_value_size);
         str += " param_value = " + std::to_string(uint64_t(param_value));
         str += " param_value_size_ret = " + std::to_string(uint64_t(param_value_size_ret));

tools/unitrace/src/unitimer.h

@@ -73,7 +73,7 @@ class UniTimer {
 private:
     inline static uint64_t epoch_start_time_ = 0;
 #if defined(_WIN32)
-    inline static LARGE_INTEGER frequency_{0};
+    inline static LARGE_INTEGER frequency_{{0}};
 #endif /* _WIN32 */
 };