[SYCL][UR] Update proxy loader to use Windows debug libs

Author: kbenzie

sycl/ur_win_proxy_loader/CMakeLists.txt

@@ -57,6 +57,7 @@ if (MSVC)
   add_library(ur_win_proxy_loaderd SHARED ur_win_proxy_loader.cpp ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc)
   target_compile_options(ur_win_proxy_loaderd PRIVATE ${WINUNLOAD_CXX_FLAGS_DEBUG})
   target_compile_options(ur_win_proxy_loader PRIVATE ${WINUNLOAD_CXX_FLAGS_RELEASE})
+  target_compile_definitions(ur_win_proxy_loaderd PRIVATE UR_WIN_PROXY_LOADER_DEBUG)
   target_link_libraries(ur_win_proxy_loaderd PRIVATE shlwapi)
   target_link_libraries(ur_win_proxy_loader PRIVATE shlwapi)
   # 0x2000: LOAD_LIBRARY_SAFE_CURRENT_DIRS flag. Using this flag means that loading dependency DLLs

sycl/ur_win_proxy_loader/ur_win_proxy_loader.cpp

@@ -82,24 +82,22 @@ static std::wstring getCurrentDSODir() {
   return Path;
 }
 
-// these are cribbed from include/sycl/detail/ur.hpp
-// a new adapter must be added to both places.
 #ifdef _MSC_VER
-#define __SYCL_UNIFIED_RUNTIME_LOADER_NAME "ur_loader.dll"
-#define __SYCL_OPENCL_ADAPTER_NAME "ur_adapter_opencl.dll"
-#define __SYCL_LEVEL_ZERO_ADAPTER_NAME "ur_adapter_level_zero.dll"
-#define __SYCL_LEVEL_ZERO_V2_ADAPTER_NAME "ur_adapter_level_zero_v2.dll"
-#define __SYCL_CUDA_ADAPTER_NAME "ur_adapter_cuda.dll"
-#define __SYCL_HIP_ADAPTER_NAME "ur_adapter_hip.dll"
-#define __SYCL_NATIVE_CPU_ADAPTER_NAME "ur_adapter_native_cpu.dll"
+
+#ifdef UR_WIN_PROXY_LOADER_DEBUG_POSTFIX
+#define UR_LIBRARY_NAME(NAME) "ur_" #NAME "d.dll"
+#else
+#define UR_LIBRARY_NAME(NAME) "ur_" #NAME ".dll"
+#endif
+
 #else // llvm-mingw
-#define __SYCL_UNIFIED_RUNTIME_LOADER_NAME "libur_loader.dll"
-#define __SYCL_OPENCL_ADAPTER_NAME "libur_adapter_opencl.dll"
-#define __SYCL_LEVEL_ZERO_ADAPTER_NAME "libur_adapter_level_zero.dll"
-#define __SYCL_LEVEL_ZERO_V2_ADAPTER_NAME "libur_adapter_level_zero_v2.dll"
-#define __SYCL_CUDA_ADAPTER_NAME "libur_adapter_cuda.dll"
-#define __SYCL_HIP_ADAPTER_NAME "libur_adapter_hip.dll"
-#define __SYCL_NATIVE_CPU_ADAPTER_NAME "libur_adapter_native_cpu.dll"
+
+#ifdef UR_WIN_PROXY_LOADER_DEBUG_POSTFIX
+#define UR_LIBRARY_NAME(NAME) "libur" #NAME "d.dll"
+#else
+#define UR_LIBRARY_NAME(NAME) "libur" #NAME ".dll"
+#endif
+
 #endif
 
 // ------------------------------------
@@ -141,13 +139,13 @@ void preloadLibraries() {
   };
   // We keep the UR Loader handle so it can be fetched by the runtime, but the
   // adapter libraries themselves won't be used.
-  getDllHandle() = loadAdapter(__SYCL_UNIFIED_RUNTIME_LOADER_NAME);
-  loadAdapter(__SYCL_OPENCL_ADAPTER_NAME);
-  loadAdapter(__SYCL_LEVEL_ZERO_ADAPTER_NAME);
-  loadAdapter(__SYCL_LEVEL_ZERO_V2_ADAPTER_NAME);
-  loadAdapter(__SYCL_CUDA_ADAPTER_NAME);
-  loadAdapter(__SYCL_HIP_ADAPTER_NAME);
-  loadAdapter(__SYCL_NATIVE_CPU_ADAPTER_NAME);
+  getDllHandle() = loadAdapter(UR_LIBRARY_NAME(loader));
+  loadAdapter(UR_LIBRARY_NAME(adapter_opencl));
+  loadAdapter(UR_LIBRARY_NAME(adapter_level_zero));
+  loadAdapter(UR_LIBRARY_NAME(adapter_level_zero_v2));
+  loadAdapter(UR_LIBRARY_NAME(adapter_cuda));
+  loadAdapter(UR_LIBRARY_NAME(adapter_hip));
+  loadAdapter(UR_LIBRARY_NAME(adapter_native_cpu));
 
   // Restore system error handling.
   (void)SetErrorMode(SavedMode);