wip

Author: AllanZyne

source/loader/layers/sanitizer/msan/msan_ddi.cpp

@@ -1319,8 +1319,8 @@ ur_result_t UR_APICALL urEnqueueUSMFill(
             getMsanInterceptor()->getDeviceInfo(MemInfo->Device);
         const auto MemShadow = DeviceInfo->Shadow->MemToShadow(Mem);
 
-        UR_CALL(EnqueueUSMBlockingSet(hQueue, (void *)MemShadow, 0, size, 1,
-                                      phEvent, phEvent));
+        UR_CALL(EnqueueUSMBlockingSet(hQueue, (void *)MemShadow, 0, size,
+                                      phEvent ? 1 : 0, phEvent, phEvent));
     }
 
     return UR_RESULT_SUCCESS;
@@ -1367,16 +1367,17 @@ ur_result_t UR_APICALL urEnqueueUSMMemcpy(
         const auto DstShadow = DeviceInfo->Shadow->MemToShadow(Dst);
 
         UR_CALL(pfnUSMMemcpy(hQueue, blocking, (void *)DstShadow,
-                             (void *)SrcShadow, size, 1, phEvent, phEvent));
+                             (void *)SrcShadow, size, phEvent ? 1 : 0, phEvent,
+                             phEvent));
     } else if (DstInfoItOp) {
         auto DstInfo = (*DstInfoItOp)->second;
 
         const auto &DeviceInfo =
             getMsanInterceptor()->getDeviceInfo(DstInfo->Device);
         auto DstShadow = DeviceInfo->Shadow->MemToShadow(Dst);
 
-        UR_CALL(EnqueueUSMBlockingSet(hQueue, (void *)DstShadow, 0, size, 1,
-                                      phEvent, phEvent));
+        UR_CALL(EnqueueUSMBlockingSet(hQueue, (void *)DstShadow, 0, size,
+                                      phEvent ? 1 : 0, phEvent, phEvent));
     }
 
     return UR_RESULT_SUCCESS;
@@ -1427,7 +1428,7 @@ ur_result_t UR_APICALL urEnqueueUSMFill2D(
 
         const char Pattern = 0;
         UR_CALL(pfnUSMFill2D(hQueue, (void *)MemShadow, pitch, 1, &Pattern,
-                             width, height, 1, phEvent, phEvent));
+                             width, height, phEvent ? 1 : 0, phEvent, phEvent));
     }
 
     return UR_RESULT_SUCCESS;
@@ -1481,7 +1482,7 @@ ur_result_t UR_APICALL urEnqueueUSMMemcpy2D(
 
         UR_CALL(pfnUSMMemcpy2D(hQueue, blocking, (void *)DstShadow, dstPitch,
                                (void *)SrcShadow, srcPitch, width, height,
-                               numEventsInWaitList, phEventWaitList, phEvent));
+                               phEvent ? 1 : 0, phEvent, phEvent));
     } else if (DstInfoItOp) {
         auto DstInfo = (*DstInfoItOp)->second;
 
@@ -1491,8 +1492,8 @@ ur_result_t UR_APICALL urEnqueueUSMMemcpy2D(
 
         const char Pattern = 0;
         UR_CALL(getContext()->urDdiTable.Enqueue.pfnUSMFill2D(
-            hQueue, (void *)DstShadow, dstPitch, 1, &Pattern, width, height, 1,
-            phEvent, phEvent));
+            hQueue, (void *)DstShadow, dstPitch, 1, &Pattern, width, height,
+            phEvent ? 1 : 0, phEvent, phEvent));
     }
 
     return UR_RESULT_SUCCESS;

source/loader/layers/sanitizer/msan/msan_interceptor.cpp

@@ -72,7 +72,7 @@ ur_result_t MsanInterceptor::allocateMemory(ur_context_handle_t Context,
     // For memory release
     {
         std::scoped_lock<ur_shared_mutex> Guard(m_AllocationMapMutex);
-        m_AllocationMap.emplace(AI->AllocBegin, std::move(AI));
+        m_AllocationMap.emplace(AI->AllocBegin, AI);
     }
 
     ManagedQueue Queue(Context, Device);

source/loader/layers/sanitizer/msan/msan_shadow.cpp

@@ -178,9 +178,6 @@ ur_result_t MsanShadowMemoryGPU::EnqueueMapShadow(
     std::vector<ur_event_handle_t> &EventWaitList,
     ur_event_handle_t *OutEvent) {
 
-    ur_physical_mem_properties_t Desc{UR_STRUCTURE_TYPE_PHYSICAL_MEM_PROPERTIES,
-                                      nullptr, 0};
-
     const size_t PageSize = GetVirtualMemGranularity(Context, Device);
 
     const uptr ShadowBegin = MemToShadow(Ptr);
@@ -194,7 +191,7 @@ ur_result_t MsanShadowMemoryGPU::EnqueueMapShadow(
         if (VirtualMemMaps.find(MappedPtr) == VirtualMemMaps.end()) {
             ur_physical_mem_handle_t PhysicalMem{};
             auto URes = getContext()->urDdiTable.PhysicalMem.pfnCreate(
-                Context, Device, PageSize, &Desc, &PhysicalMem);
+                Context, Device, PageSize, nullptr, &PhysicalMem);
             if (URes != UR_RESULT_SUCCESS) {
                 getContext()->logger.error("urPhysicalMemCreate(): {}", URes);
                 return URes;
@@ -223,7 +220,8 @@ ur_result_t MsanShadowMemoryGPU::EnqueueMapShadow(
             }
 
             EventWaitList.clear();
-            EventWaitList.push_back(*OutEvent);
+            if (OutEvent)
+                EventWaitList.push_back(*OutEvent);
 
             VirtualMemMaps[MappedPtr].first = PhysicalMem;
         }