Skip to content

Commit 29c29e9

Browse files
kbenziekbenzie
authored
Merge pull request #1855 from Seanst98/sean/rename-external-semaphore-release
[Bindless][Exp] Rename external semaphore destroy func to release
2 parents 6c2329e + 037d3b5 commit 29c29e9

25 files changed

+108
-105
lines changed

‎include/ur_api.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ typedef enum ur_function_t {
164164
UR_FUNCTION_BINDLESS_IMAGES_MIPMAP_FREE_EXP = 142, ///< Enumerator for ::urBindlessImagesMipmapFreeExp
165165
UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_ARRAY_EXP = 144, ///< Enumerator for ::urBindlessImagesMapExternalArrayExp
166166
UR_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP = 145, ///< Enumerator for ::urBindlessImagesReleaseInteropExp
167-
UR_FUNCTION_BINDLESS_IMAGES_DESTROY_EXTERNAL_SEMAPHORE_EXP = 147, ///< Enumerator for ::urBindlessImagesDestroyExternalSemaphoreExp
167+
UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_SEMAPHORE_EXP = 147, ///< Enumerator for ::urBindlessImagesReleaseExternalSemaphoreExp
168168
UR_FUNCTION_BINDLESS_IMAGES_WAIT_EXTERNAL_SEMAPHORE_EXP = 148, ///< Enumerator for ::urBindlessImagesWaitExternalSemaphoreExp
169169
UR_FUNCTION_BINDLESS_IMAGES_SIGNAL_EXTERNAL_SEMAPHORE_EXP = 149, ///< Enumerator for ::urBindlessImagesSignalExternalSemaphoreExp
170170
UR_FUNCTION_ENQUEUE_USM_FILL_2D = 151, ///< Enumerator for ::urEnqueueUSMFill2D
@@ -7944,7 +7944,7 @@ urBindlessImagesMapExternalArrayExp(
79447944
);
79457945

79467946
///////////////////////////////////////////////////////////////////////////////
7947-
/// @brief Destroy interop memory
7947+
/// @brief Release interop memory
79487948
///
79497949
/// @remarks
79507950
/// _Analogues_
@@ -7965,7 +7965,7 @@ UR_APIEXPORT ur_result_t UR_APICALL
79657965
urBindlessImagesReleaseInteropExp(
79667966
ur_context_handle_t hContext, ///< [in] handle of the context object
79677967
ur_device_handle_t hDevice, ///< [in] handle of the device object
7968-
ur_exp_interop_mem_handle_t hInteropMem ///< [in][release] handle of interop memory to be freed
7968+
ur_exp_interop_mem_handle_t hInteropMem ///< [in][release] handle of interop memory to be destroyed
79697969
);
79707970

79717971
///////////////////////////////////////////////////////////////////////////////
@@ -8000,7 +8000,7 @@ urBindlessImagesImportExternalSemaphoreExp(
80008000
);
80018001

80028002
///////////////////////////////////////////////////////////////////////////////
8003-
/// @brief Destroy the external semaphore handle
8003+
/// @brief Release the external semaphore
80048004
///
80058005
/// @remarks
80068006
/// _Analogues_
@@ -8018,7 +8018,7 @@ urBindlessImagesImportExternalSemaphoreExp(
80188018
/// - ::UR_RESULT_ERROR_INVALID_CONTEXT
80198019
/// - ::UR_RESULT_ERROR_INVALID_VALUE
80208020
UR_APIEXPORT ur_result_t UR_APICALL
8021-
urBindlessImagesDestroyExternalSemaphoreExp(
8021+
urBindlessImagesReleaseExternalSemaphoreExp(
80228022
ur_context_handle_t hContext, ///< [in] handle of the context object
80238023
ur_device_handle_t hDevice, ///< [in] handle of the device object
80248024
ur_exp_interop_semaphore_handle_t hInteropSemaphore ///< [in][release] handle of interop semaphore to be destroyed
@@ -11235,14 +11235,14 @@ typedef struct ur_bindless_images_import_external_semaphore_exp_params_t {
1123511235
} ur_bindless_images_import_external_semaphore_exp_params_t;
1123611236

1123711237
///////////////////////////////////////////////////////////////////////////////
11238-
/// @brief Function parameters for urBindlessImagesDestroyExternalSemaphoreExp
11238+
/// @brief Function parameters for urBindlessImagesReleaseExternalSemaphoreExp
1123911239
/// @details Each entry is a pointer to the parameter passed to the function;
1124011240
/// allowing the callback the ability to modify the parameter's value
11241-
typedef struct ur_bindless_images_destroy_external_semaphore_exp_params_t {
11241+
typedef struct ur_bindless_images_release_external_semaphore_exp_params_t {
1124211242
ur_context_handle_t *phContext;
1124311243
ur_device_handle_t *phDevice;
1124411244
ur_exp_interop_semaphore_handle_t *phInteropSemaphore;
11245-
} ur_bindless_images_destroy_external_semaphore_exp_params_t;
11245+
} ur_bindless_images_release_external_semaphore_exp_params_t;
1124611246

1124711247
///////////////////////////////////////////////////////////////////////////////
1124811248
/// @brief Function parameters for urBindlessImagesWaitExternalSemaphoreExp

‎include/ur_ddi.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,8 +1656,8 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportExternalSemaphoreExp_t
16561656
ur_exp_interop_semaphore_handle_t *);
16571657

16581658
///////////////////////////////////////////////////////////////////////////////
1659-
/// @brief Function-pointer for urBindlessImagesDestroyExternalSemaphoreExp
1660-
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesDestroyExternalSemaphoreExp_t)(
1659+
/// @brief Function-pointer for urBindlessImagesReleaseExternalSemaphoreExp
1660+
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesReleaseExternalSemaphoreExp_t)(
16611661
ur_context_handle_t,
16621662
ur_device_handle_t,
16631663
ur_exp_interop_semaphore_handle_t);
@@ -1701,7 +1701,7 @@ typedef struct ur_bindless_images_exp_dditable_t {
17011701
ur_pfnBindlessImagesMapExternalArrayExp_t pfnMapExternalArrayExp;
17021702
ur_pfnBindlessImagesReleaseInteropExp_t pfnReleaseInteropExp;
17031703
ur_pfnBindlessImagesImportExternalSemaphoreExp_t pfnImportExternalSemaphoreExp;
1704-
ur_pfnBindlessImagesDestroyExternalSemaphoreExp_t pfnDestroyExternalSemaphoreExp;
1704+
ur_pfnBindlessImagesReleaseExternalSemaphoreExp_t pfnReleaseExternalSemaphoreExp;
17051705
ur_pfnBindlessImagesWaitExternalSemaphoreExp_t pfnWaitExternalSemaphoreExp;
17061706
ur_pfnBindlessImagesSignalExternalSemaphoreExp_t pfnSignalExternalSemaphoreExp;
17071707
} ur_bindless_images_exp_dditable_t;

‎include/ur_print.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2155,12 +2155,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesReleaseInteropExpParams
21552155
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesImportExternalSemaphoreExpParams(const struct ur_bindless_images_import_external_semaphore_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
21562156

21572157
///////////////////////////////////////////////////////////////////////////////
2158-
/// @brief Print ur_bindless_images_destroy_external_semaphore_exp_params_t struct
2158+
/// @brief Print ur_bindless_images_release_external_semaphore_exp_params_t struct
21592159
/// @returns
21602160
/// - ::UR_RESULT_SUCCESS
21612161
/// - ::UR_RESULT_ERROR_INVALID_SIZE
21622162
/// - `buff_size < out_size`
2163-
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesDestroyExternalSemaphoreExpParams(const struct ur_bindless_images_destroy_external_semaphore_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
2163+
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesReleaseExternalSemaphoreExpParams(const struct ur_bindless_images_release_external_semaphore_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
21642164

21652165
///////////////////////////////////////////////////////////////////////////////
21662166
/// @brief Print ur_bindless_images_wait_external_semaphore_exp_params_t struct

‎include/ur_print.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,8 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_function_t value) {
752752
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP:
753753
os << "UR_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP";
754754
break;
755-
case UR_FUNCTION_BINDLESS_IMAGES_DESTROY_EXTERNAL_SEMAPHORE_EXP:
756-
os << "UR_FUNCTION_BINDLESS_IMAGES_DESTROY_EXTERNAL_SEMAPHORE_EXP";
755+
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_SEMAPHORE_EXP:
756+
os << "UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_SEMAPHORE_EXP";
757757
break;
758758
case UR_FUNCTION_BINDLESS_IMAGES_WAIT_EXTERNAL_SEMAPHORE_EXP:
759759
os << "UR_FUNCTION_BINDLESS_IMAGES_WAIT_EXTERNAL_SEMAPHORE_EXP";
@@ -15191,10 +15191,10 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1519115191
}
1519215192

1519315193
///////////////////////////////////////////////////////////////////////////////
15194-
/// @brief Print operator for the ur_bindless_images_destroy_external_semaphore_exp_params_t type
15194+
/// @brief Print operator for the ur_bindless_images_release_external_semaphore_exp_params_t type
1519515195
/// @returns
1519615196
/// std::ostream &
15197-
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_bindless_images_destroy_external_semaphore_exp_params_t *params) {
15197+
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_bindless_images_release_external_semaphore_exp_params_t *params) {
1519815198

1519915199
os << ".hContext = ";
1520015200

@@ -17747,8 +17747,8 @@ inline ur_result_t UR_APICALL printFunctionParams(std::ostream &os, ur_function_
1774717747
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_EXP: {
1774817748
os << (const struct ur_bindless_images_import_external_semaphore_exp_params_t *)params;
1774917749
} break;
17750-
case UR_FUNCTION_BINDLESS_IMAGES_DESTROY_EXTERNAL_SEMAPHORE_EXP: {
17751-
os << (const struct ur_bindless_images_destroy_external_semaphore_exp_params_t *)params;
17750+
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_SEMAPHORE_EXP: {
17751+
os << (const struct ur_bindless_images_release_external_semaphore_exp_params_t *)params;
1775217752
} break;
1775317753
case UR_FUNCTION_BINDLESS_IMAGES_WAIT_EXTERNAL_SEMAPHORE_EXP: {
1775417754
os << (const struct ur_bindless_images_wait_external_semaphore_exp_params_t *)params;

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Enums
138138
* ${X}_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_ARRAY_EXP
139139
* ${X}_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP
140140
* ${X}_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_EXP
141-
* ${X}_FUNCTION_BINDLESS_IMAGES_DESTROY_EXTERNAL_SEMAPHORE_EXP
141+
* ${X}_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_SEMAPHORE_EXP
142142
* ${X}_FUNCTION_BINDLESS_IMAGES_WAIT_EXTERNAL_SEMAPHORE_EXP
143143
* ${X}_FUNCTION_BINDLESS_IMAGES_SIGNAL_EXTERNAL_SEMAPHORE_EXP
144144

@@ -181,7 +181,7 @@ Functions
181181
* ${x}BindlessImagesMapExternalArrayExp
182182
* ${x}BindlessImagesReleaseInteropExp
183183
* ${x}BindlessImagesImportExternalSemaphoreExp
184-
* ${x}BindlessImagesDestroyExternalSemaphoreExp
184+
* ${x}BindlessImagesReleaseExternalSemaphoreExp
185185
* ${x}BindlessImagesWaitExternalSemaphoreExp
186186
* ${x}BindlessImagesSignalExternalSemaphoreExp
187187

@@ -237,6 +237,9 @@ Changelog
237237
| || - ${X}_EXP_EXTERNAL_MEM_TYPE_WIN32_NT_DX12_RESOURCE |
238238
| || - ${X}_EXP_EXTERNAL_SEMAPHORE_TYPE_WIN32_NT_DX12_FENCE |
239239
+------------------------------------------------------------------------+
240+
| 14.0 || Rename func BindlessImagesDestroyExternalSemaphoreExp to |
241+
| || BindlessImagesReleaseExternalSemaphoreExp |
242+
+------------------------------------------------------------------------+
240243

241244
Contributors
242245
--------------------------------------------------------------------------------

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ returns:
717717
- $X_RESULT_ERROR_OUT_OF_RESOURCES
718718
--- #--------------------------------------------------------------------------
719719
type: function
720-
desc: "Destroy interop memory"
720+
desc: "Release interop memory"
721721
class: $xBindlessImages
722722
name: ReleaseInteropExp
723723
ordinal: "0"
@@ -732,7 +732,7 @@ params:
732732
desc: "[in] handle of the device object"
733733
- type: $x_exp_interop_mem_handle_t
734734
name: hInteropMem
735-
desc: "[in][release] handle of interop memory to be freed"
735+
desc: "[in][release] handle of interop memory to be destroyed"
736736
returns:
737737
- $X_RESULT_ERROR_INVALID_CONTEXT
738738
- $X_RESULT_ERROR_INVALID_VALUE
@@ -765,9 +765,9 @@ returns:
765765
- $X_RESULT_ERROR_INVALID_VALUE
766766
--- #--------------------------------------------------------------------------
767767
type: function
768-
desc: "Destroy the external semaphore handle"
768+
desc: "Release the external semaphore"
769769
class: $xBindlessImages
770-
name: DestroyExternalSemaphoreExp
770+
name: ReleaseExternalSemaphoreExp
771771
ordinal: "0"
772772
analogue:
773773
- "**cuDestroyExternalSemaphore**"

‎scripts/core/registry.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,8 @@ etors:
406406
- name: BINDLESS_IMAGES_RELEASE_INTEROP_EXP
407407
desc: Enumerator for $xBindlessImagesReleaseInteropExp
408408
value: '145'
409-
- name: BINDLESS_IMAGES_DESTROY_EXTERNAL_SEMAPHORE_EXP
410-
desc: Enumerator for $xBindlessImagesDestroyExternalSemaphoreExp
409+
- name: BINDLESS_IMAGES_RELEASE_EXTERNAL_SEMAPHORE_EXP
410+
desc: Enumerator for $xBindlessImagesReleaseExternalSemaphoreExp
411411
value: '147'
412412
- name: BINDLESS_IMAGES_WAIT_EXTERNAL_SEMAPHORE_EXP
413413
desc: Enumerator for $xBindlessImagesWaitExternalSemaphoreExp

‎source/adapters/cuda/image.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesImportExternalSemaphoreExp(
12261226
return UR_RESULT_SUCCESS;
12271227
}
12281228

1229-
UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesDestroyExternalSemaphoreExp(
1229+
UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesReleaseExternalSemaphoreExp(
12301230
ur_context_handle_t hContext, ur_device_handle_t hDevice,
12311231
ur_exp_interop_semaphore_handle_t hInteropSemaphore) {
12321232
UR_ASSERT(std::find(hContext->getDevices().begin(),

‎source/adapters/cuda/ur_interface_loader.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetBindlessImagesExpProcAddrTable(
343343
pDdiTable->pfnReleaseInteropExp = urBindlessImagesReleaseInteropExp;
344344
pDdiTable->pfnImportExternalSemaphoreExp =
345345
urBindlessImagesImportExternalSemaphoreExp;
346-
pDdiTable->pfnDestroyExternalSemaphoreExp =
347-
urBindlessImagesDestroyExternalSemaphoreExp;
346+
pDdiTable->pfnReleaseExternalSemaphoreExp =
347+
urBindlessImagesReleaseExternalSemaphoreExp;
348348
pDdiTable->pfnWaitExternalSemaphoreExp =
349349
urBindlessImagesWaitExternalSemaphoreExp;
350350
pDdiTable->pfnSignalExternalSemaphoreExp =

‎source/adapters/hip/image.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesImportExternalSemaphoreExp(
149149
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
150150
}
151151

152-
UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesDestroyExternalSemaphoreExp(
152+
UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesReleaseExternalSemaphoreExp(
153153
[[maybe_unused]] ur_context_handle_t hContext,
154154
[[maybe_unused]] ur_device_handle_t hDevice,
155155
[[maybe_unused]] ur_exp_interop_semaphore_handle_t hInteropSemaphore) {

0 commit comments

Comments
 (0)