Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Context::getSubDeviceByIndex function

Browse Source 
Change-Id: I9a41b99521e705da008a614daa88c051b3687352
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski
2020-03-30 16:54:33 +02:00
parent 57cf4f00c3
commit 8bb4be1689
3 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
opencl/source/context/context.cpp
View File

@ -378,14 +378,30 @@ SchedulerKernel &Context::getSchedulerKernel() {
}
bool Context::isDeviceAssociated(const ClDevice &clDevice) const {
for (const auto &device : devices) {
if (device == &clDevice) {
for (const auto &pDevice : devices) {
if (pDevice == &clDevice) {
return true;
}
}
return false;
}
ClDevice *Context::getSubDeviceByIndex(uint32_t subDeviceIndex) const {
auto isExpectedSubDevice = [subDeviceIndex](ClDevice *pClDevice) -> bool {
bool isSubDevice = (pClDevice->getDeviceInfo().parentDevice != nullptr);
if (isSubDevice == false) {
return false;
}
auto &subDevice = static_cast<SubDevice &>(pClDevice->getDevice());
return (subDevice.getSubDeviceIndex() == subDeviceIndex);
};
auto foundDeviceIterator = std::find_if(devices.begin(), devices.end(), isExpectedSubDevice);
return (foundDeviceIterator != devices.end() ? *foundDeviceIterator : nullptr);
}
AsyncEventsHandler &Context::getAsyncEventsHandler() {
return *static_cast<ClExecutionEnvironment *>(devices[0]->getExecutionEnvironment())->getAsyncEventsHandler();
}

1
opencl/source/context/context.h
View File

@ -143,6 +143,7 @@ class Context : public BaseObject<_cl_context> {
SchedulerKernel &getSchedulerKernel();
bool isDeviceAssociated(const ClDevice &clDevice) const;
ClDevice *getSubDeviceByIndex(uint32_t subDeviceIndex) const;
AsyncEventsHandler &getAsyncEventsHandler();

49
opencl/test/unit_test/context/context_multi_device_tests.cpp
View File

@ -6,9 +6,12 @@
*/
#include "shared/source/helpers/array_count.h"
#include "shared/source/os_interface/device_factory.h"
#include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
#include "opencl/source/context/context.h"
#include "opencl/test/unit_test/fixtures/device_fixture.h"
#include "opencl/test/unit_test/helpers/variable_backup.h"
#include "test.h"
#include "gtest/gtest.h"
@ -80,3 +83,49 @@ TEST(ContextMultiDevice, GivenMultipleDevicesWhenCreatingContextThenContextIsCre
delete pDevice;
}
}
TEST(ContextMultiDevice, WhenGettingSubDeviceByIndexFromContextThenCorrectDeviceIsReturned) {
DebugManagerStateRestore restorer;
VariableBackup<bool> createSingleDeviceBackup{&MockDevice::createSingleDevice, false};
VariableBackup<decltype(DeviceFactory::createRootDeviceFunc)> createRootDeviceFuncBackup{&DeviceFactory::createRootDeviceFunc};
DebugManager.flags.CreateMultipleSubDevices.set(2);
createRootDeviceFuncBackup = [](ExecutionEnvironment &executionEnvironment, uint32_t rootDeviceIndex) -> std::unique_ptr<Device> {
return std::unique_ptr<Device>(MockDevice::create<MockDevice>(&executionEnvironment, rootDeviceIndex));
};
auto executionEnvironment = new ExecutionEnvironment;
auto devices = DeviceFactory::createDevices(*executionEnvironment);
auto pRootDevice = std::make_unique<MockClDevice>(static_cast<MockDevice *>(devices[0].release()));
auto pSubDevice0 = pRootDevice->subDevices[0].get();
auto pSubDevice1 = pRootDevice->subDevices[1].get();
cl_device_id allDevices[3]{};
cl_device_id onlyRootDevices[1]{};
cl_device_id onlySubDevices[2]{};
allDevices[0] = onlyRootDevices[0] = pRootDevice.get();
allDevices[1] = onlySubDevices[0] = pSubDevice0;
allDevices[2] = onlySubDevices[1] = pSubDevice1;
cl_int retVal;
auto pContextWithAllDevices = std::unique_ptr<Context>(Context::create<Context>(nullptr, ClDeviceVector(allDevices, 3),
nullptr, nullptr, retVal));
EXPECT_NE(nullptr, pContextWithAllDevices);
auto pContextWithRootDevices = std::unique_ptr<Context>(Context::create<Context>(nullptr, ClDeviceVector(onlyRootDevices, 1),
nullptr, nullptr, retVal));
EXPECT_NE(nullptr, pContextWithRootDevices);
auto pContextWithSubDevices = std::unique_ptr<Context>(Context::create<Context>(nullptr, ClDeviceVector(onlySubDevices, 2),
nullptr, nullptr, retVal));
EXPECT_NE(nullptr, pContextWithSubDevices);
EXPECT_EQ(pSubDevice0, pContextWithAllDevices->getSubDeviceByIndex(0));
EXPECT_EQ(nullptr, pContextWithRootDevices->getSubDeviceByIndex(0));
EXPECT_EQ(pSubDevice0, pContextWithSubDevices->getSubDeviceByIndex(0));
EXPECT_EQ(pSubDevice1, pContextWithAllDevices->getSubDeviceByIndex(1));
EXPECT_EQ(nullptr, pContextWithRootDevices->getSubDeviceByIndex(1));
EXPECT_EQ(pSubDevice1, pContextWithSubDevices->getSubDeviceByIndex(1));
}