[SYCL] Fix build with XPTI disabled

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

buildbot/configure.py

@@ -62,7 +62,7 @@ def do_configure(args, passthrough_args):
     sycl_enabled_backends = ["opencl"]
     sycl_preview_lib = "ON"
 
-    sycl_enable_xpti_tracing = "ON"
+    sycl_enable_xpti_tracing = "OFF"
     xpti_enable_werror = "OFF"
     llvm_enable_zstd = "ON"
     spirv_enable_dis = "OFF"

sycl/cmake/modules/FetchUnifiedRuntime.cmake

@@ -29,9 +29,9 @@ set(UR_BUILD_TESTS "${SYCL_UR_BUILD_TESTS}" CACHE BOOL "" FORCE)
 set(UR_BUILD_EXAMPLES "${SYCL_UR_BUILD_TESTS}" CACHE BOOL "" FORCE)
 
 # Here we override the defaults to unified-runtime
-set(UR_BUILD_XPTI_LIBS OFF)
+set(UR_BUILD_XPTI_LIBS OFF CACHE BOOL "")
 set(UR_ENABLE_SYMBOLIZER ON CACHE BOOL "Enable symbolizer for sanitizer layer.")
-set(UR_ENABLE_TRACING ON)
+set(UR_ENABLE_TRACING ON CACHE_BOOL "")
 
 set(UR_EXTERNAL_DEPENDENCIES "sycl-headers" CACHE STRING
   "List of external CMake targets for executables/libraries to depend on" FORCE)

sycl/unittests/CMakeLists.txt

@@ -57,7 +57,7 @@ if (LLVM_ENABLE_ZSTD)
 endif()
 
 # TODO Enable xpti tests for Windows
-if (NOT WIN32)
+if (SYCL_ENABLE_XPTI_TRACING AND NOT WIN32)
     add_subdirectory(xpti_trace)
 endif()
 add_subdirectory(sampler)