Fix update validation for L0 and OpenCL

Fábio Mestre · Fábio Mestre · commit 6e3cd3ee78d6 · 2024-11-06T14:17:37.000Z
diff --git a/source/adapters/level_zero/command_buffer.cpp b/source/adapters/level_zero/command_buffer.cpp
@@ -1372,7 +1372,7 @@ ur_result_t validateCommandDesc(
   logger::debug("Mutable features supported by device {}", SupportedFeatures);
 
   // Kernel handle updates are not yet supported.
-  if (CommandDesc->hNewKernel != Command->Kernel) {
+  if (CommandDesc->hNewKernel && CommandDesc->hNewKernel != Command->Kernel) {
     return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
   }
 
diff --git a/source/adapters/opencl/command_buffer.cpp b/source/adapters/opencl/command_buffer.cpp
@@ -547,7 +547,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateKernelLaunchExp(
         *pUpdateKernelLaunch) {
 
   // Kernel handle updates are not yet supported.
-  if (pUpdateKernelLaunch->hNewKernel != hCommand->Kernel) {
+  if (pUpdateKernelLaunch->hNewKernel &&
+      pUpdateKernelLaunch->hNewKernel != hCommand->Kernel) {
     return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1372,7 +1372,7 @@ ur_result_t validateCommandDesc(`
`1372`	`1372`	`logger::debug("Mutable features supported by device {}", SupportedFeatures);`
`1373`	`1373`
`1374`	`1374`	`// Kernel handle updates are not yet supported.`
`1375`		`- if (CommandDesc->hNewKernel != Command->Kernel) {`
	`1375`	`+ if (CommandDesc->hNewKernel && CommandDesc->hNewKernel != Command->Kernel) {`
`1376`	`1376`	`return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;`
`1377`	`1377`	`}`
`1378`	`1378`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateKernelLaunchExp(`
`547`	`547`	`*pUpdateKernelLaunch) {`
`548`	`548`
`549`	`549`	`// Kernel handle updates are not yet supported.`
`550`		`- if (pUpdateKernelLaunch->hNewKernel != hCommand->Kernel) {`
	`550`	`+ if (pUpdateKernelLaunch->hNewKernel &&`
	`551`	`+ pUpdateKernelLaunch->hNewKernel != hCommand->Kernel) {`
`551`	`552`	`return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;`
`552`	`553`	`}`
`553`	`554`