Temporary workaround for urEnqueueKernelLaunchWithArgsExp() in sanitizers

Author: ldorau

unified-runtime/source/loader/layers/sanitizer/asan/asan_ddi.cpp

@@ -1774,10 +1774,19 @@ __urdlllocal ur_result_t UR_APICALL urEnqueueKernelLaunchWithArgsExp(
 
   UR_CALL(getAsanInterceptor()->preLaunchKernel(hKernel, hQueue, LaunchInfo));
 
-  UR_CALL(getContext()->urDdiTable.EnqueueExp.pfnKernelLaunchWithArgsExp(
+  /*
+    // TODO: revert to the correct call to pfnKernelLaunchWithArgsExp():
+    UR_CALL(getContext()->urDdiTable.EnqueueExp.pfnKernelLaunchWithArgsExp(
+        hQueue, hKernel, workDim, pGlobalWorkOffset, pGlobalWorkSize,
+        LaunchInfo.LocalWorkSize.data(), numArgs, pArgs,
+    numPropsInLaunchPropList, launchPropList, numEventsInWaitList,
+    phEventWaitList, phEvent));
+  */
+
+  UR_CALL(getContext()->urDdiTable.Enqueue.pfnKernelLaunch(
       hQueue, hKernel, workDim, pGlobalWorkOffset, pGlobalWorkSize,
-      LaunchInfo.LocalWorkSize.data(), 0, nullptr, numPropsInLaunchPropList,
-      launchPropList, numEventsInWaitList, phEventWaitList, phEvent));
+      LaunchInfo.LocalWorkSize.data(), numPropsInLaunchPropList, launchPropList,
+      numEventsInWaitList, phEventWaitList, phEvent));
 
   UR_CALL(getAsanInterceptor()->postLaunchKernel(hKernel, hQueue, LaunchInfo));
 

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

@@ -1938,10 +1938,19 @@ ur_result_t urEnqueueKernelLaunchWithArgsExp(
 
   UR_CALL(getMsanInterceptor()->preLaunchKernel(hKernel, hQueue, LaunchInfo));
 
-  UR_CALL(getContext()->urDdiTable.EnqueueExp.pfnKernelLaunchWithArgsExp(
+  /*
+    // TODO: revert to the correct call to pfnKernelLaunchWithArgsExp():
+    UR_CALL(getContext()->urDdiTable.EnqueueExp.pfnKernelLaunchWithArgsExp(
+        hQueue, hKernel, workDim, pGlobalWorkOffset, pGlobalWorkSize,
+        LaunchInfo.LocalWorkSize.data(), numArgs, pArgs,
+    numPropsInLaunchPropList, launchPropList, numEventsInWaitList,
+    phEventWaitList, phEvent));
+  */
+
+  UR_CALL(getContext()->urDdiTable.Enqueue.pfnKernelLaunch(
       hQueue, hKernel, workDim, pGlobalWorkOffset, pGlobalWorkSize,
-      LaunchInfo.LocalWorkSize.data(), 0, nullptr, numPropsInLaunchPropList,
-      launchPropList, numEventsInWaitList, phEventWaitList, phEvent));
+      LaunchInfo.LocalWorkSize.data(), numPropsInLaunchPropList, launchPropList,
+      numEventsInWaitList, phEventWaitList, phEvent));
 
   UR_CALL(getMsanInterceptor()->postLaunchKernel(hKernel, hQueue, LaunchInfo));
 

unified-runtime/source/loader/layers/sanitizer/tsan/tsan_ddi.cpp

@@ -1460,9 +1460,17 @@ ur_result_t urEnqueueKernelLaunchWithArgsExp(
 
   UR_CALL(getTsanInterceptor()->preLaunchKernel(hKernel, hQueue, LaunchInfo));
 
-  UR_CALL(getContext()->urDdiTable.EnqueueExp.pfnKernelLaunchWithArgsExp(
+  /*
+    // TODO: revert to the correct call to pfnKernelLaunchWithArgsExp():
+    UR_CALL(getContext()->urDdiTable.EnqueueExp.pfnKernelLaunchWithArgsExp(
+        hQueue, hKernel, workDim, pGlobalWorkOffset, pGlobalWorkSize,
+        pLocalWorkSize, numArgs, pArgs, numPropsInLaunchPropList,
+    launchPropList, numEventsInWaitList, phEventWaitList, phEvent));
+  */
+
+  UR_CALL(getContext()->urDdiTable.Enqueue.pfnKernelLaunch(
       hQueue, hKernel, workDim, pGlobalWorkOffset, pGlobalWorkSize,
-      pLocalWorkSize, 0, nullptr, numPropsInLaunchPropList, launchPropList,
+      pLocalWorkSize, numPropsInLaunchPropList, launchPropList,
       numEventsInWaitList, phEventWaitList, phEvent));
 
   UR_CALL(getTsanInterceptor()->postLaunchKernel(hKernel, hQueue, LaunchInfo));