Only keep one copy of asan_libdevice.hpp

Author: zhaomaosu

libdevice/CMakeLists.txt

@@ -8,6 +8,16 @@ set(CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
   )
 
+if(EXISTS ${FETCHCONTENT_BASE_DIR}/unified-runtime-src)
+  set(UR_SANITIZER_INCLUDE_DIR
+      ${FETCHCONTENT_BASE_DIR}/unified-runtime-src/source/loader/layers/sanitizer)
+elseif(EXISTS ${SYCL_UR_SOURCE_DIR})
+  set(UR_SANITIZER_INCLUDE_DIR
+      ${SYCL_UR_SOURCE_DIR}/source/loader/layers/sanitizer)
+else()
+  message(FATAL_ERROR "Unified Runtime source directory is not provided")
+endif()
+
 # Build libdevice for SYCL.
 include(SYCLLibdevice)
 

libdevice/cmake/modules/SYCLLibdevice.cmake

@@ -203,7 +203,7 @@ set(bfloat16_obj_deps sycl-headers sycl-compiler)
 if (NOT MSVC)
   set(sanitizer_obj_deps
     device.h atomic.hpp spirv_vars.h
-    include/asan_libdevice.hpp
+    ${UR_SANITIZER_INCLUDE_DIR}/asan_libdevice.hpp
     include/sanitizer_utils.hpp
     include/spir_global_var.hpp
     sycl-compiler)
@@ -271,7 +271,7 @@ else()
   add_devicelibs(libsycl-sanitizer
     SRC sanitizer_utils.cpp
     DEPENDENCIES ${sanitizer_obj_deps}
-    EXTRA_OPTS -fno-sycl-instrument-device-code)
+    EXTRA_OPTS -fno-sycl-instrument-device-code -I${UR_SANITIZER_INCLUDE_DIR})
 endif()
 
 add_devicelibs(libsycl-fallback-cassert

libdevice/include/asan_libdevice.hpp

@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "asan_libdevice.hpp"
 #include "atomic.hpp"
 #include "device.h"
 #include "spirv_vars.h"
 
-#include "include/asan_libdevice.hpp"
 #include "include/sanitizer_utils.hpp"
 
 using uptr = uintptr_t;