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..c2128818ca836 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("GetShadowMemory: Unsupport device type"); + return nullptr; } ur_result_t ShadowMemoryCPU::Setup() {