Skip to content

Commit 12b7341

Browse files
Updates error conditions for USM advise
1 parent 78639a2 commit 12b7341

File tree

5 files changed

+20
-0
lines changed

5 files changed

+20
-0
lines changed

include/ur_api.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8223,6 +8223,9 @@ urCommandBufferAppendUSMPrefetchExp(
82238223
/// + `::UR_USM_ADVICE_FLAGS_MASK & advice`
82248224
/// - ::UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_EXP
82258225
/// - ::UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_EXP
8226+
/// - ::UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_WAIT_LIST_EXP
8227+
/// + `pSyncPointWaitList == NULL && numSyncPointsInWaitList > 0`
8228+
/// + `pSyncPointWaitList != NULL && numSyncPointsInWaitList == 0`
82268229
/// - ::UR_RESULT_ERROR_INVALID_MEM_OBJECT
82278230
/// - ::UR_RESULT_ERROR_INVALID_SIZE
82288231
/// + `size == 0`

scripts/core/exp-command-buffer.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,9 @@ params:
661661
returns:
662662
- $X_RESULT_ERROR_INVALID_COMMAND_BUFFER_EXP
663663
- $X_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_EXP
664+
- $X_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_WAIT_LIST_EXP:
665+
- "`pSyncPointWaitList == NULL && numSyncPointsInWaitList > 0`"
666+
- "`pSyncPointWaitList != NULL && numSyncPointsInWaitList == 0`"
664667
- $X_RESULT_ERROR_INVALID_MEM_OBJECT
665668
- $X_RESULT_ERROR_INVALID_SIZE:
666669
- "`size == 0`"

source/loader/layers/validation/ur_valddi.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7189,6 +7189,14 @@ __urdlllocal ur_result_t UR_APICALL urCommandBufferAppendUSMAdviseExp(
71897189
return UR_RESULT_ERROR_INVALID_ENUMERATION;
71907190
}
71917191

7192+
if (pSyncPointWaitList == NULL && numSyncPointsInWaitList > 0) {
7193+
return UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_WAIT_LIST_EXP;
7194+
}
7195+
7196+
if (pSyncPointWaitList != NULL && numSyncPointsInWaitList == 0) {
7197+
return UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_WAIT_LIST_EXP;
7198+
}
7199+
71927200
if (size == 0) {
71937201
return UR_RESULT_ERROR_INVALID_SIZE;
71947202
}

source/loader/ur_libapi.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7688,6 +7688,9 @@ ur_result_t UR_APICALL urCommandBufferAppendUSMPrefetchExp(
76887688
/// + `::UR_USM_ADVICE_FLAGS_MASK & advice`
76897689
/// - ::UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_EXP
76907690
/// - ::UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_EXP
7691+
/// - ::UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_WAIT_LIST_EXP
7692+
/// + `pSyncPointWaitList == NULL && numSyncPointsInWaitList > 0`
7693+
/// + `pSyncPointWaitList != NULL && numSyncPointsInWaitList == 0`
76917694
/// - ::UR_RESULT_ERROR_INVALID_MEM_OBJECT
76927695
/// - ::UR_RESULT_ERROR_INVALID_SIZE
76937696
/// + `size == 0`

source/ur_api.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6492,6 +6492,9 @@ ur_result_t UR_APICALL urCommandBufferAppendUSMPrefetchExp(
64926492
/// + `::UR_USM_ADVICE_FLAGS_MASK & advice`
64936493
/// - ::UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_EXP
64946494
/// - ::UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_EXP
6495+
/// - ::UR_RESULT_ERROR_INVALID_COMMAND_BUFFER_SYNC_POINT_WAIT_LIST_EXP
6496+
/// + `pSyncPointWaitList == NULL && numSyncPointsInWaitList > 0`
6497+
/// + `pSyncPointWaitList != NULL && numSyncPointsInWaitList == 0`
64956498
/// - ::UR_RESULT_ERROR_INVALID_MEM_OBJECT
64966499
/// - ::UR_RESULT_ERROR_INVALID_SIZE
64976500
/// + `size == 0`

0 commit comments

Comments
 (0)