Fix CI problems.

aarongreig · aarongreig · commit 15b8ce245237 · 2024-06-27T15:40:39.000+01:00
diff --git a/source/adapters/hip/device.cpp b/source/adapters/hip/device.cpp
@@ -881,8 +881,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
     return ReturnValue(false);
   case UR_DEVICE_INFO_TIMESTAMP_RECORDING_SUPPORT_EXP:
     return ReturnValue(true);
-  case UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS:
-    return ReturnValue(false);
 
   case UR_DEVICE_INFO_GLOBAL_VARIABLE_SUPPORT:
     return ReturnValue(false);
diff --git a/source/loader/layers/sanitizer/ur_sanitizer_utils.cpp b/source/loader/layers/sanitizer/ur_sanitizer_utils.cpp
@@ -150,7 +150,7 @@ std::vector<ur_device_handle_t> GetProgramDevices(ur_program_handle_t Program) {
 }
 
 size_t GetKernelNumArgs(ur_kernel_handle_t Kernel) {
-    size_t NumArgs = 0;
+    uint32_t NumArgs = 0;
     [[maybe_unused]] auto Res = context.urDdiTable.Kernel.pfnGetInfo(
         Kernel, UR_KERNEL_INFO_NUM_ARGS, sizeof(NumArgs), &NumArgs, nullptr);
     assert(Res == UR_RESULT_SUCCESS);
diff --git a/test/conformance/kernel/kernel_adapter_opencl.match b/test/conformance/kernel/kernel_adapter_opencl.match
@@ -0,0 +1 @@
+urKernelGetInfoTest.Success/Intel_R__OpenCL_{{.*}}_UR_KERNEL_INFO_NUM_REGS

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ std::vector<ur_device_handle_t> GetProgramDevices(ur_program_handle_t Program) {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`size_t GetKernelNumArgs(ur_kernel_handle_t Kernel) {`
`153`		`- size_t NumArgs = 0;`
	`153`	`+ uint32_t NumArgs = 0;`
`154`	`154`	`[[maybe_unused]] auto Res = context.urDdiTable.Kernel.pfnGetInfo(`
`155`	`155`	`Kernel, UR_KERNEL_INFO_NUM_ARGS, sizeof(NumArgs), &NumArgs, nullptr);`
`156`	`156`	`assert(Res == UR_RESULT_SUCCESS);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+urKernelGetInfoTest.Success/Intel_R__OpenCL_{{.*}}_UR_KERNEL_INFO_NUM_REGS`