Skip to content

Commit 923eca9

Browse files
authored
[DevMSAN] Don't report error when write __MsanLaunchInfo failed (#18129)
1 parent 536d62c commit 923eca9

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

unified-runtime/source/loader/layers/sanitizer/msan/msan_interceptor.cpp

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -434,18 +434,6 @@ ur_result_t MsanInterceptor::prepareLaunch(
434434
ur_kernel_handle_t Kernel, USMLaunchInfo &LaunchInfo) {
435435
auto Program = GetProgram(Kernel);
436436

437-
auto EnqueueWriteGlobal = [&Queue, &Program](const char *Name,
438-
const void *Value, size_t Size) {
439-
auto Result = getContext()->urDdiTable.Enqueue.pfnDeviceGlobalVariableWrite(
440-
Queue, Program, Name, false, Size, 0, Value, 0, nullptr, nullptr);
441-
if (Result != UR_RESULT_SUCCESS) {
442-
getContext()->logger.error("Failed to write device global \"{}\": {}",
443-
Name, Result);
444-
return Result;
445-
}
446-
return UR_RESULT_SUCCESS;
447-
};
448-
449437
// Set membuffer arguments
450438
auto &KernelInfo = getOrCreateKernelInfo(Kernel);
451439
getContext()->logger.info("KernelInfo {} (Name=<{}>, IsInstrumented={}, "
@@ -578,8 +566,11 @@ ur_result_t MsanInterceptor::prepareLaunch(
578566
(void *)LaunchInfo.Data.Host.LocalArgs, LaunchInfo.Data.Host.NumLocalArgs,
579567
ToString(LaunchInfo.Data.Host.DeviceTy), LaunchInfo.Data.Host.Debug);
580568

581-
ur_result_t URes = EnqueueWriteGlobal(
582-
"__MsanLaunchInfo", &LaunchInfo.Data.DevicePtr, sizeof(uptr));
569+
ur_result_t URes =
570+
getContext()->urDdiTable.Enqueue.pfnDeviceGlobalVariableWrite(
571+
Queue, Program, "__MsanLaunchInfo", false,
572+
sizeof(LaunchInfo.Data.DevicePtr), 0, &LaunchInfo.Data.DevicePtr, 0,
573+
nullptr, nullptr);
583574
if (URes != UR_RESULT_SUCCESS) {
584575
getContext()->logger.info("EnqueueWriteGlobal(__MsanLaunchInfo) "
585576
"failed, maybe empty kernel: {}",

0 commit comments

Comments
 (0)