Skip to content

Commit 3c6f02c

Browse files
veselypetaveselypeta
authored
Merge pull request #719 from przemektmalon/przemek/fix-semaphore-import-param-name
[Bindless][Exp] Fix semaphore import function parameter name
2 parents bc0b581 + 1b13824 commit 3c6f02c

File tree

10 files changed

+26
-24
lines changed

10 files changed

+26
-24
lines changed

‎include/ur_api.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7164,16 +7164,16 @@ urBindlessImagesReleaseInteropExp(
71647164
/// + `NULL == hContext`
71657165
/// + `NULL == hDevice`
71667166
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
7167-
/// + `NULL == interopSemaphoreDesc`
7167+
/// + `NULL == pInteropSemaphoreDesc`
71687168
/// + `NULL == phInteropSemaphore`
71697169
/// - ::UR_RESULT_ERROR_INVALID_CONTEXT
71707170
/// - ::UR_RESULT_ERROR_INVALID_VALUE
71717171
UR_APIEXPORT ur_result_t UR_APICALL
71727172
urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
7173-
ur_context_handle_t hContext, ///< [in] handle of the context object
7174-
ur_device_handle_t hDevice, ///< [in] handle of the device object
7175-
ur_exp_interop_semaphore_desc_t *interopSemaphoreDesc, ///< [in] the interop semaphore descriptor
7176-
ur_exp_interop_semaphore_handle_t *phInteropSemaphore ///< [out] interop semaphore handle to the external semaphore
7173+
ur_context_handle_t hContext, ///< [in] handle of the context object
7174+
ur_device_handle_t hDevice, ///< [in] handle of the device object
7175+
ur_exp_interop_semaphore_desc_t *pInteropSemaphoreDesc, ///< [in] the interop semaphore descriptor
7176+
ur_exp_interop_semaphore_handle_t *phInteropSemaphore ///< [out] interop semaphore handle to the external semaphore
71777177
);
71787178

71797179
///////////////////////////////////////////////////////////////////////////////
@@ -9277,7 +9277,7 @@ typedef struct ur_bindless_images_release_interop_exp_params_t {
92779277
typedef struct ur_bindless_images_import_external_semaphore_opaque_fd_exp_params_t {
92789278
ur_context_handle_t *phContext;
92799279
ur_device_handle_t *phDevice;
9280-
ur_exp_interop_semaphore_desc_t **pinteropSemaphoreDesc;
9280+
ur_exp_interop_semaphore_desc_t **ppInteropSemaphoreDesc;
92819281
ur_exp_interop_semaphore_handle_t **pphInteropSemaphore;
92829282
} ur_bindless_images_import_external_semaphore_opaque_fd_exp_params_t;
92839283

‎scripts/core/EXP-BINDLESS-IMAGES.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ Changelog
174174
+----------+-------------------------------------------------------------+
175175
| 5.0 | Update interop struct and func param names to adhere to convention. |
176176
+----------+-------------------------------------------------------------+
177+
| 6.0 | Fix semaphore import function parameter name. |
178+
+----------+-------------------------------------------------------------+
177179

178180
Contributors
179181
--------------------------------------------------------------------------------

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ params:
642642
name: hDevice
643643
desc: "[in] handle of the device object"
644644
- type: $x_exp_interop_semaphore_desc_t*
645-
name: interopSemaphoreDesc
645+
name: pInteropSemaphoreDesc
646646
desc: "[in] the interop semaphore descriptor"
647647
- type: $x_exp_interop_semaphore_handle_t*
648648
name: phInteropSemaphore

‎source/adapters/null/ur_nullddi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4215,7 +4215,7 @@ urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
42154215
ur_context_handle_t hContext, ///< [in] handle of the context object
42164216
ur_device_handle_t hDevice, ///< [in] handle of the device object
42174217
ur_exp_interop_semaphore_desc_t
4218-
*interopSemaphoreDesc, ///< [in] the interop semaphore descriptor
4218+
*pInteropSemaphoreDesc, ///< [in] the interop semaphore descriptor
42194219
ur_exp_interop_semaphore_handle_t *
42204220
phInteropSemaphore ///< [out] interop semaphore handle to the external semaphore
42214221
) try {
@@ -4227,7 +4227,7 @@ urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
42274227
.pfnImportExternalSemaphoreOpaqueFDExp;
42284228
if (nullptr != pfnImportExternalSemaphoreOpaqueFDExp) {
42294229
result = pfnImportExternalSemaphoreOpaqueFDExp(
4230-
hContext, hDevice, interopSemaphoreDesc, phInteropSemaphore);
4230+
hContext, hDevice, pInteropSemaphoreDesc, phInteropSemaphore);
42314231
} else {
42324232
// generic implementation
42334233
*phInteropSemaphore =

‎source/common/ur_params.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10167,9 +10167,9 @@ operator<<(std::ostream &os, const struct
1016710167
ur_params::serializePtr(os, *(params->phDevice));
1016810168

1016910169
os << ", ";
10170-
os << ".interopSemaphoreDesc = ";
10170+
os << ".pInteropSemaphoreDesc = ";
1017110171

10172-
ur_params::serializePtr(os, *(params->pinteropSemaphoreDesc));
10172+
ur_params::serializePtr(os, *(params->ppInteropSemaphoreDesc));
1017310173

1017410174
os << ", ";
1017510175
os << ".phInteropSemaphore = ";

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4802,7 +4802,7 @@ urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
48024802
ur_context_handle_t hContext, ///< [in] handle of the context object
48034803
ur_device_handle_t hDevice, ///< [in] handle of the device object
48044804
ur_exp_interop_semaphore_desc_t
4805-
*interopSemaphoreDesc, ///< [in] the interop semaphore descriptor
4805+
*pInteropSemaphoreDesc, ///< [in] the interop semaphore descriptor
48064806
ur_exp_interop_semaphore_handle_t *
48074807
phInteropSemaphore ///< [out] interop semaphore handle to the external semaphore
48084808
) {
@@ -4815,13 +4815,13 @@ urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
48154815
}
48164816

48174817
ur_bindless_images_import_external_semaphore_opaque_fd_exp_params_t params =
4818-
{&hContext, &hDevice, &interopSemaphoreDesc, &phInteropSemaphore};
4818+
{&hContext, &hDevice, &pInteropSemaphoreDesc, &phInteropSemaphore};
48194819
uint64_t instance = context.notify_begin(
48204820
UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_OPAQUE_FD_EXP,
48214821
"urBindlessImagesImportExternalSemaphoreOpaqueFDExp", &params);
48224822

48234823
ur_result_t result = pfnImportExternalSemaphoreOpaqueFDExp(
4824-
hContext, hDevice, interopSemaphoreDesc, phInteropSemaphore);
4824+
hContext, hDevice, pInteropSemaphoreDesc, phInteropSemaphore);
48254825

48264826
context.notify_end(
48274827
UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_OPAQUE_FD_EXP,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6092,7 +6092,7 @@ urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
60926092
ur_context_handle_t hContext, ///< [in] handle of the context object
60936093
ur_device_handle_t hDevice, ///< [in] handle of the device object
60946094
ur_exp_interop_semaphore_desc_t
6095-
*interopSemaphoreDesc, ///< [in] the interop semaphore descriptor
6095+
*pInteropSemaphoreDesc, ///< [in] the interop semaphore descriptor
60966096
ur_exp_interop_semaphore_handle_t *
60976097
phInteropSemaphore ///< [out] interop semaphore handle to the external semaphore
60986098
) {
@@ -6113,7 +6113,7 @@ urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
61136113
return UR_RESULT_ERROR_INVALID_NULL_HANDLE;
61146114
}
61156115

6116-
if (NULL == interopSemaphoreDesc) {
6116+
if (NULL == pInteropSemaphoreDesc) {
61176117
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
61186118
}
61196119

@@ -6123,7 +6123,7 @@ urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
61236123
}
61246124

61256125
ur_result_t result = pfnImportExternalSemaphoreOpaqueFDExp(
6126-
hContext, hDevice, interopSemaphoreDesc, phInteropSemaphore);
6126+
hContext, hDevice, pInteropSemaphoreDesc, phInteropSemaphore);
61276127

61286128
return result;
61296129
}

‎source/loader/ur_ldrddi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5858,7 +5858,7 @@ urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
58585858
ur_context_handle_t hContext, ///< [in] handle of the context object
58595859
ur_device_handle_t hDevice, ///< [in] handle of the device object
58605860
ur_exp_interop_semaphore_desc_t
5861-
*interopSemaphoreDesc, ///< [in] the interop semaphore descriptor
5861+
*pInteropSemaphoreDesc, ///< [in] the interop semaphore descriptor
58625862
ur_exp_interop_semaphore_handle_t *
58635863
phInteropSemaphore ///< [out] interop semaphore handle to the external semaphore
58645864
) {
@@ -5880,7 +5880,7 @@ urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
58805880

58815881
// forward to device-platform
58825882
result = pfnImportExternalSemaphoreOpaqueFDExp(
5883-
hContext, hDevice, interopSemaphoreDesc, phInteropSemaphore);
5883+
hContext, hDevice, pInteropSemaphoreDesc, phInteropSemaphore);
58845884

58855885
if (UR_RESULT_SUCCESS != result) {
58865886
return result;

‎source/loader/ur_libapi.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6427,15 +6427,15 @@ ur_result_t UR_APICALL urBindlessImagesReleaseInteropExp(
64276427
/// + `NULL == hContext`
64286428
/// + `NULL == hDevice`
64296429
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
6430-
/// + `NULL == interopSemaphoreDesc`
6430+
/// + `NULL == pInteropSemaphoreDesc`
64316431
/// + `NULL == phInteropSemaphore`
64326432
/// - ::UR_RESULT_ERROR_INVALID_CONTEXT
64336433
/// - ::UR_RESULT_ERROR_INVALID_VALUE
64346434
ur_result_t UR_APICALL urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
64356435
ur_context_handle_t hContext, ///< [in] handle of the context object
64366436
ur_device_handle_t hDevice, ///< [in] handle of the device object
64376437
ur_exp_interop_semaphore_desc_t
6438-
*interopSemaphoreDesc, ///< [in] the interop semaphore descriptor
6438+
*pInteropSemaphoreDesc, ///< [in] the interop semaphore descriptor
64396439
ur_exp_interop_semaphore_handle_t *
64406440
phInteropSemaphore ///< [out] interop semaphore handle to the external semaphore
64416441
) try {
@@ -6447,7 +6447,7 @@ ur_result_t UR_APICALL urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
64476447
}
64486448

64496449
return pfnImportExternalSemaphoreOpaqueFDExp(
6450-
hContext, hDevice, interopSemaphoreDesc, phInteropSemaphore);
6450+
hContext, hDevice, pInteropSemaphoreDesc, phInteropSemaphore);
64516451
} catch (...) {
64526452
return exceptionToResult(std::current_exception());
64536453
}

‎source/ur_api.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5426,15 +5426,15 @@ ur_result_t UR_APICALL urBindlessImagesReleaseInteropExp(
54265426
/// + `NULL == hContext`
54275427
/// + `NULL == hDevice`
54285428
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
5429-
/// + `NULL == interopSemaphoreDesc`
5429+
/// + `NULL == pInteropSemaphoreDesc`
54305430
/// + `NULL == phInteropSemaphore`
54315431
/// - ::UR_RESULT_ERROR_INVALID_CONTEXT
54325432
/// - ::UR_RESULT_ERROR_INVALID_VALUE
54335433
ur_result_t UR_APICALL urBindlessImagesImportExternalSemaphoreOpaqueFDExp(
54345434
ur_context_handle_t hContext, ///< [in] handle of the context object
54355435
ur_device_handle_t hDevice, ///< [in] handle of the device object
54365436
ur_exp_interop_semaphore_desc_t
5437-
*interopSemaphoreDesc, ///< [in] the interop semaphore descriptor
5437+
*pInteropSemaphoreDesc, ///< [in] the interop semaphore descriptor
54385438
ur_exp_interop_semaphore_handle_t *
54395439
phInteropSemaphore ///< [out] interop semaphore handle to the external semaphore
54405440
) {

0 commit comments

Comments
 (0)