[DeviceMSAN] Fix empty kernel (#16478)

UR: oneapi-src/unified-runtime#2508 --------- Co-authored-by: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
intel · Feb 19, 2025 · bd0bb9e · bd0bb9e
1 parent a6bd100
commit bd0bb9e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/libdevice/sanitizer/msan_rtl.cpp b/libdevice/sanitizer/msan_rtl.cpp
@@ -162,6 +162,8 @@ inline uptr __msan_get_shadow_pvc(uptr addr, uint32_t as) {
   DEVICE_EXTERN_C_NOINLINE void __msan_maybe_warning_##size(                   \
       type s, u32 o, const char __SYCL_CONSTANT__ *file, uint32_t line,        \
       const char __SYCL_CONSTANT__ *func) {                                    \
+    if (!__MsanLaunchInfo.get())                                               \
+      return;                                                                  \
     if (UNLIKELY(s)) {                                                         \
       __msan_report_error(size, file, line, func);                             \
     }                                                                          \
@@ -178,6 +180,9 @@ DEVICE_EXTERN_C_NOINLINE uptr __msan_get_shadow(uptr addr, uint32_t as) {
       (uptr)((__SYCL_GLOBAL__ MsanLaunchInfo *)__MsanLaunchInfo.get())
           ->CleanShadow;
 
+  if (!__MsanLaunchInfo.get())
+    return shadow_ptr;
+
   if (UNLIKELY(!__MsanLaunchInfo)) {
     __spirv_ocl_printf(__msan_print_warning_nolaunchinfo);
     return shadow_ptr;

diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake
@@ -1,7 +1,7 @@
-# commit 13f5e52ac047bb81f478f0dbe9416a8bc179130a
-# Merge: fe6c83a3 fa1e678a
-# Author: aarongreig <aaron.greig@codeplay.com>
-# Date:   Mon Dec 30 15:14:19 2024 +0000
-#     Merge pull request #2484 from zhaomaosu/move-clean-shadow-to-launchinfo
-#     [DevMSAN] Move clean shadow into launch info
-set(UNIFIED_RUNTIME_TAG 13f5e52ac047bb81f478f0dbe9416a8bc179130a)
+# commit 75745a910cb7197de6e214c1f23c544895afbbb7
+# Merge: 0eb08b67 5a7d8fa0
+# Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
+# Date:   Mon Jan 6 11:21:29 2025 +0000
+#     Merge pull request #2508 from AllanZyne/review/yang/fix_msan_empty_kernel
+#     [DeviceMSAN] Fix empty kernel
+set(UNIFIED_RUNTIME_TAG 75745a910cb7197de6e214c1f23c544895afbbb7)