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

Add memory_scope_all_devices testing (#999)

Browse Source 
* Add memory_scope_all_devices testing

This duplicats memory_scope_all_svm_devices testing, but it seems pretty quick
so I don't think it hurts.

Fixes #990

* Address clang-format failures

* Address a further clang-format failure
This commit is contained in:
Alastair Murray
2020-10-30 15:01:48 +00:00
committed by GitHub
parent 67ab7a7010
commit 8894e7f046
3 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test_conformance/c11_atomics/common.h
View File

@@ -35,25 +35,26 @@
enum TExplicitAtomicType
{
TYPE_ATOMIC_INT,
TYPE_ATOMIC_UINT,
TYPE_ATOMIC_LONG,
TYPE_ATOMIC_ULONG,
TYPE_ATOMIC_FLOAT,
TYPE_ATOMIC_DOUBLE,
TYPE_ATOMIC_INTPTR_T,
TYPE_ATOMIC_UINTPTR_T,
TYPE_ATOMIC_SIZE_T,
TYPE_ATOMIC_PTRDIFF_T,
TYPE_ATOMIC_FLAG
TYPE_ATOMIC_INT,
TYPE_ATOMIC_UINT,
TYPE_ATOMIC_LONG,
TYPE_ATOMIC_ULONG,
TYPE_ATOMIC_FLOAT,
TYPE_ATOMIC_DOUBLE,
TYPE_ATOMIC_INTPTR_T,
TYPE_ATOMIC_UINTPTR_T,
TYPE_ATOMIC_SIZE_T,
TYPE_ATOMIC_PTRDIFF_T,
TYPE_ATOMIC_FLAG
};
enum TExplicitMemoryScopeType
{
MEMORY_SCOPE_EMPTY,
MEMORY_SCOPE_WORK_GROUP,
MEMORY_SCOPE_DEVICE,
MEMORY_SCOPE_ALL_SVM_DEVICES
MEMORY_SCOPE_EMPTY,
MEMORY_SCOPE_WORK_GROUP,
MEMORY_SCOPE_DEVICE,
MEMORY_SCOPE_ALL_DEVICES, // Alias for MEMORY_SCOPE_ALL_SVM_DEVICES
MEMORY_SCOPE_ALL_SVM_DEVICES
};
extern bool gHost; // temporary flag for testing native host threads (test verification)
@@ -320,6 +321,7 @@ public:
}
break;
}
case MEMORY_SCOPE_ALL_DEVICES: // fallthough
case MEMORY_SCOPE_ALL_SVM_DEVICES: {
if ((gAtomicMemCap & CL_DEVICE_ATOMIC_SCOPE_ALL_DEVICES) == 0)
{
@@ -538,11 +540,17 @@ public:
}
virtual cl_uint MaxHostThreads()
{
// block host threads execution for memory scope different than memory_scope_all_svm_devices
if(MemoryScope() == MEMORY_SCOPE_ALL_SVM_DEVICES || gHost)
return CBasicTest<HostAtomicType, HostDataType>::MaxHostThreads();
else
return 0;
// block host threads execution for memory scope different than
// memory_scope_all_svm_devices
if (MemoryScope() == MEMORY_SCOPE_ALL_DEVICES
|| MemoryScope() == MEMORY_SCOPE_ALL_SVM_DEVICES || gHost)
{
return CBasicTest<HostAtomicType, HostDataType>::MaxHostThreads();
}
else
{
return 0;
}
}
private:
TExplicitMemoryOrderType _memoryOrder;