ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-24 15:59:03 +00:00
Code Packages Projects Releases Wiki Activity

Unified SVM Memcpy and check_for_common_memory_type (#2524)

Browse Source 
* Refactor check_for_common_memory_type to only check for device access.
* rename check_for_common_memory_type to caps_compatibility_check
* Update test_unified_svm_mem_cpy and test_unified_svm_mem_fill.

fixes #2517

Signed-off-by: John Kesapides <john.kesapides@arm.com>
This commit is contained in:
John Kesapides
2025-09-15 18:08:56 +01:00
committed by GitHub
parent 629b6fa032
commit 704ffd012e
2 changed files with 15 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test_conformance/SVM/test_unified_svm_mem_cpy.cpp
View File

@@ -167,7 +167,7 @@ struct UnifiedSVMOPs : UnifiedSVMBase
{ {
for (cl_uint dst_ti = 0; dst_ti < max_ti; dst_ti++) for (cl_uint dst_ti = 0; dst_ti < max_ti; dst_ti++)
{ {
if (check_for_common_memory_type(src_ti, dst_ti)) if (caps_compatibility_check(src_ti, dst_ti))
{ {
log_info( log_info(
" testing clEnqueueSVMMemcpy() SVM type %u -> SVM " " testing clEnqueueSVMMemcpy() SVM type %u -> SVM "
@@ -210,35 +210,14 @@ struct UnifiedSVMOPs : UnifiedSVMBase
0, nullptr, nullptr, nullptr, nullptr)); 0, nullptr, nullptr, nullptr, nullptr));
} }
bool check_for_common_memory_type(cl_uint srcTypeIndex, bool caps_compatibility_check(cl_uint srcTypeIndex, cl_uint dstTypeIndex)
cl_uint dstTypeIndex)
{ {
const auto srcCaps = deviceUSVMCaps[srcTypeIndex]; const auto srcCaps = deviceUSVMCaps[srcTypeIndex];
const auto dstCaps = deviceUSVMCaps[dstTypeIndex]; const auto dstCaps = deviceUSVMCaps[dstTypeIndex];
// Is either allocation a system allocation return (srcCaps & CL_SVM_CAPABILITY_DEVICE_READ_KHR)
if ((srcCaps & CL_SVM_CAPABILITY_SYSTEM_ALLOCATED_KHR) && (dstCaps & CL_SVM_CAPABILITY_DEVICE_WRITE_KHR);
|| (dstCaps & CL_SVM_CAPABILITY_SYSTEM_ALLOCATED_KHR))
{
return true;
}
// Is it possible to use the host
if ((srcCaps & CL_SVM_CAPABILITY_HOST_READ_KHR)
&& (dstCaps & CL_SVM_CAPABILITY_HOST_WRITE_KHR))
{
return true;
}
// Is it posible to use the device
if ((srcCaps & CL_SVM_CAPABILITY_DEVICE_READ_KHR)
&& (dstCaps & CL_SVM_CAPABILITY_DEVICE_WRITE_KHR))
{
return true;
}
return false;
} }
static constexpr size_t alloc_count = 1024; static constexpr size_t alloc_count = 1024;

42
test_conformance/SVM/test_unified_svm_mem_fill.cpp
View File

@@ -130,11 +130,15 @@ struct UnifiedSVMMemFill : UnifiedSVMBase
// possible pattern sizes // possible pattern sizes
for (cl_uint ti = 0; ti < max_ti; ti++) for (cl_uint ti = 0; ti < max_ti; ti++)
{ {
log_info(" testing clEnqueueSVMMemFill() SVM type %u \n", ti); if (caps_compatibility_check(ti))
err = test_svm_memfill(ti);
if (CL_SUCCESS != err)
{ {
return err;
log_info(" testing clEnqueueSVMMemFill() SVM type %u \n", ti);
err = test_svm_memfill(ti);
if (CL_SUCCESS != err)
{
return err;
}
} }
} }
return CL_SUCCESS; return CL_SUCCESS;
@@ -151,35 +155,11 @@ struct UnifiedSVMMemFill : UnifiedSVMBase
0, nullptr, nullptr, nullptr, nullptr)); 0, nullptr, nullptr, nullptr, nullptr));
} }
bool check_for_common_memory_type(cl_uint srcTypeIndex, bool caps_compatibility_check(cl_uint TypeIndex)
cl_uint dstTypeIndex)
{ {
const auto srcCaps = deviceUSVMCaps[srcTypeIndex]; const auto caps = deviceUSVMCaps[TypeIndex];
const auto dstCaps = deviceUSVMCaps[dstTypeIndex]; return caps & CL_SVM_CAPABILITY_DEVICE_WRITE_KHR;
// Is either allocation a system allocation
if ((srcCaps & CL_SVM_CAPABILITY_SYSTEM_ALLOCATED_KHR)
|| (dstCaps & CL_SVM_CAPABILITY_SYSTEM_ALLOCATED_KHR))
{
return true;
}
// Is it possible to use the host
if ((srcCaps & CL_SVM_CAPABILITY_HOST_READ_KHR)
&& (dstCaps & CL_SVM_CAPABILITY_HOST_WRITE_KHR))
{
return true;
}
// Is it posible to use the device
if ((srcCaps & CL_SVM_CAPABILITY_DEVICE_READ_KHR)
&& (dstCaps & CL_SVM_CAPABILITY_DEVICE_WRITE_KHR))
{
return true;
}
return false;
} }
static constexpr size_t alloc_count = 1024; static constexpr size_t alloc_count = 1024;