[SYCL] Fix build with XPTI disabled

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

Author: sarnex

sycl/CMakeLists.txt

@@ -362,6 +362,12 @@ if (NOT WIN32)
     COMPONENT sycl-headers-extras)
 endif()
 
+if(SYCL_ENABLE_XPTI_TRACING AND
+    DEFINED LLVM_EXTERNAL_PROJECTS AND
+    (NOT "xpti" IN_LIST LLVM_EXTERNAL_PROJECTS OR NOT "xptifw" IN_LIST LLVM_EXTERNAL_PROJECTS))
+  message(FATAL_ERROR "SYCL_ENABLE_XPTI_TRACING=ON but XPTI is not going to be built")
+endif()
+
 if (SYCL_ENABLE_XPTI_TRACING)
   if (MSVC)
     set(XPTIFW_LIBS xpti xptid xptifw xptifwd)

sycl/cmake/modules/FetchUnifiedRuntime.cmake

@@ -29,9 +29,9 @@ option(SYCL_UMF_DISABLE_HWLOC
 # Here we override the defaults to disable building tests from unified-runtime
 set(UR_BUILD_EXAMPLES OFF CACHE BOOL "Build example applications." FORCE)
 set(UR_BUILD_TESTS OFF CACHE BOOL "Build unit tests." FORCE)
-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 LIST
   "List of external CMake targets for executables/libraries to depend on" FORCE)

sycl/unittests/CMakeLists.txt

@@ -54,7 +54,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)

unified-runtime/CMakeLists.txt

@@ -136,6 +136,13 @@ if(NOT MSVC)
     endif()
 endif()
 
+if(NOT UR_STANDALONE_BUILD AND
+    UR_ENABLE_TRACING AND
+    DEFINED LLVM_EXTERNAL_PROJECTS AND
+    (NOT "xpti" IN_LIST LLVM_EXTERNAL_PROJECTS OR NOT "xptifw" IN_LIST LLVM_EXTERNAL_PROJECTS))
+  message(FATAL_ERROR "UR_ENABLE_TRACING=ON but XPTI is not going to be built")
+endif()
+
 if(UR_ENABLE_TRACING)
     add_compile_definitions(UR_ENABLE_TRACING)