Skip to content

Commit 3da54f2

Browse files
committed
Fix bool return values in CUDA and HIP UR adapters
1 parent 76361a8 commit 3da54f2

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

source/adapters/hip/device.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
223223
return ReturnValue(uint64_t{MaxAlloc});
224224
}
225225
case UR_DEVICE_INFO_IMAGE_SUPPORTED: {
226-
return ReturnValue(true);
226+
return ReturnValue(ur_bool_t{true});
227227
}
228228
case UR_DEVICE_INFO_MAX_READ_IMAGE_ARGS: {
229229
// This call doesn't match to HIP as it doesn't have images, but instead
@@ -458,19 +458,19 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
458458
return ReturnValue(size_t(1000));
459459
}
460460
case UR_DEVICE_INFO_ENDIAN_LITTLE: {
461-
return ReturnValue(true);
461+
return ReturnValue(ur_bool_t{true});
462462
}
463463
case UR_DEVICE_INFO_AVAILABLE: {
464-
return ReturnValue(true);
464+
return ReturnValue(ur_bool_t{true});
465465
}
466466
case UR_DEVICE_INFO_BUILD_ON_SUBDEVICE: {
467-
return ReturnValue(true);
467+
return ReturnValue(ur_bool_t{true});
468468
}
469469
case UR_DEVICE_INFO_COMPILER_AVAILABLE: {
470-
return ReturnValue(true);
470+
return ReturnValue(ur_bool_t{true});
471471
}
472472
case UR_DEVICE_INFO_LINKER_AVAILABLE: {
473-
return ReturnValue(true);
473+
return ReturnValue(ur_bool_t{true});
474474
}
475475
case UR_DEVICE_INFO_EXECUTION_CAPABILITIES: {
476476
auto Capability = ur_device_exec_capability_flags_t{
@@ -583,7 +583,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
583583
return ReturnValue(size_t(1024));
584584
}
585585
case UR_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC: {
586-
return ReturnValue(true);
586+
return ReturnValue(ur_bool_t{true});
587587
}
588588
case UR_DEVICE_INFO_PARENT_DEVICE: {
589589
return ReturnValue(nullptr);
@@ -857,9 +857,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
857857
return ReturnValue(static_cast<uint32_t>(MaxRegisters));
858858
}
859859
case UR_DEVICE_INFO_MEM_CHANNEL_SUPPORT:
860-
return ReturnValue(false);
860+
return ReturnValue(ur_bool_t{false});
861861
case UR_DEVICE_INFO_IMAGE_SRGB:
862-
return ReturnValue(false);
862+
return ReturnValue(ur_bool_t{false});
863863
case UR_DEVICE_INFO_PCI_ADDRESS: {
864864
constexpr size_t AddressBufferSize = 13;
865865
char AddressBuffer[AddressBufferSize];
@@ -875,20 +875,20 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
875875
strnlen(AddressBuffer, AddressBufferSize - 1) + 1);
876876
}
877877
case UR_DEVICE_INFO_HOST_PIPE_READ_WRITE_SUPPORTED:
878-
return ReturnValue(false);
878+
return ReturnValue(ur_bool_t{false});
879879
case UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT:
880-
return ReturnValue(false);
880+
return ReturnValue(ur_bool_t{false});
881881
case UR_DEVICE_INFO_ESIMD_SUPPORT:
882-
return ReturnValue(false);
882+
return ReturnValue(ur_bool_t{false});
883883
case UR_DEVICE_INFO_TIMESTAMP_RECORDING_SUPPORT_EXP:
884-
return ReturnValue(true);
884+
return ReturnValue(ur_bool_t{true});
885885
case UR_DEVICE_INFO_ENQUEUE_NATIVE_COMMAND_SUPPORT_EXP: {
886886
// HIP supports enqueueing native work through the urNativeEnqueueExp
887-
return ReturnValue(true);
887+
return ReturnValue(ur_bool_t{true});
888888
}
889889

890890
case UR_DEVICE_INFO_GLOBAL_VARIABLE_SUPPORT:
891-
return ReturnValue(false);
891+
return ReturnValue(ur_bool_t{false});
892892
// TODO: Investigate if this information is available on HIP.
893893
case UR_DEVICE_INFO_COMPONENT_DEVICES:
894894
case UR_DEVICE_INFO_COMPOSITE_DEVICE:

source/adapters/level_zero/device.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(
947947
return ReturnValue(UrRootDev);
948948
}
949949
case UR_DEVICE_INFO_COMMAND_BUFFER_SUPPORT_EXP:
950-
return ReturnValue(true);
950+
return ReturnValue(static_cast<ur_bool_t>(true));
951951
case UR_DEVICE_INFO_COMMAND_BUFFER_UPDATE_SUPPORT_EXP: {
952952
// Update support requires being able to update kernel arguments and all
953953
// aspects of the kernel NDRange.
@@ -965,19 +965,19 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(
965965
}
966966
case UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP: {
967967
// On L0 bindless images are supported.
968-
return ReturnValue(true);
968+
return ReturnValue(static_cast<ur_bool_t>(true));
969969
}
970970
case UR_DEVICE_INFO_BINDLESS_IMAGES_SHARED_USM_SUPPORT_EXP: {
971971
// On L0 bindless images can not be backed by shared (managed) USM.
972-
return ReturnValue(false);
972+
return ReturnValue(static_cast<ur_bool_t>(false));
973973
}
974974
case UR_DEVICE_INFO_BINDLESS_IMAGES_1D_USM_SUPPORT_EXP: {
975975
// On L0 1D bindless image USM are supported.
976-
return ReturnValue(true);
976+
return ReturnValue(static_cast<ur_bool_t>(true));
977977
}
978978
case UR_DEVICE_INFO_BINDLESS_IMAGES_2D_USM_SUPPORT_EXP: {
979979
// On L0 2D bindless image USM are supported.
980-
return ReturnValue(true);
980+
return ReturnValue(static_cast<ur_bool_t>(true));
981981
}
982982
case UR_DEVICE_INFO_IMAGE_PITCH_ALIGN_EXP:
983983
case UR_DEVICE_INFO_MAX_IMAGE_LINEAR_WIDTH_EXP:
@@ -988,76 +988,76 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(
988988
return UR_RESULT_ERROR_INVALID_VALUE;
989989
case UR_DEVICE_INFO_MIPMAP_SUPPORT_EXP: {
990990
// L0 does not support mipmaps.
991-
return ReturnValue(false);
991+
return ReturnValue(static_cast<ur_bool_t>(false));
992992
}
993993
case UR_DEVICE_INFO_MIPMAP_ANISOTROPY_SUPPORT_EXP: {
994994
// L0 does not support anisotropic filtering.
995-
return ReturnValue(false);
995+
return ReturnValue(static_cast<ur_bool_t>(false));
996996
}
997997
case UR_DEVICE_INFO_MIPMAP_MAX_ANISOTROPY_EXP:
998998
logger::error("Unsupported ParamName in urGetDeviceInfo");
999999
logger::error("ParamName=%{}(0x{})", ParamName, logger::toHex(ParamName));
10001000
return UR_RESULT_ERROR_INVALID_VALUE;
10011001
case UR_DEVICE_INFO_MIPMAP_LEVEL_REFERENCE_SUPPORT_EXP: {
10021002
// L0 does not support creation of images from individual mipmap levels.
1003-
return ReturnValue(false);
1003+
return ReturnValue(static_cast<ur_bool_t>(false));
10041004
}
10051005
case UR_DEVICE_INFO_EXTERNAL_MEMORY_IMPORT_SUPPORT_EXP: {
10061006
// L0 does not support importing external memory.
1007-
return ReturnValue(false);
1007+
return ReturnValue(static_cast<ur_bool_t>(false));
10081008
}
10091009
case UR_DEVICE_INFO_EXTERNAL_SEMAPHORE_IMPORT_SUPPORT_EXP: {
10101010
// L0 does not support importing external semaphores.
1011-
return ReturnValue(false);
1011+
return ReturnValue(static_cast<ur_bool_t>(false));
10121012
}
10131013
case UR_DEVICE_INFO_CUBEMAP_SUPPORT_EXP: {
10141014
// L0 does not support cubemaps.
1015-
return ReturnValue(false);
1015+
return ReturnValue(static_cast<ur_bool_t>(false));
10161016
}
10171017
case UR_DEVICE_INFO_CUBEMAP_SEAMLESS_FILTERING_SUPPORT_EXP: {
10181018
// L0 does not support cubemap seamless filtering.
1019-
return ReturnValue(false);
1019+
return ReturnValue(static_cast<ur_bool_t>(false));
10201020
}
10211021
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP: {
10221022
// L0 does not support fetching 1D USM sampled image data.
1023-
return ReturnValue(false);
1023+
return ReturnValue(static_cast<ur_bool_t>(false));
10241024
}
10251025
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP: {
10261026
// L0 does not not support fetching 1D non-USM sampled image data.
1027-
return ReturnValue(false);
1027+
return ReturnValue(static_cast<ur_bool_t>(false));
10281028
}
10291029
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP: {
10301030
// L0 does not support fetching 2D USM sampled image data.
1031-
return ReturnValue(false);
1031+
return ReturnValue(static_cast<ur_bool_t>(false));
10321032
}
10331033
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP: {
10341034
// L0 does not support fetching 2D non-USM sampled image data.
1035-
return ReturnValue(false);
1035+
return ReturnValue(static_cast<ur_bool_t>(false));
10361036
}
10371037
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP: {
10381038
// L0 does not support fetching 3D non-USM sampled image data.
1039-
return ReturnValue(false);
1039+
return ReturnValue(static_cast<ur_bool_t>(false));
10401040
}
10411041
case UR_DEVICE_INFO_IMAGE_ARRAY_SUPPORT_EXP: {
10421042
// L0 does not support image arrays
1043-
return ReturnValue(false);
1043+
return ReturnValue(static_cast<ur_bool_t>(false));
10441044
}
10451045
case UR_DEVICE_INFO_BINDLESS_UNIQUE_ADDRESSING_PER_DIM_EXP: {
10461046
// L0 does not support unique addressing per dimension
1047-
return ReturnValue(false);
1047+
return ReturnValue(static_cast<ur_bool_t>(false));
10481048
}
10491049
case UR_DEVICE_INFO_BINDLESS_SAMPLE_1D_USM_EXP: {
10501050
// L0 does not support sampling 1D USM sampled image data.
1051-
return ReturnValue(false);
1051+
return ReturnValue(static_cast<ur_bool_t>(false));
10521052
}
10531053
case UR_DEVICE_INFO_BINDLESS_SAMPLE_2D_USM_EXP: {
10541054
// L0 does not support sampling 1D USM sampled image data.
1055-
return ReturnValue(false);
1055+
return ReturnValue(static_cast<ur_bool_t>(false));
10561056
}
10571057
case UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS:
1058-
return ReturnValue(false);
1058+
return ReturnValue(static_cast<ur_bool_t>(false));
10591059
case UR_DEVICE_INFO_GLOBAL_VARIABLE_SUPPORT:
1060-
return ReturnValue(true);
1060+
return ReturnValue(static_cast<ur_bool_t>(true));
10611061
default:
10621062
logger::error("Unsupported ParamName in urGetDeviceInfo");
10631063
logger::error("ParamNameParamName={}(0x{})", ParamName,

0 commit comments

Comments
 (0)