intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 18:06:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Command stream receiver: use memory manager from execution environment

Browse Source 
Change-Id: I236218a73bd7dac6e5744e3596f146b77b5ca1c8
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2018-10-11 11:19:49 +02:00
committed by sys_ocldev
parent 97c56b9de0
commit 4f028d13a1
47 changed files with 158 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
unit_tests/mocks/mock_device.cpp
View File

@@ -21,7 +21,6 @@ MockDevice::MockDevice(const HardwareInfo &hwInfo)
CommandStreamReceiver *commandStreamReceiver = createCommandStream(&hwInfo, *this->executionEnvironment);
executionEnvironment->commandStreamReceivers.resize(getDeviceIndex() + 1);
executionEnvironment->commandStreamReceivers[getDeviceIndex()].reset(commandStreamReceiver);
commandStreamReceiver->setMemoryManager(this->mockMemoryManager.get());
this->executionEnvironment->memoryManager = std::move(this->mockMemoryManager);
this->commandStreamReceiver = commandStreamReceiver;
}
@@ -33,15 +32,6 @@ OCLRT::MockDevice::MockDevice(const HardwareInfo &hwInfo, ExecutionEnvironment *
mockWaTable = *hwInfo.pWaTable;
}
void MockDevice::setMemoryManager(MemoryManager *memoryManager) {
executionEnvironment->memoryManager.reset(memoryManager);
for (auto &commandStreamReceiver : executionEnvironment->commandStreamReceivers) {
if (commandStreamReceiver) {
commandStreamReceiver->setMemoryManager(memoryManager);
}
}
}
void MockDevice::setOSTime(OSTime *osTime) {
this->osTime.reset(osTime);
};
@@ -55,13 +45,11 @@ bool MockDevice::hasDriverInfo() {
};
void MockDevice::injectMemoryManager(MemoryManager *memoryManager) {
executionEnvironment->commandStreamReceivers[getDeviceIndex()]->setMemoryManager(memoryManager);
setMemoryManager(memoryManager);
executionEnvironment->memoryManager.reset(memoryManager);
}
void MockDevice::resetCommandStreamReceiver(CommandStreamReceiver *newCsr) {
executionEnvironment->commandStreamReceivers[getDeviceIndex()].reset(newCsr);
executionEnvironment->commandStreamReceivers[getDeviceIndex()]->setMemoryManager(executionEnvironment->memoryManager.get());
executionEnvironment->commandStreamReceivers[getDeviceIndex()]->initializeTagAllocation();
executionEnvironment->commandStreamReceivers[getDeviceIndex()]->setPreemptionCsrAllocation(preemptionAllocation);
this->commandStreamReceiver = newCsr;
@@ -69,11 +57,6 @@ void MockDevice::resetCommandStreamReceiver(CommandStreamReceiver *newCsr) {
this->tagAddress = executionEnvironment->commandStreamReceivers[getDeviceIndex()]->getTagAddress();
}
OCLRT::FailMemoryManager::FailMemoryManager() {
agnostic = nullptr;
fail = 0;
}
OCLRT::FailMemoryManager::FailMemoryManager(int32_t fail) {
allocations.reserve(fail);
agnostic = new OsAgnosticMemoryManager(false, false, executionEnvironment);