intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 14:55:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: add Drm-specific memoryBanks computation logic

Browse Source 
Related-To: NEO-9754

Signed-off-by: Maciej Bielski <maciej.bielski@intel.com>
This commit is contained in:
Maciej Bielski
2024-06-11 17:00:04 +00:00
committed by Compute-Runtime-Automation
parent 9513df52a6
commit 11f7166c5a
7 changed files with 127 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shared/test/common/os_interface/linux/device_command_stream_fixture.h
View File

@@ -6,6 +6,7 @@
*/
#pragma once
#include "shared/source/helpers/driver_model_type.h"
#include "shared/source/helpers/hw_info.h"
#include "shared/source/os_interface/linux/drm_memory_manager.h"
#include "shared/source/os_interface/linux/drm_neo.h"
@@ -97,6 +98,8 @@ class DrmMockTime : public DrmMockSuccess {
class DrmMockCustom : public Drm {
public:
static constexpr NEO::DriverModelType driverModelType = NEO::DriverModelType::drm;
using Drm::bindAvailable;
using Drm::cacheInfo;
using Drm::checkToDisableScratchPage;

6
shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp
View File

@@ -13,6 +13,7 @@
#include "shared/test/common/mocks/linux/mock_drm_memory_manager.h"
#include "shared/test/common/mocks/mock_builtins.h"
#include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/os_interface/linux/drm_mock_memory_info.h"
#include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h"
#include "hw_cmds_default.h"
@@ -112,7 +113,10 @@ void DrmMemoryManagerWithLocalMemoryFixture::setUp() {
MemoryManagementFixture::setUp();
executionEnvironment = MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1);
DrmMemoryManagerFixture::setUp(new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]), true);
auto drmMock = new DrmMockCustom{*executionEnvironment->rootDeviceEnvironments[1]};
drmMock->memoryInfo.reset(new MockMemoryInfo{*drmMock});
DrmMemoryManagerFixture::setUp(drmMock, true);
drmMock->reset();
} // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
void DrmMemoryManagerWithLocalMemoryFixture::tearDown() {
DrmMemoryManagerFixture::tearDown();

3
shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2023 Intel Corporation
* Copyright (C) 2022-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -103,6 +103,7 @@ class DrmMemoryManagerLocalMemoryWithCustomPrelimMockTest : public ::testing::Te
executionEnvironment->rootDeviceEnvironments[0]->setHwInfoAndInitHelpers(defaultHwInfo.get());
mock = new DrmMockCustomPrelim(*executionEnvironment->rootDeviceEnvironments[0]);
mock->memoryInfo.reset(new MockMemoryInfo{*mock});
executionEnvironment->rootDeviceEnvironments[0]->osInterface = std::make_unique<OSInterface>();
executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr<DriverModel>(mock));

4
shared/test/common/os_interface/linux/drm_mock_memory_info.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2023 Intel Corporation
* Copyright (C) 2020-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -18,6 +18,8 @@ const std::vector<NEO::MemoryRegion> memoryRegions = {
{{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}, 8 * MemoryConstants::gigaByte, 0}};
struct MockMemoryInfo : public NEO::MemoryInfo {
using NEO::MemoryInfo::localMemoryRegions;
MockMemoryInfo(const NEO::Drm &drm) : MemoryInfo(memoryRegions, drm) {}
};