From fdb7081540c240ddc98554c64897d6aec7247beb Mon Sep 17 00:00:00 2001 From: "Zhao, Yang2" Date: Thu, 26 Dec 2024 07:31:20 +0100 Subject: [PATCH 1/4] check __MsanLaunchInfo wether empty --- libdevice/sanitizer/msan_rtl.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libdevice/sanitizer/msan_rtl.cpp b/libdevice/sanitizer/msan_rtl.cpp index ab02f4d0662e5..2d1f441d49d63 100644 --- a/libdevice/sanitizer/msan_rtl.cpp +++ b/libdevice/sanitizer/msan_rtl.cpp @@ -144,6 +144,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); \ } \ @@ -155,6 +157,9 @@ MSAN_MAYBE_WARNING(u32, 4) MSAN_MAYBE_WARNING(u64, 8) DEVICE_EXTERN_C_NOINLINE uptr __msan_get_shadow(uptr addr, uint32_t as) { + if (!__MsanLaunchInfo.get()) + return; + // Return clean shadow (0s) by default uptr shadow_ptr = (uptr)CleanShadow; From 80de8a0365e335c339d4cdf53d701b4f7be632c0 Mon Sep 17 00:00:00 2001 From: "Zhao, Yang2" Date: Thu, 26 Dec 2024 07:31:59 +0100 Subject: [PATCH 2/4] update ur --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..1ed066b389aa3 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,7 +116,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + set(UNIFIED_RUNTIME_REPO "https://github.com/AllanZyne/unified-runtime.git") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 8860fc1dd9fb1..125f8a1628619 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Thu Dec 19 11:26:01 2024 +0000 # Merge pull request #2277 from igchor/cooperative_fix # [Spec] fix urKernelSuggestMaxCooperativeGroupCountExp -set(UNIFIED_RUNTIME_TAG ea0f3a1f5f15f9af7bf40bd13669afeb9ada569c) +set(UNIFIED_RUNTIME_TAG review/yang/fix_msan_empty_kernel) From f32be78fcce3be9a4c3e5693f60f298f0847c122 Mon Sep 17 00:00:00 2001 From: "Zhao, Yang2" Date: Fri, 27 Dec 2024 06:50:28 +0100 Subject: [PATCH 3/4] fix build --- libdevice/sanitizer/msan_rtl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libdevice/sanitizer/msan_rtl.cpp b/libdevice/sanitizer/msan_rtl.cpp index 2d1f441d49d63..970881bade263 100644 --- a/libdevice/sanitizer/msan_rtl.cpp +++ b/libdevice/sanitizer/msan_rtl.cpp @@ -157,12 +157,12 @@ MSAN_MAYBE_WARNING(u32, 4) MSAN_MAYBE_WARNING(u64, 8) DEVICE_EXTERN_C_NOINLINE uptr __msan_get_shadow(uptr addr, uint32_t as) { - if (!__MsanLaunchInfo.get()) - return; - // Return clean shadow (0s) by default uptr shadow_ptr = (uptr)CleanShadow; + if (!__MsanLaunchInfo.get()) + return shadow_ptr; + if (UNLIKELY(!__MsanLaunchInfo)) { __spirv_ocl_printf(__msan_print_warning_nolaunchinfo); return shadow_ptr; From 4e27d427e7b8ab8c27e048fee573d13377bf5fea Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Mon, 6 Jan 2025 12:06:23 +0000 Subject: [PATCH 4/4] [UR] Bump main tag to 75745a91 --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 1ed066b389aa3..72841724fa01d 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,7 +116,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/AllanZyne/unified-runtime.git") + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 125f8a1628619..24c01c0ae2325 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit ea0f3a1f5f15f9af7bf40bd13669afeb9ada569c -# Merge: bb64b3e9f6d3 4a89e1c69a65 -# Author: Martin Grant -# Date: Thu Dec 19 11:26:01 2024 +0000 -# Merge pull request #2277 from igchor/cooperative_fix -# [Spec] fix urKernelSuggestMaxCooperativeGroupCountExp -set(UNIFIED_RUNTIME_TAG review/yang/fix_msan_empty_kernel) +# commit 75745a910cb7197de6e214c1f23c544895afbbb7 +# Merge: 0eb08b67 5a7d8fa0 +# Author: Kenneth Benzie (Benie) +# 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)