Skip to content

Commit 6fb1de4

Browse files
ProGTXProGTX
authored
Merge branch 'main' into sean/copy-const-qualifiers
2 parents 709d3bc + 1baed0b commit 6fb1de4

File tree

157 files changed

+5944
-1592
lines changed

Some content is hidden

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

157 files changed

+5944
-1592
lines changed

‎.github/dependabot.yml

+9
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

‎.github/workflows/e2e_core.yml

+5
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@ jobs:
174174
echo "LIT_XFAIL=${{inputs.xfail}}" >> $GITHUB_ENV
175175
echo "LIT_FILTER_OUT=${{inputs.filter_out}}" >> $GITHUB_ENV
176176
177+
# TODO: remove once intel/llvm lit tests can properly recognize the GPU
178+
- name: Configure hardware platform feature for L0
179+
if: matrix.adapter.name == 'L0'
180+
run: sed -i '/import lit.llvm/i config.available_features.add("gpu-intel-pvc-1T")' build-e2e/lit.site.cfg.py
181+
177182
- name: Run e2e tests
178183
id: tests
179184
run: ninja -C build-e2e check-sycl-e2e

‎.github/workflows/e2e_level_zero.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
config: ""
2222
unit: "gpu"
2323
# Failing tests
24-
xfail: "ESIMD/preemption.cpp;syclcompat/atomic/atomic_class.cpp;ProgramManager/uneven_kernel_split.cpp;Plugin/level_zero_ext_intel_queue_index.cpp;Plugin/level_zero_ext_intel_cslice.cpp;Matrix/joint_matrix_rowmajorA_rowmajorB.cpp;Matrix/element_wise_ops.cpp;Matrix/element_wise_all_ops.cpp;Matrix/SG32/element_wise_all_ops.cpp"
24+
xfail: "ESIMD/preemption.cpp;Matrix/SG32/element_wise_all_ops.cpp;Matrix/SG32/get_coord_int8_matB.cpp;Matrix/element_wise_all_ops.cpp;Matrix/element_wise_all_ops_1d.cpp;Matrix/element_wise_all_ops_1d_cont.cpp;Matrix/element_wise_all_ops_scalar.cpp;Matrix/element_wise_ops.cpp;Matrix/get_coord_int8_matB.cpp;Matrix/joint_matrix_apply_bf16.cpp;Matrix/joint_matrix_apply_two_matrices.cpp;Matrix/joint_matrix_bfloat16.cpp;Matrix/joint_matrix_bfloat16_array.cpp;Matrix/joint_matrix_rowmajorA_rowmajorB.cpp;ProgramManager/uneven_kernel_split.cpp"
2525
# Flaky tests
26-
filter_out: "GroupAlgorithm/root_group.cpp|Basic/exceptions-SYCL-2020.cpp|Graph/UnsupportedDevice/device_query.cpp|Graph/RecordReplay/exception_inconsistent_contexts.cpp"
27-
# These runners by default spawn upwards of 260 workers. That's too much for the GPU.
26+
filter_out: "UserDefinedReductions/user_defined_reductions.cpp"
27+
# These runners by default spawn upwards of 260 workers.
2828
# We also add a time out just in case some test hangs
29-
extra_lit_flags: "-sv -j 50 --max-time 600"
29+
extra_lit_flags: "-sv -j 100 --max-time 600"

‎include/ur_api.h

+354-209
Large diffs are not rendered by default.

‎include/ur_ddi.h

+26-6
Original file line numberDiff line numberDiff line change
@@ -1483,12 +1483,26 @@ typedef ur_result_t(UR_APICALL *ur_pfnEnqueueTimestampRecordingExp_t)(
14831483
const ur_event_handle_t *,
14841484
ur_event_handle_t *);
14851485

1486+
///////////////////////////////////////////////////////////////////////////////
1487+
/// @brief Function-pointer for urEnqueueNativeCommandExp
1488+
typedef ur_result_t(UR_APICALL *ur_pfnEnqueueNativeCommandExp_t)(
1489+
ur_queue_handle_t,
1490+
ur_exp_enqueue_native_command_function_t,
1491+
void *,
1492+
uint32_t,
1493+
const ur_mem_handle_t *,
1494+
const ur_exp_enqueue_native_command_properties_t *,
1495+
uint32_t,
1496+
const ur_event_handle_t *,
1497+
ur_event_handle_t *);
1498+
14861499
///////////////////////////////////////////////////////////////////////////////
14871500
/// @brief Table of EnqueueExp functions pointers
14881501
typedef struct ur_enqueue_exp_dditable_t {
14891502
ur_pfnEnqueueKernelLaunchCustomExp_t pfnKernelLaunchCustomExp;
14901503
ur_pfnEnqueueCooperativeKernelLaunchExp_t pfnCooperativeKernelLaunchExp;
14911504
ur_pfnEnqueueTimestampRecordingExp_t pfnTimestampRecordingExp;
1505+
ur_pfnEnqueueNativeCommandExp_t pfnNativeCommandExp;
14921506
} ur_enqueue_exp_dditable_t;
14931507

14941508
///////////////////////////////////////////////////////////////////////////////
@@ -1605,11 +1619,12 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesMipmapFreeExp_t)(
16051619
ur_exp_image_mem_handle_t);
16061620

16071621
///////////////////////////////////////////////////////////////////////////////
1608-
/// @brief Function-pointer for urBindlessImagesImportOpaqueFDExp
1609-
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportOpaqueFDExp_t)(
1622+
/// @brief Function-pointer for urBindlessImagesImportExternalMemoryExp
1623+
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportExternalMemoryExp_t)(
16101624
ur_context_handle_t,
16111625
ur_device_handle_t,
16121626
size_t,
1627+
ur_exp_external_mem_type_t,
16131628
ur_exp_interop_mem_desc_t *,
16141629
ur_exp_interop_mem_handle_t *);
16151630

@@ -1631,10 +1646,11 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesReleaseInteropExp_t)(
16311646
ur_exp_interop_mem_handle_t);
16321647

16331648
///////////////////////////////////////////////////////////////////////////////
1634-
/// @brief Function-pointer for urBindlessImagesImportExternalSemaphoreOpaqueFDExp
1635-
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportExternalSemaphoreOpaqueFDExp_t)(
1649+
/// @brief Function-pointer for urBindlessImagesImportExternalSemaphoreExp
1650+
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportExternalSemaphoreExp_t)(
16361651
ur_context_handle_t,
16371652
ur_device_handle_t,
1653+
ur_exp_external_semaphore_type_t,
16381654
ur_exp_interop_semaphore_desc_t *,
16391655
ur_exp_interop_semaphore_handle_t *);
16401656

@@ -1650,6 +1666,8 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesDestroyExternalSemaphoreExp_
16501666
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesWaitExternalSemaphoreExp_t)(
16511667
ur_queue_handle_t,
16521668
ur_exp_interop_semaphore_handle_t,
1669+
bool,
1670+
uint64_t,
16531671
uint32_t,
16541672
const ur_event_handle_t *,
16551673
ur_event_handle_t *);
@@ -1659,6 +1677,8 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesWaitExternalSemaphoreExp_t)(
16591677
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesSignalExternalSemaphoreExp_t)(
16601678
ur_queue_handle_t,
16611679
ur_exp_interop_semaphore_handle_t,
1680+
bool,
1681+
uint64_t,
16621682
uint32_t,
16631683
const ur_event_handle_t *,
16641684
ur_event_handle_t *);
@@ -1676,10 +1696,10 @@ typedef struct ur_bindless_images_exp_dditable_t {
16761696
ur_pfnBindlessImagesImageGetInfoExp_t pfnImageGetInfoExp;
16771697
ur_pfnBindlessImagesMipmapGetLevelExp_t pfnMipmapGetLevelExp;
16781698
ur_pfnBindlessImagesMipmapFreeExp_t pfnMipmapFreeExp;
1679-
ur_pfnBindlessImagesImportOpaqueFDExp_t pfnImportOpaqueFDExp;
1699+
ur_pfnBindlessImagesImportExternalMemoryExp_t pfnImportExternalMemoryExp;
16801700
ur_pfnBindlessImagesMapExternalArrayExp_t pfnMapExternalArrayExp;
16811701
ur_pfnBindlessImagesReleaseInteropExp_t pfnReleaseInteropExp;
1682-
ur_pfnBindlessImagesImportExternalSemaphoreOpaqueFDExp_t pfnImportExternalSemaphoreOpaqueFDExp;
1702+
ur_pfnBindlessImagesImportExternalSemaphoreExp_t pfnImportExternalSemaphoreExp;
16831703
ur_pfnBindlessImagesDestroyExternalSemaphoreExp_t pfnDestroyExternalSemaphoreExp;
16841704
ur_pfnBindlessImagesWaitExternalSemaphoreExp_t pfnWaitExternalSemaphoreExp;
16851705
ur_pfnBindlessImagesSignalExternalSemaphoreExp_t pfnSignalExternalSemaphoreExp;

‎include/ur_print.h

+44-4
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
@@ -1026,6 +1042,22 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintExpLaunchProperty(const struct ur_exp
10261042
/// - `buff_size < out_size`
10271043
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpPeerInfo(enum ur_exp_peer_info_t value, char *buffer, const size_t buff_size, size_t *out_size);
10281044

1045+
///////////////////////////////////////////////////////////////////////////////
1046+
/// @brief Print ur_exp_enqueue_native_command_flag_t enum
1047+
/// @returns
1048+
/// - ::UR_RESULT_SUCCESS
1049+
/// - ::UR_RESULT_ERROR_INVALID_SIZE
1050+
/// - `buff_size < out_size`
1051+
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpEnqueueNativeCommandFlags(enum ur_exp_enqueue_native_command_flag_t value, char *buffer, const size_t buff_size, size_t *out_size);
1052+
1053+
///////////////////////////////////////////////////////////////////////////////
1054+
/// @brief Print ur_exp_enqueue_native_command_properties_t struct
1055+
/// @returns
1056+
/// - ::UR_RESULT_SUCCESS
1057+
/// - ::UR_RESULT_ERROR_INVALID_SIZE
1058+
/// - `buff_size < out_size`
1059+
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpEnqueueNativeCommandProperties(const struct ur_exp_enqueue_native_command_properties_t params, char *buffer, const size_t buff_size, size_t *out_size);
1060+
10291061
///////////////////////////////////////////////////////////////////////////////
10301062
/// @brief Print ur_loader_config_create_params_t struct
10311063
/// @returns
@@ -1994,6 +2026,14 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintEnqueueCooperativeKernelLaunchExpPara
19942026
/// - `buff_size < out_size`
19952027
UR_APIEXPORT ur_result_t UR_APICALL urPrintEnqueueTimestampRecordingExpParams(const struct ur_enqueue_timestamp_recording_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
19962028

2029+
///////////////////////////////////////////////////////////////////////////////
2030+
/// @brief Print ur_enqueue_native_command_exp_params_t struct
2031+
/// @returns
2032+
/// - ::UR_RESULT_SUCCESS
2033+
/// - ::UR_RESULT_ERROR_INVALID_SIZE
2034+
/// - `buff_size < out_size`
2035+
UR_APIEXPORT ur_result_t UR_APICALL urPrintEnqueueNativeCommandExpParams(const struct ur_enqueue_native_command_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
2036+
19972037
///////////////////////////////////////////////////////////////////////////////
19982038
/// @brief Print ur_bindless_images_unsampled_image_handle_destroy_exp_params_t struct
19992039
/// @returns
@@ -2075,12 +2115,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesMipmapGetLevelExpParams
20752115
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);
20762116

20772117
///////////////////////////////////////////////////////////////////////////////
2078-
/// @brief Print ur_bindless_images_import_opaque_fd_exp_params_t struct
2118+
/// @brief Print ur_bindless_images_import_external_memory_exp_params_t struct
20792119
/// @returns
20802120
/// - ::UR_RESULT_SUCCESS
20812121
/// - ::UR_RESULT_ERROR_INVALID_SIZE
20822122
/// - `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);
2123+
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);
20842124

20852125
///////////////////////////////////////////////////////////////////////////////
20862126
/// @brief Print ur_bindless_images_map_external_array_exp_params_t struct
@@ -2099,12 +2139,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesMapExternalArrayExpPara
20992139
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);
21002140

21012141
///////////////////////////////////////////////////////////////////////////////
2102-
/// @brief Print ur_bindless_images_import_external_semaphore_opaque_fd_exp_params_t struct
2142+
/// @brief Print ur_bindless_images_import_external_semaphore_exp_params_t struct
21032143
/// @returns
21042144
/// - ::UR_RESULT_SUCCESS
21052145
/// - ::UR_RESULT_ERROR_INVALID_SIZE
21062146
/// - `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);
2147+
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);
21082148

21092149
///////////////////////////////////////////////////////////////////////////////
21102150
/// @brief Print ur_bindless_images_destroy_external_semaphore_exp_params_t struct

0 commit comments

Comments
 (0)