Move MemoryInfoImpl logic to MemoryInfo

Signed-off-by: Szymon Morek <szymon.morek@intel.com>
This commit is contained in:
Szymon Morek
2021-11-26 15:46:48 +00:00
committed by Compute-Runtime-Automation
parent f138c5f881
commit 12777bd758
14 changed files with 161 additions and 150 deletions

View File

@@ -145,9 +145,10 @@ class DrmMemoryManagerWithLocalMemoryFixture : public DrmMemoryManagerFixture {
std::unique_ptr<VariableBackup<UltHwConfig>> backup;
};
struct MockMemoryInfoImpl : public NEO::MemoryInfo {
MockMemoryInfoImpl() {}
~MockMemoryInfoImpl() override{};
struct MockedMemoryInfo : public NEO::MemoryInfo {
MockedMemoryInfo(const drm_i915_memory_region_info *regionInfo, size_t count) : MemoryInfo(regionInfo, count) {}
~MockedMemoryInfo() override{};
size_t getMemoryRegionSize(uint32_t memoryBank) override {
return 1024u;
}
@@ -190,7 +191,12 @@ class DrmMemoryManagerFixtureWithoutQuietIoctlExpectation {
i++;
}
mock = static_cast<DrmMockCustom *>(executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->osInterface->getDriverModel()->as<Drm>());
mock->memoryInfo.reset(new MockMemoryInfoImpl());
drm_i915_memory_region_info regionInfo[2] = {};
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probed_size = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probed_size = 16 * GB;
mock->memoryInfo.reset(new MockedMemoryInfo(regionInfo, 2));
executionEnvironment->rootDeviceEnvironments[0]->memoryOperationsInterface = DrmMemoryOperationsHandler::create(*mock, 0u);
memoryManager.reset(new TestedDrmMemoryManager(enableLocalMem, false, false, *executionEnvironment));