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

Define SubDevicesScopeGuarded in the harness and remove duplicate copies (#2379)

Browse Source 
Signed-off-by: Kévin Petit <kpet@free.fr>
This commit is contained in:
Kévin Petit
2025-04-21 11:16:17 +01:00
committed by GitHub
parent 90524879e4
commit 9fc0d23b4c
5 changed files with 20 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test_common/harness/typeWrappers.h
View File

@@ -377,4 +377,24 @@ public:
size_t getSize() const { return allocsize; }; size_t getSize() const { return allocsize; };
}; };
// scope guard helper to ensure proper releasing of sub devices
struct SubDevicesScopeGuarded
{
SubDevicesScopeGuarded(const cl_int dev_count)
{
sub_devices.resize(dev_count);
}
~SubDevicesScopeGuarded()
{
for (auto &device : sub_devices)
{
cl_int err = clReleaseDevice(device);
if (err != CL_SUCCESS)
log_error("\n Releasing sub-device failed \n");
}
}
std::vector<cl_device_id> sub_devices;
};
#endif // _typeWrappers_h #endif // _typeWrappers_h

20
test_conformance/api/testBase.h
View File

@@ -27,24 +27,4 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
// scope guard helper to ensure proper releasing of sub devices
struct SubDevicesScopeGuarded
{
SubDevicesScopeGuarded(const cl_int dev_count)
{
sub_devices.resize(dev_count);
}
~SubDevicesScopeGuarded()
{
for (auto &device : sub_devices)
{
cl_int err = clReleaseDevice(device);
if (err != CL_SUCCESS)
log_error("\n Releasing sub-device failed \n");
}
}
std::vector<cl_device_id> sub_devices;
};
#endif // _testBase_h #endif // _testBase_h

23
test_conformance/compiler/testBase.h
View File

@@ -45,27 +45,4 @@
} }
// scope guard helper to ensure proper releasing of sub devices
struct SubDevicesScopeGuarded
{
SubDevicesScopeGuarded(const cl_int dev_count)
{
sub_devices.resize(dev_count);
}
~SubDevicesScopeGuarded()
{
for (auto &device : sub_devices)
{
cl_int err = clReleaseDevice(device);
if (err != CL_SUCCESS)
log_error("\n Releasing sub-device failed \n");
}
}
std::vector<cl_device_id> sub_devices;
};
#endif // _testBase_h #endif // _testBase_h

20
test_conformance/extensions/cl_khr_semaphore/semaphore_base.h
View File

@@ -24,26 +24,6 @@
#include "harness/testHarness.h" #include "harness/testHarness.h"
#include "harness/typeWrappers.h" #include "harness/typeWrappers.h"
// scope guard helper to ensure proper releasing of sub devices
struct SubDevicesScopeGuarded
{
SubDevicesScopeGuarded(const cl_int dev_count)
{
sub_devices.resize(dev_count);
}
~SubDevicesScopeGuarded()
{
for (auto &device : sub_devices)
{
cl_int err = clReleaseDevice(device);
if (err != CL_SUCCESS)
log_error("\n Releasing sub-device failed \n");
}
}
std::vector<cl_device_id> sub_devices;
};
struct SemaphoreBase struct SemaphoreBase
{ {
SemaphoreBase(cl_device_id device): device(device) {} SemaphoreBase(cl_device_id device): device(device) {}

20
test_conformance/extensions/cl_khr_semaphore/test_semaphores_negative_wait_signal.cpp
View File

@@ -30,26 +30,6 @@ enum class RunMode
RM_SIGNAL RM_SIGNAL
}; };
// scope guard helper to ensure proper releasing of sub devices
struct SubDevicesScopeGuarded
{
SubDevicesScopeGuarded(const cl_int dev_count)
{
sub_devices.resize(dev_count);
}
~SubDevicesScopeGuarded()
{
for (auto& device : sub_devices)
{
cl_int err = clReleaseDevice(device);
if (err != CL_SUCCESS)
log_error("\n Releasing sub-device failed \n");
}
}
std::vector<cl_device_id> sub_devices;
};
// the device associated with command_queue is not same as one of the devices // the device associated with command_queue is not same as one of the devices
// specified by CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR at the time of creating one // specified by CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR at the time of creating one
// or more of sema_objects. // or more of sema_objects.