Skip to content

Commit 85476e1

Browse files
callumfarecallumfare
authored
Merge pull request #2233 from martygrant/martin/memory-cts-spec-gap-2
Improvements to align CTS and Spec for Memory
2 parents 31cb7d9 + ea90920 commit 85476e1

27 files changed

+364
-98
lines changed

‎include/ur_api.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,8 +2515,12 @@ typedef enum ur_mem_type_t {
25152515
///////////////////////////////////////////////////////////////////////////////
25162516
/// @brief Memory Information type
25172517
typedef enum ur_mem_info_t {
2518-
UR_MEM_INFO_SIZE = 0, ///< [size_t] actual size of of memory object in bytes
2519-
UR_MEM_INFO_CONTEXT = 1, ///< [::ur_context_handle_t] context in which the memory object was created
2518+
UR_MEM_INFO_SIZE = 0, ///< [size_t] actual size of of memory object in bytes
2519+
UR_MEM_INFO_CONTEXT = 1, ///< [::ur_context_handle_t] context in which the memory object was created
2520+
UR_MEM_INFO_REFERENCE_COUNT = 2, ///< [uint32_t] Reference count of the memory object.
2521+
///< The reference count returned should be considered immediately stale.
2522+
///< It is unsuitable for general use in applications. This feature is
2523+
///< provided for identifying memory leaks.
25202524
/// @cond
25212525
UR_MEM_INFO_FORCE_UINT32 = 0x7fffffff
25222526
/// @endcond
@@ -2650,6 +2654,7 @@ typedef struct ur_image_desc_t {
26502654
/// - ::UR_RESULT_ERROR_INVALID_CONTEXT
26512655
/// - ::UR_RESULT_ERROR_INVALID_VALUE
26522656
/// - ::UR_RESULT_ERROR_INVALID_IMAGE_FORMAT_DESCRIPTOR
2657+
/// + `pImageDesc && UR_STRUCTURE_TYPE_IMAGE_DESC != pImageDesc->stype`
26532658
/// + `pImageDesc && UR_MEM_TYPE_IMAGE1D_ARRAY < pImageDesc->type`
26542659
/// + `pImageDesc && pImageDesc->numMipLevel != 0`
26552660
/// + `pImageDesc && pImageDesc->numSamples != 0`
@@ -2990,7 +2995,7 @@ urMemImageCreateWithNativeHandle(
29902995
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
29912996
/// + `NULL == hMemory`
29922997
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
2993-
/// + `::UR_MEM_INFO_CONTEXT < propName`
2998+
/// + `::UR_MEM_INFO_REFERENCE_COUNT < propName`
29942999
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
29953000
/// + If `propName` is not supported by the adapter.
29963001
/// - ::UR_RESULT_ERROR_INVALID_SIZE

‎include/ur_print.hpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5631,6 +5631,9 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_mem_info_t value) {
56315631
case UR_MEM_INFO_CONTEXT:
56325632
os << "UR_MEM_INFO_CONTEXT";
56335633
break;
5634+
case UR_MEM_INFO_REFERENCE_COUNT:
5635+
os << "UR_MEM_INFO_REFERENCE_COUNT";
5636+
break;
56345637
default:
56355638
os << "unknown enumerator";
56365639
break;
@@ -5672,6 +5675,18 @@ inline ur_result_t printTagged(std::ostream &os, const void *ptr, ur_mem_info_t
56725675

56735676
os << ")";
56745677
} break;
5678+
case UR_MEM_INFO_REFERENCE_COUNT: {
5679+
const uint32_t *tptr = (const uint32_t *)ptr;
5680+
if (sizeof(uint32_t) > size) {
5681+
os << "invalid size (is: " << size << ", expected: >=" << sizeof(uint32_t) << ")";
5682+
return UR_RESULT_ERROR_INVALID_SIZE;
5683+
}
5684+
os << (const void *)(tptr) << " (";
5685+
5686+
os << *tptr;
5687+
5688+
os << ")";
5689+
} break;
56755690
default:
56765691
os << "unknown enumerator";
56775692
return UR_RESULT_ERROR_INVALID_ENUMERATION;

‎scripts/core/memory.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ etors:
6262
desc: "[size_t] actual size of of memory object in bytes"
6363
- name: CONTEXT
6464
desc: "[$x_context_handle_t] context in which the memory object was created"
65+
- name: REFERENCE_COUNT
66+
desc: |
67+
[uint32_t] Reference count of the memory object.
68+
The reference count returned should be considered immediately stale.
69+
It is unsuitable for general use in applications. This feature is provided for identifying memory leaks.
6570
--- #--------------------------------------------------------------------------
6671
type: enum
6772
desc: "Image channel order info: number of channels and the channel layout"
@@ -241,6 +246,7 @@ returns:
241246
- $X_RESULT_ERROR_INVALID_CONTEXT
242247
- $X_RESULT_ERROR_INVALID_VALUE
243248
- $X_RESULT_ERROR_INVALID_IMAGE_FORMAT_DESCRIPTOR:
249+
- "`pImageDesc && UR_STRUCTURE_TYPE_IMAGE_DESC != pImageDesc->stype`"
244250
- "`pImageDesc && UR_MEM_TYPE_IMAGE1D_ARRAY < pImageDesc->type`"
245251
- "`pImageDesc && pImageDesc->numMipLevel != 0`"
246252
- "`pImageDesc && pImageDesc->numSamples != 0`"

‎source/adapters/cuda/memory.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemGetInfo(ur_mem_handle_t hMemory,
171171
case UR_MEM_INFO_CONTEXT: {
172172
return ReturnValue(hMemory->getContext());
173173
}
174+
case UR_MEM_INFO_REFERENCE_COUNT: {
175+
return ReturnValue(hMemory->getReferenceCount());
176+
}
174177

175178
default:
176179
return UR_RESULT_ERROR_INVALID_ENUMERATION;

‎source/adapters/hip/memory.cpp

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemGetInfo(ur_mem_handle_t hMemory,
231231
size_t propSize,
232232
void *pMemInfo,
233233
size_t *pPropSizeRet) {
234-
235-
UR_ASSERT(MemInfoType <= UR_MEM_INFO_CONTEXT,
236-
UR_RESULT_ERROR_INVALID_ENUMERATION);
237-
238234
// FIXME: Only getting info for the first device in the context. This
239235
// should be fine in general
240236
auto Device = hMemory->getContext()->getDevices()[0];
@@ -286,6 +282,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemGetInfo(ur_mem_handle_t hMemory,
286282
case UR_MEM_INFO_CONTEXT: {
287283
return ReturnValue(hMemory->getContext());
288284
}
285+
case UR_MEM_INFO_REFERENCE_COUNT: {
286+
return ReturnValue(hMemory->getReferenceCount());
287+
}
289288

290289
default:
291290
return UR_RESULT_ERROR_INVALID_ENUMERATION;
@@ -316,14 +315,18 @@ urMemGetNativeHandle(ur_mem_handle_t hMem, ur_device_handle_t Device,
316315
return UR_RESULT_ERROR_INVALID_MEM_OBJECT;
317316
}
318317
}
319-
*phNativeMem = reinterpret_cast<ur_native_handle_t>(
320-
std::get<BufferMem>(hMem->Mem).getPtr(Device));
321-
#elif defined(__HIP_PLATFORM_AMD__)
322-
*phNativeMem = reinterpret_cast<ur_native_handle_t>(
323-
std::get<BufferMem>(hMem->Mem).getPtr(Device));
324-
#else
318+
#elif !defined(__HIP_PLATFORM_AMD__)
325319
#error("Must define exactly one of __HIP_PLATFORM_AMD__ or __HIP_PLATFORM_NVIDIA__");
326320
#endif
321+
if (std::holds_alternative<BufferMem>(hMem->Mem)) {
322+
*phNativeMem = reinterpret_cast<ur_native_handle_t>(
323+
std::get<BufferMem>(hMem->Mem).getPtr(Device));
324+
} else if (std::holds_alternative<SurfaceMem>(hMem->Mem)) {
325+
*phNativeMem = reinterpret_cast<ur_native_handle_t>(
326+
std::get<SurfaceMem>(hMem->Mem).getSurface(Device));
327+
} else {
328+
return UR_RESULT_ERROR_INVALID_MEM_OBJECT;
329+
}
327330
return UR_RESULT_SUCCESS;
328331
}
329332

‎source/adapters/level_zero/memory.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1746,7 +1746,7 @@ ur_result_t urMemBufferCreateWithNativeHandle(
17461746
ur_mem_handle_t
17471747
*Mem ///< [out] pointer to handle of buffer memory object created.
17481748
) {
1749-
bool OwnNativeHandle = Properties->isNativeHandleOwned;
1749+
bool OwnNativeHandle = Properties ? Properties->isNativeHandleOwned : false;
17501750

17511751
std::shared_lock<ur_shared_mutex> Lock(Context->Mutex);
17521752

@@ -1844,9 +1844,6 @@ ur_result_t urMemGetInfo(
18441844
size_t *PropSizeRet ///< [out][optional] pointer to the actual size in
18451845
///< bytes of data queried by pMemInfo.
18461846
) {
1847-
UR_ASSERT(MemInfoType == UR_MEM_INFO_CONTEXT || !Memory->isImage(),
1848-
UR_RESULT_ERROR_INVALID_VALUE);
1849-
18501847
auto Buffer = reinterpret_cast<_ur_buffer *>(Memory);
18511848
std::shared_lock<ur_shared_mutex> Lock(Buffer->Mutex);
18521849
UrReturnHelper ReturnValue(PropSize, MemInfo, PropSizeRet);
@@ -1859,8 +1856,11 @@ ur_result_t urMemGetInfo(
18591856
// Get size of the allocation
18601857
return ReturnValue(size_t{Buffer->Size});
18611858
}
1859+
case UR_MEM_INFO_REFERENCE_COUNT: {
1860+
return ReturnValue(Buffer->RefCount.load());
1861+
}
18621862
default: {
1863-
die("urMemGetInfo: Parameter is not implemented");
1863+
return UR_RESULT_ERROR_INVALID_ENUMERATION;
18641864
}
18651865
}
18661866

‎source/adapters/level_zero/v2/memory.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,9 @@ ur_result_t urMemGetInfo(ur_mem_handle_t hMemory, ur_mem_info_t propName,
522522
// Get size of the allocation
523523
return returnValue(size_t{hMemory->getSize()});
524524
}
525+
case UR_MEM_INFO_REFERENCE_COUNT: {
526+
return returnValue(hMemory->getRefCount().load());
527+
}
525528
default: {
526529
return UR_RESULT_ERROR_INVALID_ENUMERATION;
527530
}

‎source/adapters/opencl/memory.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ cl_int mapURMemInfoToCL(ur_mem_info_t URPropName) {
186186
return CL_MEM_SIZE;
187187
case UR_MEM_INFO_CONTEXT:
188188
return CL_MEM_CONTEXT;
189+
case UR_MEM_INFO_REFERENCE_COUNT:
190+
return CL_MEM_REFERENCE_COUNT;
189191
default:
190192
return -1;
191193
}

‎source/adapters/opencl/ur_interface_loader.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ urGetMemProcAddrTable(ur_api_version_t Version, ur_mem_dditable_t *pDdiTable) {
154154
pDdiTable->pfnBufferPartition = urMemBufferPartition;
155155
pDdiTable->pfnBufferCreateWithNativeHandle =
156156
urMemBufferCreateWithNativeHandle;
157+
pDdiTable->pfnImageCreateWithNativeHandle = urMemImageCreateWithNativeHandle;
157158
pDdiTable->pfnGetInfo = urMemGetInfo;
158159
pDdiTable->pfnGetNativeHandle = urMemGetNativeHandle;
159160
pDdiTable->pfnImageCreate = urMemImageCreate;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,10 @@ __urdlllocal ur_result_t UR_APICALL urMemImageCreate(
11081108
return UR_RESULT_ERROR_INVALID_ENUMERATION;
11091109
}
11101110

1111+
if (pImageDesc && UR_STRUCTURE_TYPE_IMAGE_DESC != pImageDesc->stype) {
1112+
return UR_RESULT_ERROR_INVALID_IMAGE_FORMAT_DESCRIPTOR;
1113+
}
1114+
11111115
if (pImageDesc && UR_MEM_TYPE_IMAGE1D_ARRAY < pImageDesc->type) {
11121116
return UR_RESULT_ERROR_INVALID_IMAGE_FORMAT_DESCRIPTOR;
11131117
}
@@ -1507,7 +1511,7 @@ __urdlllocal ur_result_t UR_APICALL urMemGetInfo(
15071511
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
15081512
}
15091513

1510-
if (UR_MEM_INFO_CONTEXT < propName) {
1514+
if (UR_MEM_INFO_REFERENCE_COUNT < propName) {
15111515
return UR_RESULT_ERROR_INVALID_ENUMERATION;
15121516
}
15131517

‎source/loader/ur_libapi.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,6 +1541,7 @@ ur_result_t UR_APICALL urContextSetExtendedDeleter(
15411541
/// - ::UR_RESULT_ERROR_INVALID_CONTEXT
15421542
/// - ::UR_RESULT_ERROR_INVALID_VALUE
15431543
/// - ::UR_RESULT_ERROR_INVALID_IMAGE_FORMAT_DESCRIPTOR
1544+
/// + `pImageDesc && UR_STRUCTURE_TYPE_IMAGE_DESC != pImageDesc->stype`
15441545
/// + `pImageDesc && UR_MEM_TYPE_IMAGE1D_ARRAY < pImageDesc->type`
15451546
/// + `pImageDesc && pImageDesc->numMipLevel != 0`
15461547
/// + `pImageDesc && pImageDesc->numSamples != 0`
@@ -1890,7 +1891,7 @@ ur_result_t UR_APICALL urMemImageCreateWithNativeHandle(
18901891
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
18911892
/// + `NULL == hMemory`
18921893
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
1893-
/// + `::UR_MEM_INFO_CONTEXT < propName`
1894+
/// + `::UR_MEM_INFO_REFERENCE_COUNT < propName`
18941895
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
18951896
/// + If `propName` is not supported by the adapter.
18961897
/// - ::UR_RESULT_ERROR_INVALID_SIZE

‎source/ur_api.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1342,6 +1342,7 @@ ur_result_t UR_APICALL urContextSetExtendedDeleter(
13421342
/// - ::UR_RESULT_ERROR_INVALID_CONTEXT
13431343
/// - ::UR_RESULT_ERROR_INVALID_VALUE
13441344
/// - ::UR_RESULT_ERROR_INVALID_IMAGE_FORMAT_DESCRIPTOR
1345+
/// + `pImageDesc && UR_STRUCTURE_TYPE_IMAGE_DESC != pImageDesc->stype`
13451346
/// + `pImageDesc && UR_MEM_TYPE_IMAGE1D_ARRAY < pImageDesc->type`
13461347
/// + `pImageDesc && pImageDesc->numMipLevel != 0`
13471348
/// + `pImageDesc && pImageDesc->numSamples != 0`
@@ -1636,7 +1637,7 @@ ur_result_t UR_APICALL urMemImageCreateWithNativeHandle(
16361637
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
16371638
/// + `NULL == hMemory`
16381639
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
1639-
/// + `::UR_MEM_INFO_CONTEXT < propName`
1640+
/// + `::UR_MEM_INFO_REFERENCE_COUNT < propName`
16401641
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
16411642
/// + If `propName` is not supported by the adapter.
16421643
/// - ::UR_RESULT_ERROR_INVALID_SIZE

‎test/conformance/memory/memory_adapter_cuda.match

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
urMemImageCreateTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}_
33
{{OPT}}urMemImageCremBufferCrateTestWith1DMemoryTypeParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MEM_TYPE_IMAGE1D_ARRAY
44
{{OPT}}urMemImageCreateTestWith2DMemoryTypeParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MEM_TYPE_IMAGE2D_ARRAY
5+
urMemBufferCreateWithNativeHandleTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}
6+
urMemBufferCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/NVIDIA_CUDA_BACKEND___{{.*}}
7+
urMemBufferCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/NVIDIA_CUDA_BACKEND___{{.*}}

‎test/conformance/memory/memory_adapter_hip.match

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
urMemImageCreateTest.InvalidSize/AMD_HIP_BACKEND___{{.*}}
33
urMemImageGetInfoTest.Success/AMD_HIP_BACKEND___{{.*}}
44
urMemImageGetInfoTest.Success/AMD_HIP_BACKEND___{{.*}}
5+
urMemBufferCreateWithNativeHandleTest.Success/AMD_HIP_BACKEND___{{.*}}
6+
urMemBufferCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}
7+
urMemBufferCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}
8+
urMemImageCreateWithNativeHandleTest.Success/AMD_HIP_BACKEND___{{.*}}

‎test/conformance/memory/memory_adapter_level_zero.match

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# Note: This file is only for use with cts_exe.py
22
{{OPT}}urMemBufferMultiQueueMemBufferTest.WriteBack
3+
urMemBufferPartitionWithFlagsTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}__UR_MEM_FLAG_WRITE_ONLY
4+
urMemBufferPartitionWithFlagsTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}__UR_MEM_FLAG_READ_ONLY
35
urMemBufferPartitionTest.InvalidValueCreateType/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
46
urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
7+
{{OPT}}urMemImageCreateWithNativeHandleTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
58
{{OPT}}urMemGetInfoImageTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_SIZE
69
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_SNORM_INT8
710
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_SNORM_INT16

‎test/conformance/memory/memory_adapter_level_zero_v2.match

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{{NONDETERMINISTIC}}
2+
{{OPT}}urMemBufferPartitionWithFlagsTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_FLAG_WRITE_ONLY
3+
{{OPT}}urMemBufferPartitionWithFlagsTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_FLAG_READ_ONLY
4+
{{OPT}}urMemBufferPartitionWithFlagsTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_FLAG_READ_WRITE
5+
{{OPT}}urMemBufferPartitionTest.InvalidValueCreateType/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
6+
{{OPT}}urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
27
{{OPT}}urMemGetInfoImageTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_SIZE
38
{{OPT}}urMemGetInfoImageTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_CONTEXT
9+
{{OPT}}urMemGetInfoImageTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_REFERENCE_COUNT
410
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_A__UR_IMAGE_CHANNEL_TYPE_SNORM_INT8
511
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_A__UR_IMAGE_CHANNEL_TYPE_SNORM_INT16
612
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_A__UR_IMAGE_CHANNEL_TYPE_UNORM_INT8
@@ -275,3 +281,11 @@
275281
{{OPT}}urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_INFO_WIDTH
276282
{{OPT}}urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_INFO_HEIGHT
277283
{{OPT}}urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_INFO_DEPTH
284+
{{OPT}}urMemBufferCreateWithNativeHandleTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
285+
{{OPT}}urMemBufferCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
286+
{{OPT}}urMemBufferCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
287+
{{OPT}}urMemBufferCreateWithNativeHandleTest.InvalidNullHandle/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
288+
{{OPT}}urMemBufferCreateWithNativeHandleTest.InvalidNullPointer/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
289+
{{OPT}}urMemImageCreateWithNativeHandleTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
290+
{{OPT}}urMemImageCreateWithNativeHandleTest.InvalidNullHandle/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
291+
{{OPT}}urMemImageCreateWithNativeHandleTest.InvalidNullPointer/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}

‎test/conformance/memory/memory_adapter_native_cpu.match

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{{NONDETERMINISTIC}}
2+
urMemBufferPartitionWithFlagsTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_MEM_FLAG_WRITE_ONLY
3+
urMemBufferPartitionWithFlagsTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_MEM_FLAG_READ_ONLY
24
urMemBufferPartitionTest.InvalidValueCreateType/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
35
urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
4-
urMemGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_MEM_INFO_SIZE
5-
urMemGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_MEM_INFO_CONTEXT
6-
urMemGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_MEM_INFO_SIZE
7-
urMemGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_MEM_INFO_CONTEXT
6+
urMemGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_MEM_INFO_SIZE
7+
urMemGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_MEM_INFO_CONTEXT
8+
urMemGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_MEM_INFO_REFERENCE_COUNT
9+
urMemGetInfoTest.InvalidSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
810
urMemImageCreateTestWithImageFormatParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_IMAGE_CHANNEL_ORDER_A__UR_IMAGE_CHANNEL_TYPE_SNORM_INT8
911
urMemImageCreateTestWithImageFormatParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_IMAGE_CHANNEL_ORDER_A__UR_IMAGE_CHANNEL_TYPE_SNORM_INT16
1012
urMemImageCreateTestWithImageFormatParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_IMAGE_CHANNEL_ORDER_A__UR_IMAGE_CHANNEL_TYPE_UNORM_INT8
@@ -232,3 +234,10 @@ urMemImageCreateTestWithImageFormatParam.Success/SYCL_NATIVE_CPU___SYCL_Native_C
232234
urMemImageCreateTestWithImageFormatParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_IMAGE_CHANNEL_ORDER_SRGBA__UR_IMAGE_CHANNEL_TYPE_FLOAT
233235
urMemReleaseTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
234236
urMemRetainTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
237+
urMemReleaseTest.CheckReferenceCount/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
238+
urMemRetainTest.CheckReferenceCount/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
239+
urMemBufferCreateWithNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
240+
urMemBufferCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
241+
urMemBufferCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
242+
urMemBufferCreateWithNativeHandleTest.InvalidNullHandle/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
243+
urMemBufferCreateWithNativeHandleTest.InvalidNullPointer/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}

‎test/conformance/memory/memory_adapter_opencl.match

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

0 commit comments

Comments
 (0)