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

Move setting external memory managers to mock layers.

Browse Source 
Change-Id: I335fd35269da9093c9e744c2735215e8d561098c
This commit is contained in:
Mrozek, Michal
2018-07-20 09:01:58 +02:00
committed by sys_ocldev
parent 239ebf9eab
commit 366a12e3ce
7 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/device/device.cpp
View File

@ -132,7 +132,7 @@ bool Device::createDeviceImpl(const HardwareInfo *pHwInfo, Device &outDevice) {
return false;
}
executionEnvironment->initializeMemoryManager(outDevice.executionEnvironment->memoryManager.get(), outDevice.getEnabled64kbPages());
executionEnvironment->initializeMemoryManager(outDevice.getEnabled64kbPages());
CommandStreamReceiver *commandStreamReceiver = executionEnvironment->commandStreamReceiver.get();
if (!commandStreamReceiver->initializeTagAllocation()) {

15
runtime/device/device.h
View File

@ -53,11 +53,7 @@ class Device : public BaseObject<_cl_device_id> {
static T *create(const HardwareInfo *pHwInfo, ExecutionEnvironment *execEnv) {
pHwInfo = getDeviceInitHwInfo(pHwInfo);
T *device = new T(*pHwInfo, execEnv);
if (false == createDeviceImpl(pHwInfo, *device)) {
delete device;
return nullptr;
}
return device;
return createDeviceInternals(pHwInfo, device);
}
Device &operator=(const Device &) = delete;
@ -139,6 +135,15 @@ class Device : public BaseObject<_cl_device_id> {
Device() = delete;
Device(const HardwareInfo &hwInfo, ExecutionEnvironment *executionEnvironment);
template <typename T>
static T *createDeviceInternals(const HardwareInfo *pHwInfo, T *device) {
if (false == createDeviceImpl(pHwInfo, *device)) {
delete device;
return nullptr;
}
return device;
}
static bool createDeviceImpl(const HardwareInfo *pHwInfo, Device &outDevice);
static const HardwareInfo *getDeviceInitHwInfo(const HardwareInfo *pHwInfoIn);
MOCKABLE_VIRTUAL void initializeCaps();

12
runtime/execution_environment/execution_environment.cpp
View File

@ -45,17 +45,15 @@ bool ExecutionEnvironment::initializeCommandStreamReceiver(const HardwareInfo *p
this->commandStreamReceiver.reset(commandStreamReceiver);
return true;
}
void ExecutionEnvironment::initializeMemoryManager(MemoryManager *externalMemoryManager, bool enable64KBpages) {
void ExecutionEnvironment::initializeMemoryManager(bool enable64KBpages) {
if (this->memoryManager) {
commandStreamReceiver->setMemoryManager(this->memoryManager.get());
return;
}
if (!externalMemoryManager) {
memoryManager.reset(commandStreamReceiver->createMemoryManager(enable64KBpages));
commandStreamReceiver->setMemoryManager(memoryManager.get());
} else {
commandStreamReceiver->setMemoryManager(externalMemoryManager);
}
memoryManager.reset(commandStreamReceiver->createMemoryManager(enable64KBpages));
commandStreamReceiver->setMemoryManager(memoryManager.get());
DEBUG_BREAK_IF(!this->memoryManager);
}

2
runtime/execution_environment/execution_environment.h
View File

@ -40,7 +40,7 @@ class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment>
~ExecutionEnvironment() override;
void initGmm(const HardwareInfo *hwInfo);
bool initializeCommandStreamReceiver(const HardwareInfo *pHwInfo);
void initializeMemoryManager(MemoryManager *externalMemoryManager, bool enable64KBpages);
void initializeMemoryManager(bool enable64KBpages);
std::unique_ptr<MemoryManager> memoryManager;
std::unique_ptr<CommandStreamReceiver> commandStreamReceiver;
};