Skip to content

Commit aa5d052

Browse files
aarongreigaarongreig
authored
Merge pull request #622 from aarongreig/aaron/coverityBindlessImageGetInfo
Fix Coverity issue: dead code in bindless image validation.
2 parents b1498fb + 2ee83ed commit aa5d052

File tree

8 files changed

+22
-36
lines changed

8 files changed

+22
-36
lines changed

‎include/ur_api.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6388,23 +6388,21 @@ urBindlessImagesImageCopyExp(
63886388
/// + `NULL == hImageMem`
63896389
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
63906390
/// + `::UR_IMAGE_INFO_DEPTH < propName`
6391-
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
6392-
/// + `NULL == pPropValue`
6393-
/// + `NULL == pPropSizeRet`
6394-
/// + `pPropValue == NULL && pPropSizeRet == NULL`
63956391
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
63966392
/// + If `propName` is not supported by the adapter.
63976393
/// - ::UR_RESULT_ERROR_INVALID_SIZE
63986394
/// + If `propSize` is less than the real number of bytes needed to return the info.
6395+
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
6396+
/// + `pPropValue == NULL && pPropSizeRet == NULL`
63996397
/// - ::UR_RESULT_ERROR_INVALID_DEVICE
64006398
/// - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
64016399
/// - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
64026400
UR_APIEXPORT ur_result_t UR_APICALL
64036401
urBindlessImagesImageGetInfoExp(
64046402
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
64056403
ur_image_info_t propName, ///< [in] queried info name
6406-
void *pPropValue, ///< [out] returned query value
6407-
size_t *pPropSizeRet ///< [out] returned query value size
6404+
void *pPropValue, ///< [out][optional] returned query value
6405+
size_t *pPropSizeRet ///< [out][optional] returned query value size
64086406
);
64096407

64106408
///////////////////////////////////////////////////////////////////////////////

‎scripts/core/exp-bindless-images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,10 @@ params:
329329
desc: "[in] queried info name"
330330
- type: void*
331331
name: pPropValue
332-
desc: "[out] returned query value"
332+
desc: "[out][optional] returned query value"
333333
- type: "size_t*"
334334
name: pPropSizeRet
335-
desc: "[out] returned query value size"
335+
desc: "[out][optional] returned query value size"
336336
returns:
337337
- $X_RESULT_ERROR_UNSUPPORTED_ENUMERATION:
338338
- "If `propName` is not supported by the adapter."

‎source/adapters/null/ur_nullddi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3743,8 +3743,8 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
37433743
__urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
37443744
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
37453745
ur_image_info_t propName, ///< [in] queried info name
3746-
void *pPropValue, ///< [out] returned query value
3747-
size_t *pPropSizeRet ///< [out] returned query value size
3746+
void *pPropValue, ///< [out][optional] returned query value
3747+
size_t *pPropSizeRet ///< [out][optional] returned query value size
37483748
) try {
37493749
ur_result_t result = UR_RESULT_SUCCESS;
37503750

‎source/loader/layers/tracing/ur_trcddi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4250,8 +4250,8 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
42504250
__urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
42514251
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
42524252
ur_image_info_t propName, ///< [in] queried info name
4253-
void *pPropValue, ///< [out] returned query value
4254-
size_t *pPropSizeRet ///< [out] returned query value size
4253+
void *pPropValue, ///< [out][optional] returned query value
4254+
size_t *pPropSizeRet ///< [out][optional] returned query value size
42554255
) {
42564256
auto pfnImageGetInfoExp =
42574257
context.urDdiTable.BindlessImagesExp.pfnImageGetInfoExp;

‎source/loader/layers/validation/ur_valddi.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5403,8 +5403,8 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
54035403
__urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
54045404
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
54055405
ur_image_info_t propName, ///< [in] queried info name
5406-
void *pPropValue, ///< [out] returned query value
5407-
size_t *pPropSizeRet ///< [out] returned query value size
5406+
void *pPropValue, ///< [out][optional] returned query value
5407+
size_t *pPropSizeRet ///< [out][optional] returned query value size
54085408
) {
54095409
auto pfnImageGetInfoExp =
54105410
context.urDdiTable.BindlessImagesExp.pfnImageGetInfoExp;
@@ -5418,14 +5418,6 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
54185418
return UR_RESULT_ERROR_INVALID_NULL_HANDLE;
54195419
}
54205420

5421-
if (NULL == pPropValue) {
5422-
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
5423-
}
5424-
5425-
if (NULL == pPropSizeRet) {
5426-
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
5427-
}
5428-
54295421
if (pPropValue == NULL && pPropSizeRet == NULL) {
54305422
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
54315423
}

‎source/loader/ur_ldrddi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5237,8 +5237,8 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
52375237
__urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
52385238
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
52395239
ur_image_info_t propName, ///< [in] queried info name
5240-
void *pPropValue, ///< [out] returned query value
5241-
size_t *pPropSizeRet ///< [out] returned query value size
5240+
void *pPropValue, ///< [out][optional] returned query value
5241+
size_t *pPropSizeRet ///< [out][optional] returned query value size
52425242
) {
52435243
ur_result_t result = UR_RESULT_SUCCESS;
52445244

‎source/loader/ur_libapi.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5668,22 +5668,20 @@ ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
56685668
/// + `NULL == hImageMem`
56695669
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
56705670
/// + `::UR_IMAGE_INFO_DEPTH < propName`
5671-
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
5672-
/// + `NULL == pPropValue`
5673-
/// + `NULL == pPropSizeRet`
5674-
/// + `pPropValue == NULL && pPropSizeRet == NULL`
56755671
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
56765672
/// + If `propName` is not supported by the adapter.
56775673
/// - ::UR_RESULT_ERROR_INVALID_SIZE
56785674
/// + If `propSize` is less than the real number of bytes needed to return the info.
5675+
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
5676+
/// + `pPropValue == NULL && pPropSizeRet == NULL`
56795677
/// - ::UR_RESULT_ERROR_INVALID_DEVICE
56805678
/// - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
56815679
/// - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
56825680
ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
56835681
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
56845682
ur_image_info_t propName, ///< [in] queried info name
5685-
void *pPropValue, ///< [out] returned query value
5686-
size_t *pPropSizeRet ///< [out] returned query value size
5683+
void *pPropValue, ///< [out][optional] returned query value
5684+
size_t *pPropSizeRet ///< [out][optional] returned query value size
56875685
) try {
56885686
auto pfnImageGetInfoExp =
56895687
ur_lib::context->urDdiTable.BindlessImagesExp.pfnImageGetInfoExp;

‎source/ur_api.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4777,22 +4777,20 @@ ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
47774777
/// + `NULL == hImageMem`
47784778
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
47794779
/// + `::UR_IMAGE_INFO_DEPTH < propName`
4780-
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
4781-
/// + `NULL == pPropValue`
4782-
/// + `NULL == pPropSizeRet`
4783-
/// + `pPropValue == NULL && pPropSizeRet == NULL`
47844780
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
47854781
/// + If `propName` is not supported by the adapter.
47864782
/// - ::UR_RESULT_ERROR_INVALID_SIZE
47874783
/// + If `propSize` is less than the real number of bytes needed to return the info.
4784+
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
4785+
/// + `pPropValue == NULL && pPropSizeRet == NULL`
47884786
/// - ::UR_RESULT_ERROR_INVALID_DEVICE
47894787
/// - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
47904788
/// - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
47914789
ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
47924790
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
47934791
ur_image_info_t propName, ///< [in] queried info name
4794-
void *pPropValue, ///< [out] returned query value
4795-
size_t *pPropSizeRet ///< [out] returned query value size
4792+
void *pPropValue, ///< [out][optional] returned query value
4793+
size_t *pPropSizeRet ///< [out][optional] returned query value size
47964794
) {
47974795
ur_result_t result = UR_RESULT_SUCCESS;
47984796
return result;

0 commit comments

Comments
 (0)