Merge remote-tracking branch 'upstream/sycl' into urlog

Author: mateuszpn

.github/workflows/ur-source-checks.yml

@@ -33,7 +33,7 @@ jobs:
       if: matrix.os == 'ubuntu-22.04'
       run: |
         sudo apt-get update
-        sudo apt-get install -y doxygen
+        sudo apt-get install -y doxygen libhwloc-dev
 
     - name: "[Win] Install doxygen"
       if: matrix.os == 'windows-2022'
@@ -53,7 +53,6 @@ jobs:
         -DCMAKE_BUILD_TYPE=Debug
         -DUR_BUILD_TESTS=OFF
         -DUR_FORMAT_CPP_STYLE=ON
-        -DUMF_DISABLE_HWLOC=ON
 
     # Verifying license should be enough on a single OS
     - name: Verify that each source file contains a license

llvm/lib/SYCLLowerIR/ESIMD/ESIMDVerifier.cpp

@@ -97,6 +97,8 @@ class BuffDeleter {
   BuffDeleter() = delete;
   BuffDeleter(const BuffDeleter &) = delete;
   BuffDeleter(BuffDeleter &&) = delete;
+  BuffDeleter &operator=(BuffDeleter &) = delete;
+  BuffDeleter &operator=(BuffDeleter &&) = delete;
 
 private:
   char *Buff;

sycl/cmake/modules/FetchUnifiedRuntime.cmake

@@ -87,8 +87,6 @@ if(IS_DIRECTORY "${UR_INTREE_SOURCE_DIR}")
   if(WIN32)
     set(UMF_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "Build UMF shared library")
     set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC")
-  else()
-    set(UMF_DISABLE_HWLOC ${SYCL_UMF_DISABLE_HWLOC} CACHE INTERNAL "Disable hwloc for UMF")
   endif()
   add_subdirectory(${UNIFIED_RUNTIME_SOURCE_DIR} ${UR_INTREE_BINARY_DIR})
 elseif(SYCL_UR_USE_FETCH_CONTENT)

unified-runtime/source/adapters/cuda/common.cpp

@@ -105,6 +105,30 @@ void checkErrorUR(nvmlReturn_t Result, const char *Function, int Line,
   throw mapErrorUR(Result);
 }
 
+void checkErrorUR(nvmlReturn_t Result, const char *Function, int Line,
+                  const char *File) {
+  if (Result == NVML_SUCCESS) {
+    return;
+  }
+
+  const char *ErrorString = nullptr;
+  ErrorString = nvmlErrorString(Result);
+  std::stringstream SS;
+  SS << "\nUR NVML ERROR:"
+     << "\n\tValue:           " << Result
+     << "\n\tDescription:     " << ErrorString
+     << "\n\tFunction:        " << Function << "\n\tSource Location: " << File
+     << ":" << Line << "\n";
+  logger::error("{}", SS.str());
+
+  if (std::getenv("PI_CUDA_ABORT") != nullptr ||
+      std::getenv("UR_CUDA_ABORT") != nullptr) {
+    std::abort();
+  }
+
+  throw mapErrorUR(Result);
+}
+
 void checkErrorUR(ur_result_t Result, const char *Function, int Line,
                   const char *File) {
   if (Result == UR_RESULT_SUCCESS) {

unified-runtime/source/loader/layers/sanitizer/tsan/tsan_ddi.cpp

@@ -1008,7 +1008,7 @@ ur_result_t urKernelSetArgValue(
     const ur_kernel_arg_value_properties_t *pProperties,
     /// [in] argument value represented as matching arg type.
     const void *pArgValue) {
-  URLOG_CTX(DEBUG, "==== urKernelSetArgValue");
+   URLOG_CTX(DEBUG, "==== urKernelSetArgValue");
 
   std::shared_ptr<MemBuffer> MemBuffer;
   if (argSize == sizeof(ur_mem_handle_t) &&