Skip to content

Commit a1fc6f3

Browse files
committed
Add a DeviceGetInfo test for DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS
1 parent 9ae51d1 commit a1fc6f3

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

source/adapters/hip/device.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
841841
case UR_DEVICE_INFO_COMPOSITE_DEVICE:
842842
// These two are exclusive of L0.
843843
return ReturnValue(0);
844+
case UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS:
845+
return ReturnValue(false);
844846

845847
// TODO: Investigate if this information is available on HIP.
846848
case UR_DEVICE_INFO_GPU_EU_COUNT:

source/adapters/level_zero/device.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(
863863
return ReturnValue(result);
864864
}
865865

866+
<<<<<<< HEAD
866867
case UR_DEVICE_INFO_COMPONENT_DEVICES: {
867868
ze_device_handle_t DevHandle = Device->ZeDevice;
868869
uint32_t SubDeviceCount = 0;
@@ -965,6 +966,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(
965966
case UR_DEVICE_INFO_INTEROP_MEMORY_EXPORT_SUPPORT_EXP:
966967
case UR_DEVICE_INFO_INTEROP_SEMAPHORE_IMPORT_SUPPORT_EXP:
967968
case UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP:
969+
case UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS:
970+
return ReturnValue(false);
971+
968972
default:
969973
logger::error("Unsupported ParamName in urGetDeviceInfo");
970974
logger::error("ParamNameParamName={}(0x{})", ParamName,

source/adapters/opencl/device.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
839839
case UR_DEVICE_INFO_COMPILER_AVAILABLE:
840840
case UR_DEVICE_INFO_LINKER_AVAILABLE:
841841
case UR_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC:
842-
case UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS:
843842
case UR_DEVICE_INFO_SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS: {
844843
/* CL type: cl_bool
845844
* UR type: ur_bool_t */
@@ -968,6 +967,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
968967
* EU device-specific information extensions. Some of the queries are
969968
* enabled by cl_intel_device_attribute_query extension, but it's not yet in
970969
* the Registry. */
970+
case UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS: {
971+
return ReturnValue(false);
972+
}
971973
case UR_DEVICE_INFO_PCI_ADDRESS:
972974
case UR_DEVICE_INFO_GPU_EU_COUNT:
973975
case UR_DEVICE_INFO_GPU_EU_SIMD_WIDTH:

test/conformance/device/urDeviceGetInfo.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ INSTANTIATE_TEST_SUITE_P(
234234
UR_DEVICE_INFO_MEM_CHANNEL_SUPPORT, //
235235
UR_DEVICE_INFO_HOST_PIPE_READ_WRITE_SUPPORTED, //
236236
UR_DEVICE_INFO_MAX_REGISTERS_PER_WORK_GROUP, //
237-
UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT //
237+
UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT, //
238+
UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS //
238239
),
239240
[](const ::testing::TestParamInfo<ur_device_info_t> &info) {
240241
std::stringstream ss;

test/conformance/kernel/kernel_adapter_level_zero.match

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,3 @@ urKernelSetExecInfoTest.SuccessIndirectAccess/Intel_R__oneAPI_Unified_Runtime_ov
1212
urKernelSetExecInfoUSMPointersTest.SuccessHost/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
1313
urKernelSetExecInfoUSMPointersTest.SuccessDevice/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
1414
urKernelSetExecInfoUSMPointersTest.SuccessShared/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
15-
urKernelSetSpecializationConstantsTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
16-
urKernelSetSpecializationConstantsTest.InvalidNullHandleKernel/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
17-
urKernelSetSpecializationConstantsTest.InvalidNullPointerSpecConstants/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
18-
urKernelSetSpecializationConstantsTest.InvalidSizeCount/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
urKernelSetArgValueTest.InvalidKernelArgumentSize/Intel_R__OpenCL___{{.*}}
2-
urKernelSetSpecializationConstantsTest.Success/Intel_R__OpenCL___{{.*}}
3-
urKernelSetSpecializationConstantsTest.InvalidNullHandleKernel/Intel_R__OpenCL___{{.*}}
4-
urKernelSetSpecializationConstantsTest.InvalidNullPointerSpecConstants/Intel_R__OpenCL___{{.*}}
5-
urKernelSetSpecializationConstantsTest.InvalidSizeCount/Intel_R__OpenCL___{{.*}}

0 commit comments

Comments
 (0)