Skip to content

Commit f8e1f07

Browse files
kbenziekbenzie
committed
Merge remote-tracking branch 'origin/main' into fix-bindless-L0-copy
2 parents 9cee949 + a1094cd commit f8e1f07

File tree

84 files changed

+2041
-995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2041
-995
lines changed

‎.github/dependabot.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Run dependencies versions update
2+
version: 2
3+
updates:
4+
- package-ecosystem: "pip"
5+
directory: "/third_party" # Location of package manifests
6+
schedule:
7+
interval: "daily"
8+
# Run only required security updates
9+
open-pull-requests-limit: 0

‎include/ur_api.h‎

Lines changed: 254 additions & 204 deletions
Large diffs are not rendered by default.

‎include/ur_ddi.h‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ typedef ur_result_t(UR_APICALL *ur_pfnPlatformGetNativeHandle_t)(
4949
/// @brief Function-pointer for urPlatformCreateWithNativeHandle
5050
typedef ur_result_t(UR_APICALL *ur_pfnPlatformCreateWithNativeHandle_t)(
5151
ur_native_handle_t,
52+
ur_adapter_handle_t,
5253
const ur_platform_native_properties_t *,
5354
ur_platform_handle_t *);
5455

@@ -1604,11 +1605,12 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesMipmapFreeExp_t)(
16041605
ur_exp_image_mem_handle_t);
16051606

16061607
///////////////////////////////////////////////////////////////////////////////
1607-
/// @brief Function-pointer for urBindlessImagesImportOpaqueFDExp
1608-
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportOpaqueFDExp_t)(
1608+
/// @brief Function-pointer for urBindlessImagesImportExternalMemoryExp
1609+
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportExternalMemoryExp_t)(
16091610
ur_context_handle_t,
16101611
ur_device_handle_t,
16111612
size_t,
1613+
ur_exp_external_mem_type_t,
16121614
ur_exp_interop_mem_desc_t *,
16131615
ur_exp_interop_mem_handle_t *);
16141616

@@ -1630,10 +1632,11 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesReleaseInteropExp_t)(
16301632
ur_exp_interop_mem_handle_t);
16311633

16321634
///////////////////////////////////////////////////////////////////////////////
1633-
/// @brief Function-pointer for urBindlessImagesImportExternalSemaphoreOpaqueFDExp
1634-
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportExternalSemaphoreOpaqueFDExp_t)(
1635+
/// @brief Function-pointer for urBindlessImagesImportExternalSemaphoreExp
1636+
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportExternalSemaphoreExp_t)(
16351637
ur_context_handle_t,
16361638
ur_device_handle_t,
1639+
ur_exp_external_semaphore_type_t,
16371640
ur_exp_interop_semaphore_desc_t *,
16381641
ur_exp_interop_semaphore_handle_t *);
16391642

@@ -1649,6 +1652,8 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesDestroyExternalSemaphoreExp_
16491652
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesWaitExternalSemaphoreExp_t)(
16501653
ur_queue_handle_t,
16511654
ur_exp_interop_semaphore_handle_t,
1655+
bool,
1656+
uint64_t,
16521657
uint32_t,
16531658
const ur_event_handle_t *,
16541659
ur_event_handle_t *);
@@ -1658,6 +1663,8 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesWaitExternalSemaphoreExp_t)(
16581663
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesSignalExternalSemaphoreExp_t)(
16591664
ur_queue_handle_t,
16601665
ur_exp_interop_semaphore_handle_t,
1666+
bool,
1667+
uint64_t,
16611668
uint32_t,
16621669
const ur_event_handle_t *,
16631670
ur_event_handle_t *);
@@ -1675,10 +1682,10 @@ typedef struct ur_bindless_images_exp_dditable_t {
16751682
ur_pfnBindlessImagesImageGetInfoExp_t pfnImageGetInfoExp;
16761683
ur_pfnBindlessImagesMipmapGetLevelExp_t pfnMipmapGetLevelExp;
16771684
ur_pfnBindlessImagesMipmapFreeExp_t pfnMipmapFreeExp;
1678-
ur_pfnBindlessImagesImportOpaqueFDExp_t pfnImportOpaqueFDExp;
1685+
ur_pfnBindlessImagesImportExternalMemoryExp_t pfnImportExternalMemoryExp;
16791686
ur_pfnBindlessImagesMapExternalArrayExp_t pfnMapExternalArrayExp;
16801687
ur_pfnBindlessImagesReleaseInteropExp_t pfnReleaseInteropExp;
1681-
ur_pfnBindlessImagesImportExternalSemaphoreOpaqueFDExp_t pfnImportExternalSemaphoreOpaqueFDExp;
1688+
ur_pfnBindlessImagesImportExternalSemaphoreExp_t pfnImportExternalSemaphoreExp;
16821689
ur_pfnBindlessImagesDestroyExternalSemaphoreExp_t pfnDestroyExternalSemaphoreExp;
16831690
ur_pfnBindlessImagesWaitExternalSemaphoreExp_t pfnWaitExternalSemaphoreExp;
16841691
ur_pfnBindlessImagesSignalExternalSemaphoreExp_t pfnSignalExternalSemaphoreExp;

‎include/ur_print.h‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,22 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintExpImageCopyFlags(enum ur_exp_image_c
890890
/// - `buff_size < out_size`
891891
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpSamplerCubemapFilterMode(enum ur_exp_sampler_cubemap_filter_mode_t value, char *buffer, const size_t buff_size, size_t *out_size);
892892

893+
///////////////////////////////////////////////////////////////////////////////
894+
/// @brief Print ur_exp_external_mem_type_t enum
895+
/// @returns
896+
/// - ::UR_RESULT_SUCCESS
897+
/// - ::UR_RESULT_ERROR_INVALID_SIZE
898+
/// - `buff_size < out_size`
899+
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpExternalMemType(enum ur_exp_external_mem_type_t value, char *buffer, const size_t buff_size, size_t *out_size);
900+
901+
///////////////////////////////////////////////////////////////////////////////
902+
/// @brief Print ur_exp_external_semaphore_type_t enum
903+
/// @returns
904+
/// - ::UR_RESULT_SUCCESS
905+
/// - ::UR_RESULT_ERROR_INVALID_SIZE
906+
/// - `buff_size < out_size`
907+
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpExternalSemaphoreType(enum ur_exp_external_semaphore_type_t value, char *buffer, const size_t buff_size, size_t *out_size);
908+
893909
///////////////////////////////////////////////////////////////////////////////
894910
/// @brief Print ur_exp_file_descriptor_t struct
895911
/// @returns
@@ -2075,12 +2091,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesMipmapGetLevelExpParams
20752091
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesMipmapFreeExpParams(const struct ur_bindless_images_mipmap_free_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
20762092

20772093
///////////////////////////////////////////////////////////////////////////////
2078-
/// @brief Print ur_bindless_images_import_opaque_fd_exp_params_t struct
2094+
/// @brief Print ur_bindless_images_import_external_memory_exp_params_t struct
20792095
/// @returns
20802096
/// - ::UR_RESULT_SUCCESS
20812097
/// - ::UR_RESULT_ERROR_INVALID_SIZE
20822098
/// - `buff_size < out_size`
2083-
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesImportOpaqueFdExpParams(const struct ur_bindless_images_import_opaque_fd_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
2099+
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesImportExternalMemoryExpParams(const struct ur_bindless_images_import_external_memory_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
20842100

20852101
///////////////////////////////////////////////////////////////////////////////
20862102
/// @brief Print ur_bindless_images_map_external_array_exp_params_t struct
@@ -2099,12 +2115,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesMapExternalArrayExpPara
20992115
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesReleaseInteropExpParams(const struct ur_bindless_images_release_interop_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
21002116

21012117
///////////////////////////////////////////////////////////////////////////////
2102-
/// @brief Print ur_bindless_images_import_external_semaphore_opaque_fd_exp_params_t struct
2118+
/// @brief Print ur_bindless_images_import_external_semaphore_exp_params_t struct
21032119
/// @returns
21042120
/// - ::UR_RESULT_SUCCESS
21052121
/// - ::UR_RESULT_ERROR_INVALID_SIZE
21062122
/// - `buff_size < out_size`
2107-
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesImportExternalSemaphoreOpaqueFdExpParams(const struct ur_bindless_images_import_external_semaphore_opaque_fd_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
2123+
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);
21082124

21092125
///////////////////////////////////////////////////////////////////////////////
21102126
/// @brief Print ur_bindless_images_destroy_external_semaphore_exp_params_t struct

‎include/ur_print.hpp‎

Lines changed: 94 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,8 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_map_flag_t value);
326326
inline std::ostream &operator<<(std::ostream &os, enum ur_usm_migration_flag_t value);
327327
inline std::ostream &operator<<(std::ostream &os, enum ur_exp_image_copy_flag_t value);
328328
inline std::ostream &operator<<(std::ostream &os, enum ur_exp_sampler_cubemap_filter_mode_t value);
329+
inline std::ostream &operator<<(std::ostream &os, enum ur_exp_external_mem_type_t value);
330+
inline std::ostream &operator<<(std::ostream &os, enum ur_exp_external_semaphore_type_t value);
329331
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_file_descriptor_t params);
330332
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_win32_handle_t params);
331333
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_sampler_mip_properties_t params);
@@ -743,18 +745,12 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_function_t value) {
743745
case UR_FUNCTION_BINDLESS_IMAGES_MIPMAP_FREE_EXP:
744746
os << "UR_FUNCTION_BINDLESS_IMAGES_MIPMAP_FREE_EXP";
745747
break;
746-
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_OPAQUE_FD_EXP:
747-
os << "UR_FUNCTION_BINDLESS_IMAGES_IMPORT_OPAQUE_FD_EXP";
748-
break;
749748
case UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_ARRAY_EXP:
750749
os << "UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_ARRAY_EXP";
751750
break;
752751
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP:
753752
os << "UR_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP";
754753
break;
755-
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_OPAQUE_FD_EXP:
756-
os << "UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_OPAQUE_FD_EXP";
757-
break;
758754
case UR_FUNCTION_BINDLESS_IMAGES_DESTROY_EXTERNAL_SEMAPHORE_EXP:
759755
os << "UR_FUNCTION_BINDLESS_IMAGES_DESTROY_EXTERNAL_SEMAPHORE_EXP";
760756
break;
@@ -932,6 +928,12 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_function_t value) {
932928
case UR_FUNCTION_KERNEL_GET_SUGGESTED_LOCAL_WORK_SIZE:
933929
os << "UR_FUNCTION_KERNEL_GET_SUGGESTED_LOCAL_WORK_SIZE";
934930
break;
931+
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_MEMORY_EXP:
932+
os << "UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_MEMORY_EXP";
933+
break;
934+
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_EXP:
935+
os << "UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_EXP";
936+
break;
935937
default:
936938
os << "unknown enumerator";
937939
break;
@@ -9313,6 +9315,48 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_exp_sampler_cubemap_fi
93139315
return os;
93149316
}
93159317
///////////////////////////////////////////////////////////////////////////////
9318+
/// @brief Print operator for the ur_exp_external_mem_type_t type
9319+
/// @returns
9320+
/// std::ostream &
9321+
inline std::ostream &operator<<(std::ostream &os, enum ur_exp_external_mem_type_t value) {
9322+
switch (value) {
9323+
case UR_EXP_EXTERNAL_MEM_TYPE_OPAQUE_FD:
9324+
os << "UR_EXP_EXTERNAL_MEM_TYPE_OPAQUE_FD";
9325+
break;
9326+
case UR_EXP_EXTERNAL_MEM_TYPE_WIN32_NT:
9327+
os << "UR_EXP_EXTERNAL_MEM_TYPE_WIN32_NT";
9328+
break;
9329+
case UR_EXP_EXTERNAL_MEM_TYPE_WIN32_NT_DX12_RESOURCE:
9330+
os << "UR_EXP_EXTERNAL_MEM_TYPE_WIN32_NT_DX12_RESOURCE";
9331+
break;
9332+
default:
9333+
os << "unknown enumerator";
9334+
break;
9335+
}
9336+
return os;
9337+
}
9338+
///////////////////////////////////////////////////////////////////////////////
9339+
/// @brief Print operator for the ur_exp_external_semaphore_type_t type
9340+
/// @returns
9341+
/// std::ostream &
9342+
inline std::ostream &operator<<(std::ostream &os, enum ur_exp_external_semaphore_type_t value) {
9343+
switch (value) {
9344+
case UR_EXP_EXTERNAL_SEMAPHORE_TYPE_OPAQUE_FD:
9345+
os << "UR_EXP_EXTERNAL_SEMAPHORE_TYPE_OPAQUE_FD";
9346+
break;
9347+
case UR_EXP_EXTERNAL_SEMAPHORE_TYPE_WIN32_NT:
9348+
os << "UR_EXP_EXTERNAL_SEMAPHORE_TYPE_WIN32_NT";
9349+
break;
9350+
case UR_EXP_EXTERNAL_SEMAPHORE_TYPE_WIN32_NT_DX12_FENCE:
9351+
os << "UR_EXP_EXTERNAL_SEMAPHORE_TYPE_WIN32_NT_DX12_FENCE";
9352+
break;
9353+
default:
9354+
os << "unknown enumerator";
9355+
break;
9356+
}
9357+
return os;
9358+
}
9359+
///////////////////////////////////////////////////////////////////////////////
93169360
/// @brief Print operator for the ur_exp_file_descriptor_t type
93179361
/// @returns
93189362
/// std::ostream &
@@ -10214,6 +10258,12 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1021410258
ur::details::printPtr(os,
1021510259
*(params->phNativePlatform));
1021610260

10261+
os << ", ";
10262+
os << ".hAdapter = ";
10263+
10264+
ur::details::printPtr(os,
10265+
*(params->phAdapter));
10266+
1021710267
os << ", ";
1021810268
os << ".pProperties = ";
1021910269

@@ -14760,10 +14810,10 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1476014810
}
1476114811

1476214812
///////////////////////////////////////////////////////////////////////////////
14763-
/// @brief Print operator for the ur_bindless_images_import_opaque_fd_exp_params_t type
14813+
/// @brief Print operator for the ur_bindless_images_import_external_memory_exp_params_t type
1476414814
/// @returns
1476514815
/// std::ostream &
14766-
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_bindless_images_import_opaque_fd_exp_params_t *params) {
14816+
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_bindless_images_import_external_memory_exp_params_t *params) {
1476714817

1476814818
os << ".hContext = ";
1476914819

@@ -14781,6 +14831,11 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1478114831

1478214832
os << *(params->psize);
1478314833

14834+
os << ", ";
14835+
os << ".memHandleType = ";
14836+
14837+
os << *(params->pmemHandleType);
14838+
1478414839
os << ", ";
1478514840
os << ".pInteropMemDesc = ";
1478614841

@@ -14867,10 +14922,10 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1486714922
}
1486814923

1486914924
///////////////////////////////////////////////////////////////////////////////
14870-
/// @brief Print operator for the ur_bindless_images_import_external_semaphore_opaque_fd_exp_params_t type
14925+
/// @brief Print operator for the ur_bindless_images_import_external_semaphore_exp_params_t type
1487114926
/// @returns
1487214927
/// std::ostream &
14873-
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_bindless_images_import_external_semaphore_opaque_fd_exp_params_t *params) {
14928+
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_bindless_images_import_external_semaphore_exp_params_t *params) {
1487414929

1487514930
os << ".hContext = ";
1487614931

@@ -14883,6 +14938,11 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1488314938
ur::details::printPtr(os,
1488414939
*(params->phDevice));
1488514940

14941+
os << ", ";
14942+
os << ".semHandleType = ";
14943+
14944+
os << *(params->psemHandleType);
14945+
1488614946
os << ", ";
1488714947
os << ".pInteropSemaphoreDesc = ";
1488814948

@@ -14941,6 +15001,16 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1494115001
ur::details::printPtr(os,
1494215002
*(params->phSemaphore));
1494315003

15004+
os << ", ";
15005+
os << ".hasWaitValue = ";
15006+
15007+
os << *(params->phasWaitValue);
15008+
15009+
os << ", ";
15010+
os << ".waitValue = ";
15011+
15012+
os << *(params->pwaitValue);
15013+
1494415014
os << ", ";
1494515015
os << ".numEventsInWaitList = ";
1494615016

@@ -14984,6 +15054,16 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1498415054
ur::details::printPtr(os,
1498515055
*(params->phSemaphore));
1498615056

15057+
os << ", ";
15058+
os << ".hasSignalValue = ";
15059+
15060+
os << *(params->phasSignalValue);
15061+
15062+
os << ", ";
15063+
os << ".signalValue = ";
15064+
15065+
os << *(params->psignalValue);
15066+
1498715067
os << ", ";
1498815068
os << ".numEventsInWaitList = ";
1498915069

@@ -17417,17 +17497,17 @@ inline ur_result_t UR_APICALL printFunctionParams(std::ostream &os, ur_function_
1741717497
case UR_FUNCTION_BINDLESS_IMAGES_MIPMAP_FREE_EXP: {
1741817498
os << (const struct ur_bindless_images_mipmap_free_exp_params_t *)params;
1741917499
} break;
17420-
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_OPAQUE_FD_EXP: {
17421-
os << (const struct ur_bindless_images_import_opaque_fd_exp_params_t *)params;
17500+
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_MEMORY_EXP: {
17501+
os << (const struct ur_bindless_images_import_external_memory_exp_params_t *)params;
1742217502
} break;
1742317503
case UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_ARRAY_EXP: {
1742417504
os << (const struct ur_bindless_images_map_external_array_exp_params_t *)params;
1742517505
} break;
1742617506
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP: {
1742717507
os << (const struct ur_bindless_images_release_interop_exp_params_t *)params;
1742817508
} break;
17429-
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_OPAQUE_FD_EXP: {
17430-
os << (const struct ur_bindless_images_import_external_semaphore_opaque_fd_exp_params_t *)params;
17509+
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_EXP: {
17510+
os << (const struct ur_bindless_images_import_external_semaphore_exp_params_t *)params;
1743117511
} break;
1743217512
case UR_FUNCTION_BINDLESS_IMAGES_DESTROY_EXTERNAL_SEMAPHORE_EXP: {
1743317513
os << (const struct ur_bindless_images_destroy_external_semaphore_exp_params_t *)params;

0 commit comments

Comments
 (0)