Skip to content

Commit 4d63ae9

Browse files
martygrantmartygrant
authored
Merge branch 'oneapi-src:main' into martin/nativeCPUFixes
2 parents 2f5aa14 + 95f9092 commit 4d63ae9

34 files changed

+319
-5021
lines changed

‎.github/workflows/cmake.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110

111111
- name: Test
112112
working-directory: ${{github.workspace}}/build
113-
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "python|umf|loader|validation|tracing|unit|urtrace"
113+
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "umf|loader|validation|tracing|unit|urtrace"
114114

115115
fuzztest-build:
116116
name: Build and run quick fuzztest scenarios
@@ -346,7 +346,7 @@ jobs:
346346

347347
- name: Test
348348
working-directory: ${{github.workspace}}/build
349-
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "python|umf|loader|validation|tracing|unit|urtrace"
349+
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "umf|loader|validation|tracing|unit|urtrace"
350350

351351

352352
macos-build:

‎.github/workflows/coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565

6666
- name: Test
6767
working-directory: ${{github.workspace}}/build
68-
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "python|umf|loader|validation|tracing|unit|urtrace"
68+
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "umf|loader|validation|tracing|unit|urtrace"
6969

7070
- name: Quick Coverage Info
7171
working-directory: ${{github.workspace}}/build

‎.github/workflows/coverity.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ name: coverity-unified-runtime
99
# It runs static analysis build - Coverity. It requires special token (set in CI's secret).
1010

1111
on:
12-
push:
13-
branches: ["main"]
12+
schedule:
13+
# Run every day at 23:00 UTC
14+
- cron: '0 23 * * *'
1415
workflow_dispatch:
1516

1617
env:

‎include/ur.py‎

Lines changed: 0 additions & 4305 deletions
This file was deleted.

‎include/ur_api.h‎

Lines changed: 64 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -224,48 +224,48 @@ typedef enum ur_function_t {
224224
///////////////////////////////////////////////////////////////////////////////
225225
/// @brief Defines structure types
226226
typedef enum ur_structure_type_t {
227-
UR_STRUCTURE_TYPE_CONTEXT_PROPERTIES = 0, ///< ::ur_context_properties_t
228-
UR_STRUCTURE_TYPE_IMAGE_DESC = 1, ///< ::ur_image_desc_t
229-
UR_STRUCTURE_TYPE_BUFFER_PROPERTIES = 2, ///< ::ur_buffer_properties_t
230-
UR_STRUCTURE_TYPE_BUFFER_REGION = 3, ///< ::ur_buffer_region_t
231-
UR_STRUCTURE_TYPE_BUFFER_CHANNEL_PROPERTIES = 4, ///< ::ur_buffer_channel_properties_t
232-
UR_STRUCTURE_TYPE_BUFFER_ALLOC_LOCATION_PROPERTIES = 5, ///< ::ur_buffer_alloc_location_properties_t
233-
UR_STRUCTURE_TYPE_PROGRAM_PROPERTIES = 6, ///< ::ur_program_properties_t
234-
UR_STRUCTURE_TYPE_USM_DESC = 7, ///< ::ur_usm_desc_t
235-
UR_STRUCTURE_TYPE_USM_HOST_DESC = 8, ///< ::ur_usm_host_desc_t
236-
UR_STRUCTURE_TYPE_USM_DEVICE_DESC = 9, ///< ::ur_usm_device_desc_t
237-
UR_STRUCTURE_TYPE_USM_POOL_DESC = 10, ///< ::ur_usm_pool_desc_t
238-
UR_STRUCTURE_TYPE_USM_POOL_LIMITS_DESC = 11, ///< ::ur_usm_pool_limits_desc_t
239-
UR_STRUCTURE_TYPE_DEVICE_BINARY = 12, ///< ::ur_device_binary_t
240-
UR_STRUCTURE_TYPE_SAMPLER_DESC = 13, ///< ::ur_sampler_desc_t
241-
UR_STRUCTURE_TYPE_QUEUE_PROPERTIES = 14, ///< ::ur_queue_properties_t
242-
UR_STRUCTURE_TYPE_QUEUE_INDEX_PROPERTIES = 15, ///< ::ur_queue_index_properties_t
243-
UR_STRUCTURE_TYPE_CONTEXT_NATIVE_PROPERTIES = 16, ///< ::ur_context_native_properties_t
244-
UR_STRUCTURE_TYPE_KERNEL_NATIVE_PROPERTIES = 17, ///< ::ur_kernel_native_properties_t
245-
UR_STRUCTURE_TYPE_QUEUE_NATIVE_PROPERTIES = 18, ///< ::ur_queue_native_properties_t
246-
UR_STRUCTURE_TYPE_MEM_NATIVE_PROPERTIES = 19, ///< ::ur_mem_native_properties_t
247-
UR_STRUCTURE_TYPE_EVENT_NATIVE_PROPERTIES = 20, ///< ::ur_event_native_properties_t
248-
UR_STRUCTURE_TYPE_PLATFORM_NATIVE_PROPERTIES = 21, ///< ::ur_platform_native_properties_t
249-
UR_STRUCTURE_TYPE_DEVICE_NATIVE_PROPERTIES = 22, ///< ::ur_device_native_properties_t
250-
UR_STRUCTURE_TYPE_PROGRAM_NATIVE_PROPERTIES = 23, ///< ::ur_program_native_properties_t
251-
UR_STRUCTURE_TYPE_SAMPLER_NATIVE_PROPERTIES = 24, ///< ::ur_sampler_native_properties_t
252-
UR_STRUCTURE_TYPE_QUEUE_NATIVE_DESC = 25, ///< ::ur_queue_native_desc_t
253-
UR_STRUCTURE_TYPE_DEVICE_PARTITION_PROPERTIES = 26, ///< ::ur_device_partition_properties_t
254-
UR_STRUCTURE_TYPE_KERNEL_ARG_MEM_OBJ_PROPERTIES = 27, ///< ::ur_kernel_arg_mem_obj_properties_t
255-
UR_STRUCTURE_TYPE_PHYSICAL_MEM_PROPERTIES = 28, ///< ::ur_physical_mem_properties_t
256-
UR_STRUCTURE_TYPE_KERNEL_ARG_POINTER_PROPERTIES = 29, ///< ::ur_kernel_arg_pointer_properties_t
257-
UR_STRUCTURE_TYPE_KERNEL_ARG_SAMPLER_PROPERTIES = 30, ///< ::ur_kernel_arg_sampler_properties_t
258-
UR_STRUCTURE_TYPE_KERNEL_EXEC_INFO_PROPERTIES = 31, ///< ::ur_kernel_exec_info_properties_t
259-
UR_STRUCTURE_TYPE_KERNEL_ARG_VALUE_PROPERTIES = 32, ///< ::ur_kernel_arg_value_properties_t
260-
UR_STRUCTURE_TYPE_KERNEL_ARG_LOCAL_PROPERTIES = 33, ///< ::ur_kernel_arg_local_properties_t
261-
UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_DESC = 0x1000, ///< ::ur_exp_command_buffer_desc_t
262-
UR_STRUCTURE_TYPE_EXP_SAMPLER_MIP_PROPERTIES = 0x2000, ///< ::ur_exp_sampler_mip_properties_t
263-
UR_STRUCTURE_TYPE_EXP_INTEROP_MEM_DESC = 0x2001, ///< ::ur_exp_interop_mem_desc_t
264-
UR_STRUCTURE_TYPE_EXP_INTEROP_SEMAPHORE_DESC = 0x2002, ///< ::ur_exp_interop_semaphore_desc_t
265-
UR_STRUCTURE_TYPE_EXP_FILE_DESCRIPTOR = 0x2003, ///< ::ur_exp_file_descriptor_t
266-
UR_STRUCTURE_TYPE_EXP_WIN32_HANDLE = 0x2004, ///< ::ur_exp_win32_handle_t
267-
UR_STRUCTURE_TYPE_EXP_LAYERED_IMAGE_PROPERTIES = 0x2005, ///< ::ur_exp_layered_image_properties_t
268-
UR_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES = 0x2006, ///< ::ur_exp_sampler_addr_modes_t
227+
UR_STRUCTURE_TYPE_CONTEXT_PROPERTIES = 0, ///< ::ur_context_properties_t
228+
UR_STRUCTURE_TYPE_IMAGE_DESC = 1, ///< ::ur_image_desc_t
229+
UR_STRUCTURE_TYPE_BUFFER_PROPERTIES = 2, ///< ::ur_buffer_properties_t
230+
UR_STRUCTURE_TYPE_BUFFER_REGION = 3, ///< ::ur_buffer_region_t
231+
UR_STRUCTURE_TYPE_BUFFER_CHANNEL_PROPERTIES = 4, ///< ::ur_buffer_channel_properties_t
232+
UR_STRUCTURE_TYPE_BUFFER_ALLOC_LOCATION_PROPERTIES = 5, ///< ::ur_buffer_alloc_location_properties_t
233+
UR_STRUCTURE_TYPE_PROGRAM_PROPERTIES = 6, ///< ::ur_program_properties_t
234+
UR_STRUCTURE_TYPE_USM_DESC = 7, ///< ::ur_usm_desc_t
235+
UR_STRUCTURE_TYPE_USM_HOST_DESC = 8, ///< ::ur_usm_host_desc_t
236+
UR_STRUCTURE_TYPE_USM_DEVICE_DESC = 9, ///< ::ur_usm_device_desc_t
237+
UR_STRUCTURE_TYPE_USM_POOL_DESC = 10, ///< ::ur_usm_pool_desc_t
238+
UR_STRUCTURE_TYPE_USM_POOL_LIMITS_DESC = 11, ///< ::ur_usm_pool_limits_desc_t
239+
UR_STRUCTURE_TYPE_DEVICE_BINARY = 12, ///< ::ur_device_binary_t
240+
UR_STRUCTURE_TYPE_SAMPLER_DESC = 13, ///< ::ur_sampler_desc_t
241+
UR_STRUCTURE_TYPE_QUEUE_PROPERTIES = 14, ///< ::ur_queue_properties_t
242+
UR_STRUCTURE_TYPE_QUEUE_INDEX_PROPERTIES = 15, ///< ::ur_queue_index_properties_t
243+
UR_STRUCTURE_TYPE_CONTEXT_NATIVE_PROPERTIES = 16, ///< ::ur_context_native_properties_t
244+
UR_STRUCTURE_TYPE_KERNEL_NATIVE_PROPERTIES = 17, ///< ::ur_kernel_native_properties_t
245+
UR_STRUCTURE_TYPE_QUEUE_NATIVE_PROPERTIES = 18, ///< ::ur_queue_native_properties_t
246+
UR_STRUCTURE_TYPE_MEM_NATIVE_PROPERTIES = 19, ///< ::ur_mem_native_properties_t
247+
UR_STRUCTURE_TYPE_EVENT_NATIVE_PROPERTIES = 20, ///< ::ur_event_native_properties_t
248+
UR_STRUCTURE_TYPE_PLATFORM_NATIVE_PROPERTIES = 21, ///< ::ur_platform_native_properties_t
249+
UR_STRUCTURE_TYPE_DEVICE_NATIVE_PROPERTIES = 22, ///< ::ur_device_native_properties_t
250+
UR_STRUCTURE_TYPE_PROGRAM_NATIVE_PROPERTIES = 23, ///< ::ur_program_native_properties_t
251+
UR_STRUCTURE_TYPE_SAMPLER_NATIVE_PROPERTIES = 24, ///< ::ur_sampler_native_properties_t
252+
UR_STRUCTURE_TYPE_QUEUE_NATIVE_DESC = 25, ///< ::ur_queue_native_desc_t
253+
UR_STRUCTURE_TYPE_DEVICE_PARTITION_PROPERTIES = 26, ///< ::ur_device_partition_properties_t
254+
UR_STRUCTURE_TYPE_KERNEL_ARG_MEM_OBJ_PROPERTIES = 27, ///< ::ur_kernel_arg_mem_obj_properties_t
255+
UR_STRUCTURE_TYPE_PHYSICAL_MEM_PROPERTIES = 28, ///< ::ur_physical_mem_properties_t
256+
UR_STRUCTURE_TYPE_KERNEL_ARG_POINTER_PROPERTIES = 29, ///< ::ur_kernel_arg_pointer_properties_t
257+
UR_STRUCTURE_TYPE_KERNEL_ARG_SAMPLER_PROPERTIES = 30, ///< ::ur_kernel_arg_sampler_properties_t
258+
UR_STRUCTURE_TYPE_KERNEL_EXEC_INFO_PROPERTIES = 31, ///< ::ur_kernel_exec_info_properties_t
259+
UR_STRUCTURE_TYPE_KERNEL_ARG_VALUE_PROPERTIES = 32, ///< ::ur_kernel_arg_value_properties_t
260+
UR_STRUCTURE_TYPE_KERNEL_ARG_LOCAL_PROPERTIES = 33, ///< ::ur_kernel_arg_local_properties_t
261+
UR_STRUCTURE_TYPE_USM_ALLOC_LOCATION_DESC = 35, ///< ::ur_usm_alloc_location_desc_t
262+
UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_DESC = 0x1000, ///< ::ur_exp_command_buffer_desc_t
263+
UR_STRUCTURE_TYPE_EXP_SAMPLER_MIP_PROPERTIES = 0x2000, ///< ::ur_exp_sampler_mip_properties_t
264+
UR_STRUCTURE_TYPE_EXP_INTEROP_MEM_DESC = 0x2001, ///< ::ur_exp_interop_mem_desc_t
265+
UR_STRUCTURE_TYPE_EXP_INTEROP_SEMAPHORE_DESC = 0x2002, ///< ::ur_exp_interop_semaphore_desc_t
266+
UR_STRUCTURE_TYPE_EXP_FILE_DESCRIPTOR = 0x2003, ///< ::ur_exp_file_descriptor_t
267+
UR_STRUCTURE_TYPE_EXP_WIN32_HANDLE = 0x2004, ///< ::ur_exp_win32_handle_t
268+
UR_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES = 0x2005, ///< ::ur_exp_sampler_addr_modes_t
269269
/// @cond
270270
UR_STRUCTURE_TYPE_FORCE_UINT32 = 0x7fffffff
271271
/// @endcond
@@ -3287,6 +3287,25 @@ typedef struct ur_usm_device_desc_t {
32873287

32883288
} ur_usm_device_desc_t;
32893289

3290+
///////////////////////////////////////////////////////////////////////////////
3291+
/// @brief USM allocation location desc
3292+
///
3293+
/// @details
3294+
/// - Specify these properties in ::urUSMHostAlloc, ::urUSMDeviceAlloc and
3295+
/// ::urUSMSharedAlloc via ::ur_usm_desc_t as part of a `pNext` chain.
3296+
///
3297+
/// @remarks
3298+
/// _Analogues_
3299+
/// - cl_intel_mem_alloc_buffer_location
3300+
typedef struct ur_usm_alloc_location_desc_t {
3301+
ur_structure_type_t stype; ///< [in] type of this structure, must be
3302+
///< ::UR_STRUCTURE_TYPE_USM_ALLOC_LOCATION_DESC
3303+
const void *pNext; ///< [in][optional] pointer to extension-specific structure
3304+
uint32_t location; ///< [in] Identifies the ID of global memory partition to which the memory
3305+
///< should be allocated.
3306+
3307+
} ur_usm_alloc_location_desc_t;
3308+
32903309
///////////////////////////////////////////////////////////////////////////////
32913310
/// @brief USM pool descriptor type
32923311
typedef struct ur_usm_pool_desc_t {
@@ -3324,6 +3343,7 @@ typedef struct ur_usm_pool_limits_desc_t {
33243343
/// - Any flags/hints passed through pUSMDesc only affect the single
33253344
/// allocation.
33263345
/// - See also ::ur_usm_host_desc_t.
3346+
/// - See also ::ur_usm_alloc_location_desc_t.
33273347
///
33283348
/// @returns
33293349
/// - ::UR_RESULT_SUCCESS
@@ -3369,6 +3389,7 @@ urUSMHostAlloc(
33693389
/// - Any flags/hints passed through pUSMDesc only affect the single
33703390
/// allocation.
33713391
/// - See also ::ur_usm_device_desc_t.
3392+
/// - See also ::ur_usm_alloc_location_desc_t.
33723393
///
33733394
/// @returns
33743395
/// - ::UR_RESULT_SUCCESS
@@ -3417,6 +3438,7 @@ urUSMDeviceAlloc(
34173438
/// allocation.
34183439
/// - See also ::ur_usm_host_desc_t.
34193440
/// - See also ::ur_usm_device_desc_t.
3441+
/// - See also ::ur_usm_alloc_location_desc_t.
34203442
///
34213443
/// @returns
34223444
/// - ::UR_RESULT_SUCCESS
@@ -7129,21 +7151,6 @@ typedef struct ur_exp_interop_semaphore_desc_t {
71297151

71307152
} ur_exp_interop_semaphore_desc_t;
71317153

7132-
///////////////////////////////////////////////////////////////////////////////
7133-
/// @brief Describes layered image properties
7134-
///
7135-
/// @details
7136-
/// - Specify these properties in ::urBindlessImagesUnsampledImageCreateExp
7137-
/// or ::urBindlessImagesSampledImageCreateExp via ::ur_image_desc_t as
7138-
/// part of a `pNext` chain.
7139-
typedef struct ur_exp_layered_image_properties_t {
7140-
ur_structure_type_t stype; ///< [in] type of this structure, must be
7141-
///< ::UR_STRUCTURE_TYPE_EXP_LAYERED_IMAGE_PROPERTIES
7142-
void *pNext; ///< [in,out][optional] pointer to extension-specific structure
7143-
uint32_t numLayers; ///< [in] number of layers the image should have
7144-
7145-
} ur_exp_layered_image_properties_t;
7146-
71477154
///////////////////////////////////////////////////////////////////////////////
71487155
/// @brief USM allocate pitched memory
71497156
///

‎include/ur_print.hpp‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ inline std::ostream &operator<<(std::ostream &os, ur_usm_advice_flag_t value);
267267
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_usm_desc_t params);
268268
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_usm_host_desc_t params);
269269
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_usm_device_desc_t params);
270+
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_usm_alloc_location_desc_t params);
270271
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_usm_pool_desc_t params);
271272
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_usm_pool_limits_desc_t params);
272273
inline std::ostream &operator<<(std::ostream &os, ur_usm_pool_info_t value);
@@ -317,7 +318,6 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
317318
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_sampler_addr_modes_t params);
318319
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_interop_mem_desc_t params);
319320
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_interop_semaphore_desc_t params);
320-
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_layered_image_properties_t params);
321321
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_command_buffer_desc_t params);
322322
inline std::ostream &operator<<(std::ostream &os, ur_exp_peer_info_t value);
323323

@@ -993,6 +993,9 @@ inline std::ostream &operator<<(std::ostream &os, ur_structure_type_t value) {
993993
case UR_STRUCTURE_TYPE_KERNEL_ARG_LOCAL_PROPERTIES:
994994
os << "UR_STRUCTURE_TYPE_KERNEL_ARG_LOCAL_PROPERTIES";
995995
break;
996+
case UR_STRUCTURE_TYPE_USM_ALLOC_LOCATION_DESC:
997+
os << "UR_STRUCTURE_TYPE_USM_ALLOC_LOCATION_DESC";
998+
break;
996999
case UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_DESC:
9971000
os << "UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_DESC";
9981001
break;
@@ -1011,9 +1014,6 @@ inline std::ostream &operator<<(std::ostream &os, ur_structure_type_t value) {
10111014
case UR_STRUCTURE_TYPE_EXP_WIN32_HANDLE:
10121015
os << "UR_STRUCTURE_TYPE_EXP_WIN32_HANDLE";
10131016
break;
1014-
case UR_STRUCTURE_TYPE_EXP_LAYERED_IMAGE_PROPERTIES:
1015-
os << "UR_STRUCTURE_TYPE_EXP_LAYERED_IMAGE_PROPERTIES";
1016-
break;
10171017
case UR_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES:
10181018
os << "UR_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES";
10191019
break;
@@ -1204,6 +1204,11 @@ inline ur_result_t printStruct(std::ostream &os, const void *ptr) {
12041204
printPtr(os, pstruct);
12051205
} break;
12061206

1207+
case UR_STRUCTURE_TYPE_USM_ALLOC_LOCATION_DESC: {
1208+
const ur_usm_alloc_location_desc_t *pstruct = (const ur_usm_alloc_location_desc_t *)ptr;
1209+
printPtr(os, pstruct);
1210+
} break;
1211+
12071212
case UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_DESC: {
12081213
const ur_exp_command_buffer_desc_t *pstruct = (const ur_exp_command_buffer_desc_t *)ptr;
12091214
printPtr(os, pstruct);
@@ -1234,11 +1239,6 @@ inline ur_result_t printStruct(std::ostream &os, const void *ptr) {
12341239
printPtr(os, pstruct);
12351240
} break;
12361241

1237-
case UR_STRUCTURE_TYPE_EXP_LAYERED_IMAGE_PROPERTIES: {
1238-
const ur_exp_layered_image_properties_t *pstruct = (const ur_exp_layered_image_properties_t *)ptr;
1239-
printPtr(os, pstruct);
1240-
} break;
1241-
12421242
case UR_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES: {
12431243
const ur_exp_sampler_addr_modes_t *pstruct = (const ur_exp_sampler_addr_modes_t *)ptr;
12441244
printPtr(os, pstruct);
@@ -6537,6 +6537,31 @@ inline std::ostream &operator<<(std::ostream &os, const struct ur_usm_device_des
65376537
return os;
65386538
}
65396539
///////////////////////////////////////////////////////////////////////////////
6540+
/// @brief Print operator for the ur_usm_alloc_location_desc_t type
6541+
/// @returns
6542+
/// std::ostream &
6543+
inline std::ostream &operator<<(std::ostream &os, const struct ur_usm_alloc_location_desc_t params) {
6544+
os << "(struct ur_usm_alloc_location_desc_t){";
6545+
6546+
os << ".stype = ";
6547+
6548+
os << (params.stype);
6549+
6550+
os << ", ";
6551+
os << ".pNext = ";
6552+
6553+
ur::details::printStruct(os,
6554+
(params.pNext));
6555+
6556+
os << ", ";
6557+
os << ".location = ";
6558+
6559+
os << (params.location);
6560+
6561+
os << "}";
6562+
return os;
6563+
}
6564+
///////////////////////////////////////////////////////////////////////////////
65406565
/// @brief Print operator for the ur_usm_pool_desc_t type
65416566
/// @returns
65426567
/// std::ostream &
@@ -9096,31 +9121,6 @@ inline std::ostream &operator<<(std::ostream &os, const struct ur_exp_interop_se
90969121
return os;
90979122
}
90989123
///////////////////////////////////////////////////////////////////////////////
9099-
/// @brief Print operator for the ur_exp_layered_image_properties_t type
9100-
/// @returns
9101-
/// std::ostream &
9102-
inline std::ostream &operator<<(std::ostream &os, const struct ur_exp_layered_image_properties_t params) {
9103-
os << "(struct ur_exp_layered_image_properties_t){";
9104-
9105-
os << ".stype = ";
9106-
9107-
os << (params.stype);
9108-
9109-
os << ", ";
9110-
os << ".pNext = ";
9111-
9112-
ur::details::printStruct(os,
9113-
(params.pNext));
9114-
9115-
os << ", ";
9116-
os << ".numLayers = ";
9117-
9118-
os << (params.numLayers);
9119-
9120-
os << "}";
9121-
return os;
9122-
}
9123-
///////////////////////////////////////////////////////////////////////////////
91249124
/// @brief Print operator for the ur_exp_command_buffer_desc_t type
91259125
/// @returns
91269126
/// std::ostream &

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ Enums
6868
${X}_STRUCTURE_TYPE_EXP_INTEROP_SEMAPHORE_DESC
6969
${X}_STRUCTURE_TYPE_EXP_FILE_DESCRIPTOR
7070
${X}_STRUCTURE_TYPE_EXP_WIN32_HANDLE
71-
${X}_STRUCTURE_TYPE_EXP_LAYERED_IMAGE_PROPERTIES
7271
${X}_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES
7372

7473
* ${x}_device_info_t
@@ -129,7 +128,6 @@ Types
129128
* ${x}_exp_interop_semaphore_desc_t
130129
* ${x}_exp_file_descriptor_t
131130
* ${x}_exp_win32_handle_t
132-
* ${x}_exp_layered_image_properties_t
133131
* ${x}_exp_sampler_addr_modes_t
134132

135133
Functions
@@ -184,6 +182,8 @@ Changelog
184182
+----------+-------------------------------------------------------------+
185183
| 8.0 | Added structure for sampler addressing modes per dimension. |
186184
+------------------------------------------------------------------------+
185+
| 9.0 | Remove layered image properties struct. |
186+
+------------------------------------------------------------------------+
187187

188188
Contributors
189189
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)