Add device validation checks for host timer APIs

jrprice · jrprice · commit 19e8398c7e1a · 2026-03-02T12:04:10.000-05:00
These are supposed to return CL_INVALID_DEVICE, even if the operation
is not supported.
diff --git a/src/runtime/runtime.cpp b/src/runtime/runtime.cpp
@@ -5997,6 +5997,12 @@ clGetDeviceAndHostTimer(cl_device_id device, cl_ulong* device_timestamp,
 {
   REGISTER_API;
 
+  // Check device is valid
+  if (device != m_device)
+  {
+    ReturnErrorArg(NULL, CL_INVALID_DEVICE, device);
+  }
+
   ReturnErrorInfo(nullptr, CL_INVALID_OPERATION,
                   "Unimplemented OpenCL 2.1 API");
 }
@@ -6006,6 +6012,12 @@ CL_API_ENTRY cl_int CL_API_CALL clGetHostTimer(
 {
   REGISTER_API;
 
+  // Check device is valid
+  if (device != m_device)
+  {
+    ReturnErrorArg(NULL, CL_INVALID_DEVICE, device);
+  }
+
   ReturnErrorInfo(nullptr, CL_INVALID_OPERATION,
                   "Unimplemented OpenCL 2.1 API");
 }

Original file line number	Diff line number	Diff line change
`@@ -5997,6 +5997,12 @@ clGetDeviceAndHostTimer(cl_device_id device, cl_ulong* device_timestamp,`
`5997`	`5997`	`{`
`5998`	`5998`	`REGISTER_API;`
`5999`	`5999`
	`6000`	`+ // Check device is valid`
	`6001`	`+ if (device != m_device)`
	`6002`	`+ {`
	`6003`	`+ ReturnErrorArg(NULL, CL_INVALID_DEVICE, device);`
	`6004`	`+ }`
	`6005`	`+`
`6000`	`6006`	`ReturnErrorInfo(nullptr, CL_INVALID_OPERATION,`
`6001`	`6007`	`"Unimplemented OpenCL 2.1 API");`
`6002`	`6008`	`}`
`@@ -6006,6 +6012,12 @@ CL_API_ENTRY cl_int CL_API_CALL clGetHostTimer(`
`6006`	`6012`	`{`
`6007`	`6013`	`REGISTER_API;`
`6008`	`6014`
	`6015`	`+ // Check device is valid`
	`6016`	`+ if (device != m_device)`
	`6017`	`+ {`
	`6018`	`+ ReturnErrorArg(NULL, CL_INVALID_DEVICE, device);`
	`6019`	`+ }`
	`6020`	`+`
`6009`	`6021`	`ReturnErrorInfo(nullptr, CL_INVALID_OPERATION,`
`6010`	`6022`	`"Unimplemented OpenCL 2.1 API");`
`6011`	`6023`	`}`