Cold-Air-Networks/mirror-opencl-cts
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added checks to query support for MEMORY_SCOPE_ALL_SVM_DEVICES (#2734)

Browse source 
A few kernels in the SVM and C11_atomics tests use
MEMORY_SCOPE_ALL_SVM_DEVICES without querying for its support.

Added a fix to either use a narrower scope or skip the subtest
altogether if the support is not present.
This commit is contained in:
Jose Lopez 2026-07-21 16:45:48 +01:00 committed by GitHub
parent 5c480e01b6
commit e56f8dea10
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 57 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test_conformance/SVM/test_fine_grain_memory_consistency.cpp
View file

@ -157,6 +157,21 @@ REGISTER_TEST(svm_fine_grain_memory_consistency)
char *source[] = { hash_table_kernel };
{
cl_device_atomic_capabilities atomicCaps;
err = clGetDeviceInfo(device, CL_DEVICE_ATOMIC_MEMORY_CAPABILITIES,
sizeof(atomicCaps), &atomicCaps, nullptr);
test_error(err,
"clGetDeviceInfo for CL_DEVICE_ATOMIC_MEMORY_CAPABILITIES "
"failed");
if (!(atomicCaps & CL_DEVICE_ATOMIC_SCOPE_ALL_DEVICES))
{
log_info("memory_scope_all_svm_devices not supported, test not "
"executed.\n");
return 0;
}
}
err = create_cl_objects(
device, (const char **)source, &contextWrapper, &program, &queues[0],
&num_devices, CL_DEVICE_SVM_FINE_GRAIN_BUFFER | CL_DEVICE_SVM_ATOMICS,

15
test_conformance/SVM/test_fine_grain_sync_buffers.cpp
View file

@ -52,6 +52,21 @@ REGISTER_TEST(svm_fine_grain_sync_buffers)
cl_int err = CL_SUCCESS;
clCommandQueueWrapper queues[MAXQ];
{
cl_device_atomic_capabilities atomicCaps;
err = clGetDeviceInfo(device, CL_DEVICE_ATOMIC_MEMORY_CAPABILITIES,
sizeof(atomicCaps), &atomicCaps, nullptr);
test_error(err,
"clGetDeviceInfo for CL_DEVICE_ATOMIC_MEMORY_CAPABILITIES "
"failed");
if (!(atomicCaps & CL_DEVICE_ATOMIC_SCOPE_ALL_DEVICES))
{
log_info("memory_scope_all_svm_devices not supported, test not "
"executed.\n");
return 0;
}
}
err = create_cl_objects(
device, &find_targets_kernel[0], &contextWrapper, &program, &queues[0],
&num_devices, CL_DEVICE_SVM_FINE_GRAIN_BUFFER | CL_DEVICE_SVM_ATOMICS);

35
test_conformance/c11_atomics/test_atomics.cpp
View file

@ -4419,6 +4419,29 @@ public:
{
std::string memoryOrderScope = MemoryOrderScopeStr();
std::string postfix(memoryOrderScope.empty() ? "" : "_explicit");
// Derive the fence scope from the test's MemoryScope so the kernel only
// references scope names that the atomic operation itself already uses.
// This avoids requiring the compiler to define wider-scope identifiers
// (e.g. memory_scope_all_svm_devices) for subtests that don't need
// them.
std::string fenceScopeStr;
switch (this->MemoryScope())
{
case MEMORY_SCOPE_WORK_GROUP:
fenceScopeStr = "memory_scope_work_group";
break;
case MEMORY_SCOPE_ALL_DEVICES:
fenceScopeStr = "memory_scope_all_devices";
break;
case MEMORY_SCOPE_ALL_SVM_DEVICES:
fenceScopeStr = "memory_scope_all_svm_devices";
break;
default: // MEMORY_SCOPE_EMPTY, MEMORY_SCOPE_DEVICE
fenceScopeStr = "memory_scope_device";
break;
}
std::string program =
" uint cnt, stop = 0;\n"
" for(cnt = 0; !stop && cnt < threadCount; cnt++) // each thread "
@ -4434,10 +4457,8 @@ public:
? "CLK_LOCAL_MEM_FENCE | CLK_GLOBAL_MEM_FENCE, "
: "CLK_GLOBAL_MEM_FENCE, ")
+ "memory_order_acquire,"
+ std::string(LocalMemory()
? "memory_scope_work_group"
: (UseSVM() ? "memory_scope_all_svm_devices"
: "memory_scope_device"))
+ std::string(LocalMemory() ? "memory_scope_work_group"
: fenceScopeStr)
+ ");\n";
program += " if (!set)\n"
@ -4469,10 +4490,8 @@ public:
? "CLK_LOCAL_MEM_FENCE | CLK_GLOBAL_MEM_FENCE, "
: "CLK_GLOBAL_MEM_FENCE, ")
+ "memory_order_release,"
+ std::string(LocalMemory()
? "memory_scope_work_group"
: (UseSVM() ? "memory_scope_all_svm_devices"
: "memory_scope_device"))
+ std::string(LocalMemory() ? "memory_scope_work_group"
: fenceScopeStr)
+ ");\n";
program += " atomic_flag_clear" + postfix + "(&destMemory[cnt]"