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

Add mechanism to migrate multi root device memory

Browse Source 
invalidate TLB cache if kernel requires migration


Related-To: NEO-3691

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-07-01 16:00:22 +00:00
committed by Compute-Runtime-Automation
parent 714a1ebf53
commit 6f3c89decb
37 changed files with 1544 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opencl/test/unit_test/memory_manager/CMakeLists.txt
View File

@ -13,6 +13,7 @@ set(IGDRCL_SRCS_tests_memory_manager
${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_allocate_in_device_pool_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_allocate_in_preferred_pool_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/migraton_controller_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/surface_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/storage_info_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_manager_tests.cpp

215
opencl/test/unit_test/memory_manager/migraton_controller_tests.cpp Normal file
View File

@ -0,0 +1,215 @@
/*
* Copyright (C) 2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/memory_manager/migration_sync_data.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/mocks/mock_migration_sync_data.h"
#include "shared/test/common/mocks/mock_multi_graphics_allocation.h"
#include "opencl/source/memory_manager/migration_controller.h"
#include "opencl/test/unit_test/fixtures/buffer_fixture.h"
#include "opencl/test/unit_test/fixtures/image_fixture.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_memory_manager.h"
#include "opencl/test/unit_test/test_macros/test_checks_ocl.h"
#include "test.h"
using namespace NEO;
struct MigrationControllerTests : public ::testing::Test {
void SetUp() override {
pCsr0 = context.getDevice(0)->getDefaultEngine().commandStreamReceiver;
pCsr1 = context.getDevice(1)->getDefaultEngine().commandStreamReceiver;
memoryManager = static_cast<MockMemoryManager *>(context.getMemoryManager());
}
void TearDown() override {
}
MockDefaultContext context{true};
CommandStreamReceiver *pCsr0 = nullptr;
CommandStreamReceiver *pCsr1 = nullptr;
MockMemoryManager *memoryManager = nullptr;
};
TEST_F(MigrationControllerTests, givenAllocationWithUndefinedLocationWhenHandleMigrationThenNoMigrationIsPerformedAndProperLocationIsSet) {
std::unique_ptr<Image> pImage(Image1dHelper<>::create(&context));
EXPECT_TRUE(pImage->getMultiGraphicsAllocation().requiresMigrations());
EXPECT_EQ(MigrationSyncData::locationUndefined, pImage->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
MigrationController::handleMigration(context, *pCsr0, pImage.get());
EXPECT_EQ(0u, pImage->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
EXPECT_EQ(0u, memoryManager->lockResourceCalled);
EXPECT_EQ(0u, memoryManager->unlockResourceCalled);
EXPECT_EQ(0u, pCsr0->peekLatestFlushedTaskCount());
}
TEST_F(MigrationControllerTests, givenAllocationWithDefinedLocationWhenHandleMigrationToTheSameLocationThenDontMigrateMemory) {
std::unique_ptr<Image> pImage(Image1dHelper<>::create(&context));
EXPECT_TRUE(pImage->getMultiGraphicsAllocation().requiresMigrations());
pImage->getMultiGraphicsAllocation().getMigrationSyncData()->setCurrentLocation(1);
EXPECT_EQ(1u, pImage->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
MigrationController::handleMigration(context, *pCsr1, pImage.get());
EXPECT_EQ(1u, pImage->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
EXPECT_EQ(0u, memoryManager->lockResourceCalled);
EXPECT_EQ(0u, memoryManager->unlockResourceCalled);
EXPECT_EQ(0u, pCsr1->peekLatestFlushedTaskCount());
}
TEST_F(MigrationControllerTests, givenNotLockableImageAllocationWithDefinedLocationWhenHandleMigrationToDifferentLocationThenMigrateMemoryViaReadWriteImage) {
REQUIRE_IMAGE_SUPPORT_OR_SKIP(&context);
std::unique_ptr<Image> pImage(Image1dHelper<>::create(&context));
EXPECT_TRUE(pImage->getMultiGraphicsAllocation().requiresMigrations());
auto srcAllocation = pImage->getMultiGraphicsAllocation().getGraphicsAllocation(0);
auto dstAllocation = pImage->getMultiGraphicsAllocation().getGraphicsAllocation(1);
srcAllocation->getDefaultGmm()->resourceParams.Flags.Info.NotLockable = 1;
dstAllocation->getDefaultGmm()->resourceParams.Flags.Info.NotLockable = 1;
EXPECT_FALSE(srcAllocation->isAllocationLockable());
EXPECT_FALSE(dstAllocation->isAllocationLockable());
pImage->getMultiGraphicsAllocation().getMigrationSyncData()->setCurrentLocation(0);
EXPECT_EQ(0u, pImage->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
MigrationController::handleMigration(context, *pCsr1, pImage.get());
EXPECT_EQ(1u, pImage->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
EXPECT_EQ(0u, memoryManager->lockResourceCalled);
EXPECT_EQ(0u, memoryManager->unlockResourceCalled);
EXPECT_EQ(1u, pCsr1->peekLatestFlushedTaskCount());
EXPECT_EQ(1u, pCsr0->peekLatestFlushedTaskCount());
}
TEST_F(MigrationControllerTests, givenNotLockableBufferAllocationWithDefinedLocationWhenHandleMigrationToDifferentLocationThenMigrateMemoryViaReadWriteBuffer) {
DebugManagerStateRestore restorer;
DebugManager.flags.DoCpuCopyOnReadBuffer.set(0);
DebugManager.flags.DoCpuCopyOnWriteBuffer.set(0);
DebugManager.flags.EnableBlitterForEnqueueOperations.set(0);
std::unique_ptr<Buffer> pBuffer(BufferHelper<>::create(&context));
const_cast<MultiGraphicsAllocation &>(pBuffer->getMultiGraphicsAllocation()).setMultiStorage(true);
EXPECT_TRUE(pBuffer->getMultiGraphicsAllocation().requiresMigrations());
auto srcAllocation = pBuffer->getMultiGraphicsAllocation().getGraphicsAllocation(0);
auto dstAllocation = pBuffer->getMultiGraphicsAllocation().getGraphicsAllocation(1);
auto gmm0 = new Gmm(context.getDevice(0)->getGmmClientContext(), nullptr, 1, 0, false);
auto gmm1 = new Gmm(context.getDevice(1)->getGmmClientContext(), nullptr, 1, 0, false);
srcAllocation->setDefaultGmm(gmm0);
dstAllocation->setDefaultGmm(gmm1);
srcAllocation->getDefaultGmm()->resourceParams.Flags.Info.NotLockable = 1;
dstAllocation->getDefaultGmm()->resourceParams.Flags.Info.NotLockable = 1;
EXPECT_FALSE(srcAllocation->isAllocationLockable());
EXPECT_FALSE(dstAllocation->isAllocationLockable());
pBuffer->getMultiGraphicsAllocation().getMigrationSyncData()->setCurrentLocation(0);
EXPECT_EQ(0u, pBuffer->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
MigrationController::handleMigration(context, *pCsr1, pBuffer.get());
EXPECT_EQ(1u, pBuffer->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
EXPECT_EQ(0u, memoryManager->lockResourceCalled);
EXPECT_EQ(0u, memoryManager->unlockResourceCalled);
EXPECT_EQ(1u, pCsr1->peekLatestFlushedTaskCount());
EXPECT_EQ(1u, pCsr0->peekLatestFlushedTaskCount());
}
TEST_F(MigrationControllerTests, givenLockableBufferAllocationWithDefinedLocationWhenHandleMigrationToDifferentLocationThenMigrateMemoryViaLockMemory) {
std::unique_ptr<Buffer> pBuffer(BufferHelper<>::create(&context));
const_cast<MultiGraphicsAllocation &>(pBuffer->getMultiGraphicsAllocation()).setMultiStorage(true);
EXPECT_TRUE(pBuffer->getMultiGraphicsAllocation().requiresMigrations());
auto srcAllocation = pBuffer->getMultiGraphicsAllocation().getGraphicsAllocation(0);
auto dstAllocation = pBuffer->getMultiGraphicsAllocation().getGraphicsAllocation(1);
EXPECT_TRUE(srcAllocation->isAllocationLockable());
EXPECT_TRUE(dstAllocation->isAllocationLockable());
pBuffer->getMultiGraphicsAllocation().getMigrationSyncData()->setCurrentLocation(0);
EXPECT_EQ(0u, pBuffer->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
MigrationController::handleMigration(context, *pCsr1, pBuffer.get());
EXPECT_EQ(1u, pBuffer->getMultiGraphicsAllocation().getMigrationSyncData()->getCurrentLocation());
EXPECT_EQ(2u, memoryManager->lockResourceCalled);
EXPECT_EQ(2u, memoryManager->unlockResourceCalled);
EXPECT_EQ(0u, pCsr1->peekLatestFlushedTaskCount());
EXPECT_EQ(0u, pCsr0->peekLatestFlushedTaskCount());
}
TEST_F(MigrationControllerTests, givenMultiGraphicsAllocationUsedInOneCsrWhenHandlingMigrationToOtherCsrOnTheSameRootDeviceThenWaitOnCpuForTheFirstCsrCompletion) {
VariableBackup<decltype(MultiGraphicsAllocation::createMigrationSyncDataFunc)> createFuncBackup{&MultiGraphicsAllocation::createMigrationSyncDataFunc};
MultiGraphicsAllocation::createMigrationSyncDataFunc = [](size_t size) -> MigrationSyncData * {
return new MockMigrationSyncData(size);
};
std::unique_ptr<Image> pImage(Image1dHelper<>::create(&context));
ASSERT_TRUE(pImage->getMultiGraphicsAllocation().requiresMigrations());
auto migrationSyncData = static_cast<MockMigrationSyncData *>(pImage->getMultiGraphicsAllocation().getMigrationSyncData());
EXPECT_EQ(0u, migrationSyncData->waitOnCpuCalled);
migrationSyncData->setCurrentLocation(0);
EXPECT_EQ(0u, migrationSyncData->getCurrentLocation());
MigrationController::handleMigration(context, *pCsr0, pImage.get());
EXPECT_EQ(0u, migrationSyncData->getCurrentLocation());
EXPECT_EQ(0u, memoryManager->lockResourceCalled);
EXPECT_EQ(0u, memoryManager->unlockResourceCalled);
EXPECT_EQ(0u, pCsr1->peekLatestFlushedTaskCount());
EXPECT_EQ(0u, pCsr0->peekLatestFlushedTaskCount());
EXPECT_EQ(1u, migrationSyncData->waitOnCpuCalled);
}
TEST_F(MigrationControllerTests, givenMultiGraphicsAllocationUsedInOneCsrWhenHandlingMigrationToTheSameCsrThenDontWaitOnCpu) {
VariableBackup<decltype(MultiGraphicsAllocation::createMigrationSyncDataFunc)> createFuncBackup{&MultiGraphicsAllocation::createMigrationSyncDataFunc};
MultiGraphicsAllocation::createMigrationSyncDataFunc = [](size_t size) -> MigrationSyncData * {
return new MockMigrationSyncData(size);
};
std::unique_ptr<Image> pImage(Image1dHelper<>::create(&context));
ASSERT_TRUE(pImage->getMultiGraphicsAllocation().requiresMigrations());
auto migrationSyncData = static_cast<MockMigrationSyncData *>(pImage->getMultiGraphicsAllocation().getMigrationSyncData());
EXPECT_EQ(0u, migrationSyncData->waitOnCpuCalled);
migrationSyncData->signalUsage(pCsr0->getTagAddress(), 0u);
migrationSyncData->setCurrentLocation(0);
EXPECT_EQ(0u, migrationSyncData->getCurrentLocation());
MigrationController::handleMigration(context, *pCsr0, pImage.get());
EXPECT_EQ(0u, migrationSyncData->getCurrentLocation());
EXPECT_EQ(0u, memoryManager->lockResourceCalled);
EXPECT_EQ(0u, memoryManager->unlockResourceCalled);
EXPECT_EQ(0u, pCsr1->peekLatestFlushedTaskCount());
EXPECT_EQ(0u, pCsr0->peekLatestFlushedTaskCount());
EXPECT_EQ(0u, migrationSyncData->waitOnCpuCalled);
}
TEST_F(MigrationControllerTests, whenHandleMigrationThenProperTagAddressAndTaskCountIsSet) {
VariableBackup<decltype(MultiGraphicsAllocation::createMigrationSyncDataFunc)> createFuncBackup{&MultiGraphicsAllocation::createMigrationSyncDataFunc};
MultiGraphicsAllocation::createMigrationSyncDataFunc = [](size_t size) -> MigrationSyncData * {
return new MockMigrationSyncData(size);
};
std::unique_ptr<Image> pImage(Image1dHelper<>::create(&context));
ASSERT_TRUE(pImage->getMultiGraphicsAllocation().requiresMigrations());
auto migrationSyncData = static_cast<MockMigrationSyncData *>(pImage->getMultiGraphicsAllocation().getMigrationSyncData());
migrationSyncData->setCurrentLocation(0);
MigrationController::handleMigration(context, *pCsr0, pImage.get());
EXPECT_EQ(pCsr0->getTagAddress(), migrationSyncData->tagAddress);
EXPECT_EQ(pCsr0->peekTaskCount() + 1, migrationSyncData->latestTaskCountUsed);
}