Merge pull request #2586 from AllanZyne/review/yang/fix_kernel_release

[DeviceASAN] Fix kernel release order
oneapi-src · Jan 22, 2025 · 75eb585 · 75eb585
2 parents f058cb2 + 1e1d7e5
commit 75eb585
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/source/loader/layers/sanitizer/asan/asan_ddi.cpp b/source/loader/layers/sanitizer/asan/asan_ddi.cpp
@@ -1418,12 +1418,12 @@ __urdlllocal ur_result_t urKernelRelease(
   }
 
   getContext()->logger.debug("==== urKernelRelease");
-  UR_CALL(pfnRelease(hKernel));
 
   auto &KernelInfo = getAsanInterceptor()->getOrCreateKernelInfo(hKernel);
   if (--KernelInfo.RefCount == 0) {
     UR_CALL(getAsanInterceptor()->eraseKernelInfo(hKernel));
   }
+  UR_CALL(pfnRelease(hKernel));
 
   return UR_RESULT_SUCCESS;
 }

diff --git a/source/loader/layers/sanitizer/msan/msan_ddi.cpp b/source/loader/layers/sanitizer/msan/msan_ddi.cpp
@@ -1320,12 +1320,12 @@ ur_result_t urKernelRelease(
   auto pfnRelease = getContext()->urDdiTable.Kernel.pfnRelease;
 
   getContext()->logger.debug("==== urKernelRelease");
-  UR_CALL(pfnRelease(hKernel));
 
   auto &KernelInfo = getMsanInterceptor()->getOrCreateKernelInfo(hKernel);
   if (--KernelInfo.RefCount == 0) {
     UR_CALL(getMsanInterceptor()->eraseKernelInfo(hKernel));
   }
+  UR_CALL(pfnRelease(hKernel));
 
   return UR_RESULT_SUCCESS;
 }