From 921ed883bc63da9890e0a1eb5a35daef1f7942b1 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Wed, 25 Jun 2025 07:55:52 +0200 Subject: [PATCH 1/6] add assert --- .../loader/layers/sanitizer/asan/asan_interceptor.cpp | 1 + .../loader/layers/sanitizer/msan/msan_interceptor.cpp | 2 ++ .../source/loader/layers/sanitizer/msan/msan_shadow.cpp | 6 +++--- .../source/loader/layers/sanitizer/tsan/tsan_shadow.cpp | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/unified-runtime/source/loader/layers/sanitizer/asan/asan_interceptor.cpp b/unified-runtime/source/loader/layers/sanitizer/asan/asan_interceptor.cpp index 505ae62f53b79..293268e8c3161 100644 --- a/unified-runtime/source/loader/layers/sanitizer/asan/asan_interceptor.cpp +++ b/unified-runtime/source/loader/layers/sanitizer/asan/asan_interceptor.cpp @@ -671,6 +671,7 @@ KernelInfo &AsanInterceptor::getOrCreateKernelInfo(ur_kernel_handle_t Kernel) { // Create new KernelInfo auto Program = GetProgram(Kernel); auto PI = getProgramInfo(Program); + assert(PI != nullptr && "unregistered program!"); bool IsInstrumented = PI->isKernelInstrumented(Kernel); std::scoped_lock Guard(m_KernelMapMutex); diff --git a/unified-runtime/source/loader/layers/sanitizer/msan/msan_interceptor.cpp b/unified-runtime/source/loader/layers/sanitizer/msan/msan_interceptor.cpp index a1ffb2f102859..5cc7061b44e01 100644 --- a/unified-runtime/source/loader/layers/sanitizer/msan/msan_interceptor.cpp +++ b/unified-runtime/source/loader/layers/sanitizer/msan/msan_interceptor.cpp @@ -229,6 +229,7 @@ ur_result_t MsanInterceptor::registerSpirKernels(ur_program_handle_t Program) { } auto PI = getProgramInfo(Program); + assert(PI != nullptr && "unregistered program!"); for (const auto &SKI : SKInfo) { if (SKI.Size == 0) { continue; @@ -404,6 +405,7 @@ KernelInfo &MsanInterceptor::getOrCreateKernelInfo(ur_kernel_handle_t Kernel) { // Create new KernelInfo auto PI = getProgramInfo(GetProgram(Kernel)); + assert(PI != nullptr && "unregistered program!"); auto KI = std::make_unique(Kernel); KI->IsInstrumented = PI->isKernelInstrumented(Kernel); diff --git a/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp b/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp index 2f14a1f514c49..6243163c1060f 100644 --- a/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp +++ b/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp @@ -75,10 +75,10 @@ GetMsanShadowMemory(ur_context_handle_t Context, ur_device_handle_t Device, static std::shared_ptr ShadowDG2 = std::make_shared(Context, Device); return ShadowDG2; - } else { - UR_LOG_L(getContext()->logger, ERR, "Unsupport device type"); - return nullptr; } + + die("GetMsanShadowMemory: Unsupport device type"); + return nullptr; } ur_result_t MsanShadowMemoryCPU::Setup() { diff --git a/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_shadow.cpp b/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_shadow.cpp index 966df3f202863..94fa7905661fa 100644 --- a/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_shadow.cpp +++ b/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_shadow.cpp @@ -29,10 +29,10 @@ std::shared_ptr GetShadowMemory(ur_context_handle_t Context, return ShadowCPU; } else if (Type == DeviceType::GPU_PVC) { return std::make_shared(Context, Device); - } else { - UR_LOG_L(getContext()->logger, ERR, "Unsupport device type"); - return nullptr; } + + die("GetMsanShadowMemory: Unsupport device type"); + return nullptr; } ur_result_t ShadowMemoryCPU::Setup() { From 6ebbb0063efdada26bc854aeac06072321405ee6 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Wed, 25 Jun 2025 08:18:00 +0200 Subject: [PATCH 2/6] fix typo --- .../source/loader/layers/sanitizer/tsan/tsan_shadow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_shadow.cpp b/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_shadow.cpp index 94fa7905661fa..c2128818ca836 100644 --- a/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_shadow.cpp +++ b/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_shadow.cpp @@ -31,7 +31,7 @@ std::shared_ptr GetShadowMemory(ur_context_handle_t Context, return std::make_shared(Context, Device); } - die("GetMsanShadowMemory: Unsupport device type"); + die("GetShadowMemory: Unsupport device type"); return nullptr; } From 41ac50c577686fc141a0bb94382b013f7c9cc955 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Wed, 25 Jun 2025 08:38:25 +0200 Subject: [PATCH 3/6] empty commit From 2c57a7db80d6606afceede4a1e5a066d79721753 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Wed, 25 Jun 2025 09:03:32 +0200 Subject: [PATCH 4/6] empty commit From 3e725c92e79060f690e9d50f762062eb147c73de Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Thu, 26 Jun 2025 07:14:17 +0200 Subject: [PATCH 5/6] empty commit From 3f65062f58808944c9a2dadaf97408b2d1a293c8 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Mon, 30 Jun 2025 13:16:47 +0800 Subject: [PATCH 6/6] empty commit