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

add system SVM testing via clSVMAllocWithProperties (#2516)

Browse Source 
This PR adds system SVM testing both using driver APIs
(`clSVMAllocWithPropertiesKHR`) and the system allocator directly (e.g.
`malloc`). This is done by finding all of the SVM capabilities that are
"system allocated" and duplicating them with a special "use system
allocator" pseudo-capability. When the "use system allocator"
pseudo-capability is not present, the system SVM type is treated the
same as all other unified SVM types and is tested using driver APIs.
When the "use system allocator" pseudo-capability is present, the system
SVM type is allocated using the system allocator directly, though this
also adds some limitations, for example the properties of the allocation
may not be queried using `clGetSVMPointerInfoKHR`.

See discussion in:
https://github.com/KhronosGroup/OpenCL-Docs/issues/1446
This commit is contained in:
Ben Ashbaugh
2025-10-14 10:07:32 -07:00
committed by GitHub
parent 56802afb17
commit 089e02cdf7
7 changed files with 64 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
test_conformance/SVM/unified_svm_fixture.h
View File

@@ -19,6 +19,9 @@
#include <algorithm>
#include <memory>
constexpr cl_bitfield PSEUDO_CAPABILITY_USE_SYSTEM_ALLOCATOR =
((cl_bitfield)1 << 63);
static inline void parseSVMAllocProperties(
std::vector<cl_svm_alloc_properties_khr> props, cl_device_id& device,
cl_svm_alloc_access_flags_khr& accessFlags, size_t& alignment)
@@ -82,7 +85,7 @@ public:
free();
}
if (caps & CL_SVM_CAPABILITY_SYSTEM_ALLOCATED_KHR)
if (caps & PSEUDO_CAPABILITY_USE_SYSTEM_ALLOCATOR)
{
if (count == 0)
{
@@ -135,7 +138,7 @@ public:
{
if (data)
{
if (caps & CL_SVM_CAPABILITY_SYSTEM_ALLOCATED_KHR)
if (caps & PSEUDO_CAPABILITY_USE_SYSTEM_ALLOCATOR)
{
align_free(data);
}
@@ -317,6 +320,42 @@ struct UnifiedSVMBase
err,
"clGetDeviceInfo failed for CL_DEVICE_SVM_CAPABILITIES_KHR data");
test_assert_error(platformUSVMCaps.size() == deviceUSVMCaps.size(),
"Platform SVM capability size does not match device "
"SVM capability size!");
const size_t check = platformUSVMCaps.size();
// Look through the platform and device SVM capabilities.
// If our pseudo capability to indicate that the system allocator should
// be used is reported as a real capability, then we can't continue
// testing.
for (size_t ti = 0; ti < check; ti++)
{
auto caps = deviceUSVMCaps[ti];
if (caps & PSEUDO_CAPABILITY_USE_SYSTEM_ALLOCATOR)
{
log_info("Unable to continue, device reports system allocator "
"pseudo-capability as an SVM capability.\n");
return CL_INVALID_OPERATION;
}
}
// For any capabilities that support the system allocator, add a
// scenario testing with the system allocator vs. allocating via OpenCL.
for (size_t ti = 0; ti < check; ti++)
{
if (deviceUSVMCaps[ti] & CL_SVM_CAPABILITY_SYSTEM_ALLOCATED_KHR)
{
deviceUSVMCaps.push_back(
deviceUSVMCaps[ti]
| PSEUDO_CAPABILITY_USE_SYSTEM_ALLOCATOR);
platformUSVMCaps.push_back(
platformUSVMCaps[ti]
| PSEUDO_CAPABILITY_USE_SYSTEM_ALLOCATOR);
}
}
clSVMAllocWithPropertiesKHR = (clSVMAllocWithPropertiesKHR_fn)
clGetExtensionFunctionAddressForPlatform(
platform, "clSVMAllocWithPropertiesKHR");