Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use global platform in cl device 

Related-To: NEO-4207
Change-Id: I5e478a9aa8e0acab925cd0159db1ec36a28dd729
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2020-02-05 08:42:05 +01:00 committed by sys_ocldev
parent 6cc9b9d125
commit c7ed76a169
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/device/cl_device.cpp
View File

@ -49,7 +49,8 @@ unsigned int ClDevice::getSupportedClVersion() const { return device.getSupporte
void ClDevice::retainApi() {
if (device.isReleasable()) {
platform()->getClDevice(device.getRootDeviceIndex())->incRefInternal();
auto pPlatform = castToObject<Platform>(platformId);
pPlatform->getClDevice(device.getRootDeviceIndex())->incRefInternal();
this->incRefApi();
}
};
@ -57,7 +58,8 @@ unique_ptr_if_unused<ClDevice> ClDevice::releaseApi() {
if (!device.isReleasable()) {
return unique_ptr_if_unused<ClDevice>(this, false);
}
platform()->getClDevice(device.getRootDeviceIndex())->decRefInternal();
auto pPlatform = castToObject<Platform>(platformId);
pPlatform->getClDevice(device.getRootDeviceIndex())->decRefInternal();
return this->decRefApi();
}
@ -113,5 +115,4 @@ void ClDeviceVector::toDeviceIDs(std::vector<cl_device_id> &devIDs) {
const std::string &ClDevice::peekCompilerExtensions() const {
return compilerExtensions;
}
} // namespace NEO

11
unit_tests/device/sub_device_tests.cpp
View File

@ -54,25 +54,34 @@ TEST(SubDevicesTest, givenDeviceWithSubDevicesWhenSubDeviceRefcountsAreChangedTh
DebugManager.flags.CreateMultipleSubDevices.set(2);
VariableBackup<bool> mockDeviceFlagBackup(&MockDevice::createSingleDevice, false);
constructPlatform()->initialize();
auto device = platform()->getClDevice(0);
auto nonDefaultPlatform = std::make_unique<Platform>();
nonDefaultPlatform->initialize();
auto device = nonDefaultPlatform->getClDevice(0);
auto defaultDevice = platform()->getClDevice(0);
auto subDevice = device->getDeviceById(1);
auto baseDeviceApiRefCount = device->getRefApiCount();
auto baseDeviceInternalRefCount = device->getRefInternalCount();
auto baseSubDeviceApiRefCount = subDevice->getRefApiCount();
auto baseSubDeviceInternalRefCount = subDevice->getRefInternalCount();
auto baseDefaultDeviceApiRefCount = defaultDevice->getRefApiCount();
auto baseDefaultDeviceInternalRefCount = defaultDevice->getRefInternalCount();
subDevice->retainApi();
EXPECT_EQ(baseDeviceApiRefCount, device->getRefApiCount());
EXPECT_EQ(baseDeviceInternalRefCount + 1, device->getRefInternalCount());
EXPECT_EQ(baseSubDeviceApiRefCount + 1, subDevice->getRefApiCount());
EXPECT_EQ(baseSubDeviceInternalRefCount + 1, subDevice->getRefInternalCount());
EXPECT_EQ(baseDefaultDeviceApiRefCount, defaultDevice->getRefApiCount());
EXPECT_EQ(baseDefaultDeviceInternalRefCount, defaultDevice->getRefInternalCount());
subDevice->releaseApi();
EXPECT_EQ(baseDeviceApiRefCount, device->getRefApiCount());
EXPECT_EQ(baseDeviceInternalRefCount, device->getRefInternalCount());
EXPECT_EQ(baseSubDeviceApiRefCount, subDevice->getRefApiCount());
EXPECT_EQ(baseSubDeviceInternalRefCount, subDevice->getRefInternalCount());
EXPECT_EQ(baseDefaultDeviceApiRefCount, defaultDevice->getRefApiCount());
EXPECT_EQ(baseDefaultDeviceInternalRefCount, defaultDevice->getRefInternalCount());
}
TEST(SubDevicesTest, givenDeviceWithSubDevicesWhenSubDeviceCreationFailThenWholeDeviceIsDestroyed) {