Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-10 12:53:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add RAII wrapper for DeviceFactory cleanup.

Browse Source 
Change-Id: Iae94df4894bb6bcd64b22c4d197eec7d7fede0b5
This commit is contained in:
Mrozek, Michal
2018-07-12 11:45:02 +02:00
committed by sys_ocldev
parent c34ed02f57
commit 1c17c3b325
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/execution_environment/execution_environment.cpp
View File

@ -28,10 +28,7 @@
namespace OCLRT {
ExecutionEnvironment::ExecutionEnvironment() = default;
ExecutionEnvironment::~ExecutionEnvironment() {
memoryManager.reset(nullptr);
DeviceFactory::releaseDevices();
}
ExecutionEnvironment::~ExecutionEnvironment() = default;
void ExecutionEnvironment::initGmm(const HardwareInfo *hwInfo) {
gmmHelper.reset(new GmmHelper(hwInfo));
}

4
runtime/execution_environment/execution_environment.h
View File

@ -20,6 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#pragma once
#include "runtime/os_interface/device_factory.h"
#include "runtime/utilities/reference_tracked_object.h"
namespace OCLRT {
@ -28,6 +29,9 @@ class CommandStreamReceiver;
class MemoryManager;
struct HardwareInfo;
class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment> {
private:
DeviceFactoryCleaner cleaner;
public:
ExecutionEnvironment();
~ExecutionEnvironment() override;

6
runtime/os_interface/device_factory.h
View File

@ -36,4 +36,10 @@ class DeviceFactory {
static size_t numDevices;
static HardwareInfo *hwInfos;
};
class DeviceFactoryCleaner {
public:
~DeviceFactoryCleaner() { DeviceFactory::releaseDevices(); }
};
} // namespace OCLRT

16
unit_tests/os_interface/device_factory_tests.cpp
View File

@ -48,15 +48,16 @@ struct DeviceFactoryTest : public ::testing::Test {
};
TEST_F(DeviceFactoryTest, GetDevices_Expect_True_If_Returned) {
DeviceFactoryCleaner cleaner;
HardwareInfo *hwInfo = nullptr;
size_t numDevices = 0;
bool success = DeviceFactory::getDevices(&hwInfo, numDevices);
EXPECT_TRUE((numDevices > 0) ? success : !success);
DeviceFactory::releaseDevices();
}
TEST_F(DeviceFactoryTest, GetDevices_Check_HwInfo_Null) {
DeviceFactoryCleaner cleaner;
HardwareInfo *hwInfo = nullptr;
size_t numDevices = 0;
bool success = DeviceFactory::getDevices(&hwInfo, numDevices);
@ -69,10 +70,10 @@ TEST_F(DeviceFactoryTest, GetDevices_Check_HwInfo_Null) {
EXPECT_NE(hwInfo->pSysInfo, nullptr);
EXPECT_NE(hwInfo->pWaTable, nullptr);
}
DeviceFactory::releaseDevices();
}
TEST_F(DeviceFactoryTest, GetDevices_Check_HwInfo_Platform) {
DeviceFactoryCleaner cleaner;
HardwareInfo *hwInfo = nullptr;
const HardwareInfo *refHwinfo = *platformDevices;
size_t numDevices = 0;
@ -86,10 +87,10 @@ TEST_F(DeviceFactoryTest, GetDevices_Check_HwInfo_Platform) {
EXPECT_EQ(refHwinfo->pPlatform->eDisplayCoreFamily, hwInfo->pPlatform->eDisplayCoreFamily);
}
DeviceFactory::releaseDevices();
}
TEST_F(DeviceFactoryTest, overrideKmdNotifySettings) {
DeviceFactoryCleaner cleaner;
DebugManagerStateRestore stateRestore;
HardwareInfo *hwInfoReference = nullptr;
@ -128,11 +129,10 @@ TEST_F(DeviceFactoryTest, overrideKmdNotifySettings) {
hwInfoOverriden->capabilityTable.kmdNotifyProperties.enableQuickKmdSleepForSporadicWaits);
EXPECT_EQ(refDelayQuickKmdSleepForSporadicWaitsMicroseconds + 12,
hwInfoOverriden->capabilityTable.kmdNotifyProperties.delayQuickKmdSleepForSporadicWaitsMicroseconds);
DeviceFactory::releaseDevices();
}
TEST_F(DeviceFactoryTest, getEngineTypeDebugOverride) {
DeviceFactoryCleaner cleaner;
DebugManagerStateRestore dbgRestorer;
int32_t debugEngineType = 2;
DebugManager.flags.NodeOrdinal.set(debugEngineType);
@ -144,21 +144,20 @@ TEST_F(DeviceFactoryTest, getEngineTypeDebugOverride) {
ASSERT_NE(nullptr, hwInfoOverriden);
int32_t actualEngineType = static_cast<int32_t>(hwInfoOverriden->capabilityTable.defaultEngineType);
EXPECT_EQ(debugEngineType, actualEngineType);
DeviceFactory::releaseDevices();
}
TEST_F(DeviceFactoryTest, givenPointerToHwInfoWhenGetDevicedCalledThenRequiedSurfaceSizeIsSettedProperly) {
DeviceFactoryCleaner cleaner;
HardwareInfo *hwInfo = nullptr;
size_t numDevices = 0;
bool success = DeviceFactory::getDevices(&hwInfo, numDevices);
ASSERT_TRUE(success);
EXPECT_EQ(hwInfo->pSysInfo->CsrSizeInMb * MemoryConstants::megaByte, hwInfo->capabilityTable.requiredPreemptionSurfaceSize);
DeviceFactory::releaseDevices();
}
TEST_F(DeviceFactoryTest, givenCreateMultipleDevicesDebugFlagWhenGetDevicesIsCalledThenNumberOfReturnedDevicesIsEqualToDebugVariable) {
DeviceFactoryCleaner cleaner;
DebugManagerStateRestore stateRestore;
auto requiredDeviceCount = 2u;
DebugManager.flags.CreateMultipleDevices.set(requiredDeviceCount);
@ -178,5 +177,4 @@ TEST_F(DeviceFactoryTest, givenCreateMultipleDevicesDebugFlagWhenGetDevicesIsCal
ASSERT_TRUE(success);
EXPECT_EQ(requiredDeviceCount, numDevices);
DeviceFactory::releaseDevices();
}