[DevSAN] Fix incorrect dimension when construct launchinfo (#20558)

zhaomaosu · web-flow · commit 43eedd1c3fd4 · 2025-11-06T07:53:02.000+01:00
diff --git a/unified-runtime/source/loader/layers/sanitizer/asan/asan_ddi.cpp b/unified-runtime/source/loader/layers/sanitizer/asan/asan_ddi.cpp
@@ -1769,7 +1769,7 @@ __urdlllocal ur_result_t UR_APICALL urEnqueueKernelLaunchWithArgsExp(
   }
 
   LaunchInfo LaunchInfo(GetContext(hQueue), GetDevice(hQueue), pGlobalWorkSize,
-                        pLocalWorkSize, pGlobalWorkOffset, 3);
+                        pLocalWorkSize, pGlobalWorkOffset, workDim);
   UR_CALL(LaunchInfo.Data.syncToDevice(hQueue));
 
   UR_CALL(getAsanInterceptor()->preLaunchKernel(hKernel, hQueue, LaunchInfo));
diff --git a/unified-runtime/source/loader/layers/sanitizer/msan/msan_ddi.cpp b/unified-runtime/source/loader/layers/sanitizer/msan/msan_ddi.cpp
@@ -1933,7 +1933,7 @@ ur_result_t urEnqueueKernelLaunchWithArgsExp(
 
   USMLaunchInfo LaunchInfo(GetContext(hQueue), GetDevice(hQueue),
                            pGlobalWorkSize, pLocalWorkSize, pGlobalWorkOffset,
-                           3);
+                           workDim);
   UR_CALL(LaunchInfo.initialize());
 
   UR_CALL(getMsanInterceptor()->preLaunchKernel(hKernel, hQueue, LaunchInfo));
diff --git a/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_ddi.cpp b/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_ddi.cpp
@@ -1456,7 +1456,7 @@ ur_result_t urEnqueueKernelLaunchWithArgsExp(
   }
 
   LaunchInfo LaunchInfo(GetContext(hQueue), GetDevice(hQueue), pGlobalWorkSize,
-                        pLocalWorkSize, pGlobalWorkOffset, 3);
+                        pLocalWorkSize, pGlobalWorkOffset, workDim);
 
   UR_CALL(getTsanInterceptor()->preLaunchKernel(hKernel, hQueue, LaunchInfo));
 

Original file line number	Diff line number	Diff line change
`@@ -1769,7 +1769,7 @@ __urdlllocal ur_result_t UR_APICALL urEnqueueKernelLaunchWithArgsExp(`
`1769`	`1769`	`}`
`1770`	`1770`
`1771`	`1771`	`LaunchInfo LaunchInfo(GetContext(hQueue), GetDevice(hQueue), pGlobalWorkSize,`
`1772`		`- pLocalWorkSize, pGlobalWorkOffset, 3);`
	`1772`	`+ pLocalWorkSize, pGlobalWorkOffset, workDim);`
`1773`	`1773`	`UR_CALL(LaunchInfo.Data.syncToDevice(hQueue));`
`1774`	`1774`
`1775`	`1775`	`UR_CALL(getAsanInterceptor()->preLaunchKernel(hKernel, hQueue, LaunchInfo));`
Original file line number	Diff line number	Diff line change
`@@ -1456,7 +1456,7 @@ ur_result_t urEnqueueKernelLaunchWithArgsExp(`
`1456`	`1456`	`}`
`1457`	`1457`
`1458`	`1458`	`LaunchInfo LaunchInfo(GetContext(hQueue), GetDevice(hQueue), pGlobalWorkSize,`
`1459`		`- pLocalWorkSize, pGlobalWorkOffset, 3);`
	`1459`	`+ pLocalWorkSize, pGlobalWorkOffset, workDim);`
`1460`	`1460`
`1461`	`1461`	`UR_CALL(getTsanInterceptor()->preLaunchKernel(hKernel, hQueue, LaunchInfo));`
`1462`	`1462`