Tracing usage with Debug build type on WIN32

- Allow to build UR with the UR_ENABLE_TRACING flag set in Debug build
on Windows platforms.

- Bump the minimum required version of CMake to make use
of the CMAKE_MSVC_RUNTIME_LIBRARY variable (which was already in
the code but had no effect). This is required for Debug build on Windows
with tracing enabled to success.

- Hide message about libbacktrace not found on Windows builds.

- Change the flush level of tracing messages in tests to have certainty
for messages order.

Author: PatKamin

CMakeLists.txt

@@ -1,7 +1,7 @@
 # Copyright (C) 2022-2023 Intel Corporation
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR)
 project(unified-runtime VERSION 0.6.0)
 
 include(GNUInstallDirs)
@@ -70,7 +70,7 @@ if(NOT MSVC)
         link_libraries(stdc++fs)
     endif()
 elseif(MSVC)
-    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
     add_compile_options(/MP /W3)
@@ -103,8 +103,12 @@ if(UR_ENABLE_TRACING)
     if (MSVC)
         set_property(TARGET xpti PROPERTY MSVC_RUNTIME_LIBRARY "${CMAKE_MSVC_RUNTIME_LIBRARY}")
         set_property(TARGET xptifw PROPERTY MSVC_RUNTIME_LIBRARY "${CMAKE_MSVC_RUNTIME_LIBRARY}")
+        set(TARGET_XPTI $<IF:$<CONFIG:Release>,xpti,xptid>)
+
         # disable warning C4267: The compiler detected a conversion from size_t to a smaller type.
         target_compile_options(xptifw PRIVATE /wd4267)
+    else()
+        set(TARGET_XPTI xpti)
     endif()
 endif()
 

examples/collector/CMakeLists.txt

@@ -11,7 +11,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
     ${CMAKE_SOURCE_DIR}/include
 )
 
-target_link_libraries(${TARGET_NAME} PRIVATE xpti ${CMAKE_DL_LIBS})
+target_link_libraries(${TARGET_NAME} PRIVATE ${TARGET_XPTI})
 target_include_directories(${TARGET_NAME} PRIVATE ${xpti_SOURCE_DIR}/include)
 
 if(MSVC)

source/loader/CMakeLists.txt

@@ -36,7 +36,7 @@ target_link_libraries(ur_loader PRIVATE
 )
 
 if(UR_ENABLE_TRACING)
-    target_link_libraries(ur_loader PRIVATE xpti)
+    target_link_libraries(ur_loader PRIVATE ${TARGET_XPTI})
     target_include_directories(ur_loader PRIVATE ${xpti_SOURCE_DIR}/include)
     target_compile_definitions(ur_loader PRIVATE XPTI_STATIC_LIBRARY)
 endif()
@@ -92,8 +92,10 @@ endif()
 
 
 # link validation backtrace dependencies
-find_package(Libbacktrace)
-if (VAL_USE_LIBBACKTRACE_BACKTRACE AND LIBBACKTRACE_FOUND AND UNIX)
+if(UNIX)
+    find_package(Libbacktrace)
+endif()
+if (VAL_USE_LIBBACKTRACE_BACKTRACE AND LIBBACKTRACE_FOUND)
     message(STATUS "Using libbacktrace backtrace for validation")
 
     target_sources(ur_loader PRIVATE

tools/urtrace/CMakeLists.txt

@@ -11,7 +11,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
     ${CMAKE_SOURCE_DIR}/include
 )
 
-target_link_libraries(${TARGET_NAME} PRIVATE xpti ${PROJECT_NAME}::common ${CMAKE_DL_LIBS})
+target_link_libraries(${TARGET_NAME} PRIVATE ${TARGET_XPTI} ${PROJECT_NAME}::common ${CMAKE_DL_LIBS})
 target_include_directories(${TARGET_NAME} PRIVATE ${xpti_SOURCE_DIR}/include)
 
 if(MSVC)

tools/urtrace/urtrace

@@ -62,7 +62,6 @@ if args.debug:
     print(config)
 env = dict()
 
-env['UR_LOG_COLLECTOR']="level:info;output:stderr;flush:info"
 collector_args = ""
 if args.print_begin:
     collector_args += "print_begin;"
@@ -81,15 +80,16 @@ env['UR_COLLECTOR_ARGS'] = collector_args
 log_collector = ""
 if args.debug:
     log_collector += "level:debug;"
+    log_collector += "flush:debug;"
 else:
     log_collector += "level:info;"
+    log_collector += "flush:info;"
 if args.file:
     log_collector += "output:file," + args.file + ";"
 elif args.stdout:
-    log_collector += "output:stdout;"
+    log_collector += "output:stdout"
 else:
-    log_collector += "output:stderr;"
-log_collector += "flush:error"
+    log_collector += "output:stderr"
 env['UR_LOG_COLLECTOR'] = log_collector
 
 env['XPTI_TRACE_ENABLE'] = "1"